build: update make quality targets

edx · Jul 25, 2022 · 0d0ee5b · 0d0ee5b
1 parent c4b361a
commit 0d0ee5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.pii_annotations.yml b/.pii_annotations.yml
@@ -9,7 +9,7 @@ annotations:
         - ".. pii_types:":
             choices:
               - id # Unique identifier for the user which is shared across systems
-              - name # Used for any part of the user’s name
+              - name # Used for any part of the user's name
               - username
               - password
               - location # Used for any part of any type address or country stored

diff --git a/Makefile b/Makefile
@@ -32,6 +32,7 @@ clean: ## delete generated byte code and coverage reports
 	rm -rf pii_report
 
 piptools: ## install pinned version of pip-compile and pip-sync
+	pip install -r requirements/pip.txt
 	pip install -r requirements/pip-tools.txt
 
 clean_pycrypto: ## temporary (?) hack to deal with the pycrypto dep that's installed via setup-tools
@@ -45,7 +46,7 @@ test_requirements:
 ci_requirements: validation_requirements ## sync to requirements needed for CI checks
 
 dev_requirements: ## sync to requirements for local development
-	pip-sync -q requirements/dev.txt
+	pip-sync -q requirements/dev.txt requirements/private.*
 
 validation_requirements: ## sync to requirements for testing & code quality checking
 	pip-sync -q requirements/validation.txt
@@ -82,7 +83,8 @@ style: ## run Python style checker
 lint: ## run Python code linting
 	pylint --rcfile=pylintrc edx_exams *.py
 
-quality: style isort_check lint ## check code style and import sorting, then lint
+quality:
+	tox -e quality
 
 pii_check: ## check for PII annotations on all Django models
 	DJANGO_SETTINGS_MODULE=edx_exams.settings.test \

diff --git a/tox.ini b/tox.ini
@@ -20,7 +20,7 @@ max-line-length = 120
 ; D405 = Section name should be properly capitalized (numpy style)
 ; D406 = Section name should end with a newline (numpy style)
 ; D407 = Missing dashed underline after section (numpy style)
-; D408 = Section underline should be in the line following the section’s name (numpy style)
+; D408 = Section underline should be in the line following the section's name (numpy style)
 ; D409 = Section underline should match the length of its name (numpy style)
 ; D410 = Missing blank line after section (numpy style)
 ; D411 = Missing blank line before section (numpy style)