Skip to content

Commit

Permalink
Merge pull request #927 from edx/ashultz0/rm-tox-doc
Browse files Browse the repository at this point in the history
rip out tox doc and friends
  • Loading branch information
ashultz0 authored Aug 4, 2021
2 parents 1325f81 + db480ce commit feb7738
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 442 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: help upgrade requirements clean quality requirements docs \
.PHONY: help upgrade requirements clean quality requirements \
requirements-test coverage pii_check \
compile_translations dummy_translations extract_translations \
fake_translations pull_translations push_translations test test-python \
Expand Down Expand Up @@ -33,7 +33,6 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
pip-compile --rebuild --upgrade -o requirements/base.txt requirements/base.in
pip-compile --rebuild --upgrade -o requirements/ci.txt requirements/ci.in
pip-compile --rebuild --upgrade -o requirements/dev.txt requirements/dev.in
pip-compile --rebuild --upgrade -o requirements/doc.txt requirements/doc.in
pip-compile --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
pip-compile --rebuild --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --rebuild --upgrade -o requirements/test.txt requirements/test.in
Expand Down Expand Up @@ -74,10 +73,6 @@ pii_check: ## check for PII annotations on all Django models
DJANGO_SETTINGS_MODULE=test_settings \
code_annotations django_find_annotations --config_file .pii_annotations.yml --lint --report --coverage

docs: ## generate Sphinx HTML documentation, including API docs
tox -e docs
$(BROWSER) docs/_build/html/index.html

quality-js: lint-js

quality-python: ## Run python linters
Expand Down
10 changes: 5 additions & 5 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ certifi==2021.5.30
# via requests
cffi==1.14.6
# via cryptography
charset-normalizer==2.0.3
charset-normalizer==2.0.4
# via requests
click==7.1.2
# via
Expand Down Expand Up @@ -53,7 +53,7 @@ django-crum==0.7.9
# via
# -r requirements/base.in
# edx-django-utils
django-ipware==3.0.2
django-ipware==3.0.7
# via -r requirements/base.in
django-model-utils==4.1.1
# via
Expand Down Expand Up @@ -98,7 +98,7 @@ edx-rest-api-client==5.4.0
# via -r requirements/base.in
edx-when==2.1.0
# via -r requirements/base.in
event-tracking==1.0.4
event-tracking==1.1.0
# via -r requirements/base.in
fs==2.4.13
# via xblock
Expand All @@ -116,7 +116,7 @@ lxml==4.6.3
# via xblock
markupsafe==2.0.1
# via xblock
newrelic==6.4.4.161
newrelic==6.6.0.162
# via edx-django-utils
pbr==5.6.0
# via stevedore
Expand Down Expand Up @@ -198,7 +198,7 @@ web-fragments==1.1.0
# via xblock
webob==1.8.7
# via xblock
xblock==1.4.2
xblock==1.5.0
# via edx-when

# The following packages are considered to be unsafe in a requirements file:
Expand Down
10 changes: 5 additions & 5 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ backports.entry-points-selectable==1.1.0
# via virtualenv
certifi==2021.5.30
# via requests
charset-normalizer==2.0.3
charset-normalizer==2.0.4
# via requests
codecov==2.1.11
codecov==2.1.12
# via -r requirements/ci.in
coverage==5.5
# via codecov
Expand All @@ -24,7 +24,7 @@ idna==3.2
# via requests
packaging==21.0
# via tox
platformdirs==2.0.2
platformdirs==2.2.0
# via virtualenv
pluggy==0.13.1
# via tox
Expand All @@ -40,13 +40,13 @@ six==1.16.0
# virtualenv
toml==0.10.2
# via tox
tox==3.24.0
tox==3.24.1
# via
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
urllib3==1.26.6
# via requests
virtualenv==20.6.0
virtualenv==20.7.0
# via tox
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ edx-i18n-tools # For i18n_tool dummy
pip-tools # Requirements file management
tox # virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
twine # Utility for PyPI package uploads
wheel # For generation of wheels for PyPI
path.py
django
72 changes: 12 additions & 60 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,8 @@ astroid==2.6.5
# pylint-celery
backports.entry-points-selectable==1.1.0
# via virtualenv
bleach==3.3.1
# via readme-renderer
certifi==2021.5.30
# via requests
chardet==4.0.0
# via diff-cover
charset-normalizer==2.0.3
# via requests
click==7.1.2
# via
# -c requirements/constraints.txt
Expand All @@ -27,11 +21,9 @@ click==7.1.2
# pip-tools
click-log==0.3.2
# via edx-lint
code-annotations==1.1.2
code-annotations==1.2.0
# via edx-lint
colorama==0.4.4
# via twine
diff-cover==6.2.0
diff-cover==6.2.1
# via -r requirements/dev.in
distlib==0.3.2
# via virtualenv
Expand All @@ -43,9 +35,7 @@ django==2.2.24
# edx-i18n-tools
# edx-lint
docutils==0.17.1
# via
# readme-renderer
# rstcheck
# via rstcheck
edx-i18n-tools==0.7.0
# via -r requirements/dev.in
edx-lint==5.0.0
Expand All @@ -56,15 +46,9 @@ filelock==3.0.12
# via
# tox
# virtualenv
idna==3.2
# via requests
importlib-metadata==4.6.1
# via
# keyring
# twine
inflect==5.3.0
# via jinja2-pluralize
isort==5.9.2
isort==5.9.3
# via
# -r requirements/quality.in
# pylint
Expand All @@ -75,19 +59,15 @@ jinja2==3.0.1
# jinja2-pluralize
jinja2-pluralize==0.3.0
# via diff-cover
keyring==23.0.1
# via twine
lazy-object-proxy==1.6.0
# via astroid
markupsafe==2.0.1
# via jinja2
mccabe==0.6.1
# via pylint
packaging==21.0
# via
# bleach
# tox
path==16.0.0
# via tox
path==16.2.0
# via
# edx-i18n-tools
# path.py
Expand All @@ -99,9 +79,7 @@ pep517==0.11.0
# via pip-tools
pip-tools==6.2.0
# via -r requirements/dev.in
pkginfo==1.7.1
# via twine
platformdirs==2.0.2
platformdirs==2.2.0
# via virtualenv
pluggy==0.13.1
# via
Expand All @@ -116,10 +94,8 @@ pycodestyle==2.7.0
pydocstyle==6.1.1
# via -r requirements/quality.in
pygments==2.9.0
# via
# diff-cover
# readme-renderer
pylint==2.9.5
# via diff-cover
pylint==2.9.6
# via
# edx-lint
# pylint-celery
Expand All @@ -143,24 +119,12 @@ pyyaml==5.4.1
# via
# code-annotations
# edx-i18n-tools
readme-renderer==29.0
# via twine
requests==2.26.0
# via
# requests-toolbelt
# twine
requests-toolbelt==0.9.1
# via twine
rfc3986==1.5.0
# via twine
rstcheck==3.3.1
# via -r requirements/quality.in
six==1.16.0
# via
# bleach
# edx-i18n-tools
# edx-lint
# readme-renderer
# tox
# virtualenv
snowballstemmer==2.1.0
Expand All @@ -175,34 +139,22 @@ toml==0.10.2
# via
# pylint
# tox
tomli==1.1.0
tomli==1.2.0
# via pep517
tox==3.24.0
tox==3.24.1
# via
# -r requirements/dev.in
# tox-battery
tox-battery==0.6.1
# via -r requirements/dev.in
tqdm==4.61.2
# via twine
twine==3.4.2
# via
# -r requirements/dev.in
# -r requirements/quality.in
urllib3==1.26.6
# via requests
virtualenv==20.6.0
virtualenv==20.7.0
# via tox
webencodings==0.5.1
# via bleach
wheel==0.36.2
# via
# -r requirements/dev.in
# pip-tools
wrapt==1.12.1
# via astroid
zipp==3.5.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
10 changes: 0 additions & 10 deletions requirements/doc.in

This file was deleted.

Loading

0 comments on commit feb7738

Please sign in to comment.