Merge pull request #6 from edx/dsheraz/prod-343

DawoudSheraz · web-flow · commit 69a0a0df3f19 · 2019-06-17T11:45:18.000+05:00
run make upgrade to update jinja2
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,4 +3,5 @@ include CHANGELOG.rst
 include CONTRIBUTING.rst
 include LICENSE.txt
 include README.rst
+include requirements/base.in
 recursive-include help_tokens *.html *.png *.gif *js *.css *jpg *jpeg *svg *py
diff --git a/Makefile b/Makefile
@@ -32,6 +32,7 @@ coverage: clean ## generate and view HTML coverage report
 	py.test --cov-report html
 	$(BROWSER) htmlcov/index.html
 
+upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	pip install -q pip-tools
 	pip-compile --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in
diff --git a/help_tokens/__init__.py b/help_tokens/__init__.py
@@ -6,7 +6,6 @@
 
 from .context_processor import context_processor
 
-
-__version__ = '1.0.3'
+__version__ = '1.0.4'
 
 default_app_config = 'help_tokens.apps.HelpTokensConfig'  # pylint: disable=invalid-name
diff --git a/help_tokens/core.py b/help_tokens/core.py
@@ -7,10 +7,10 @@
 
 import logging
 
-from django.conf import settings
-
 from six.moves import configparser
 
+from django.conf import settings
+
 log = logging.getLogger(__name__)
 
 
diff --git a/requirements/base.in b/requirements/base.in
@@ -1,4 +1,6 @@
 # Core requirements for using this application
 
+-c constraints.txt
+
 Django                    # Web application framework
 six                       # Python 3 compatibility layer
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -0,0 +1,12 @@
+# Version constraints for pip-installation.
+#
+# This file doesn't install any packages. It specifies version constraints
+# that will be applied if a package is needed.
+#
+# When pinning something here, please provide an explanation of why.  Ideally,
+# link to other information that will help people in the future to remove the
+# pin when possible.  Writing an issue against the offending project and
+# linking to it here is good.
+
+ # These packages are backports which can only be installed on Python 2.7
+futures ; python_version == "2.7"
diff --git a/requirements/dev.in b/requirements/dev.in
@@ -1,5 +1,7 @@
 # Additional requirements for development of this application
 
+-c constraints.txt 
+
 diff-cover                # Changeset diff test coverage
 edx-lint                  # For updating pylintrc
 edx-i18n-tools            # For i18n_tool dummy
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -2,64 +2,72 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in
+#    make upgrade
 #
 argparse==1.4.0           # via caniusepython3
-astroid==1.5.2            # via edx-lint, pylint, pylint-celery, pylint-plugin-utils
-backports.functools-lru-cache==1.4  # via astroid, caniusepython3, pylint
-bleach==2.0.0             # via readme-renderer
-caniusepython3==5.0.0
-certifi==2017.4.17        # via requests
+astroid==1.5.3            # via pylint, pylint-celery
+backports.functools-lru-cache==1.5  # via astroid, caniusepython3, isort, pylint
+bleach==3.1.0             # via readme-renderer
+caniusepython3==7.1.0
+certifi==2019.3.9         # via requests
 chardet==3.0.4            # via requests
-click-log==0.1.8          # via edx-lint
-click==6.7                # via click-log, edx-lint, pip-tools
-configparser==3.5.0       # via pylint
-diff-cover==0.9.11
-distlib==0.2.5            # via caniusepython3
-django==1.11.2            # via edx-i18n-tools
-docutils==0.13.1          # via readme-renderer
-edx-i18n-tools==0.4.2
-edx-lint==0.5.4
+click-log==0.3.2          # via edx-lint
+click==7.0                # via click-log, edx-lint, pip-tools
+configparser==3.7.4       # via importlib-metadata, pylint
+contextlib2==0.5.5        # via importlib-metadata
+diff-cover==2.2.0
+distlib==0.2.9.post0      # via caniusepython3
+django==1.11.21
+docutils==0.14            # via readme-renderer
+edx-i18n-tools==0.4.8
+edx-lint==1.3.0
 enum34==1.1.6             # via astroid
-first==2.0.1              # via pip-tools
-futures==3.1.1            # via caniusepython3
-html5lib==0.999999999     # via bleach
-idna==2.5                 # via requests
-inflect==0.2.5            # via jinja2-pluralize
-isort==4.2.15
+filelock==3.0.12          # via tox
+futures==3.2.0 ; python_version == "2.7"  # via caniusepython3, isort
+idna==2.8                 # via requests
+importlib-metadata==0.18  # via pluggy
+inflect==2.1.0            # via jinja2-pluralize
+isort==4.3.20
 jinja2-pluralize==0.3.0   # via diff-cover
-jinja2==2.9.6             # via diff-cover, jinja2-pluralize
-lazy-object-proxy==1.3.1  # via astroid
-markupsafe==1.0           # via jinja2
+jinja2==2.10.1            # via diff-cover, jinja2-pluralize
+lazy-object-proxy==1.4.1  # via astroid
+markupsafe==1.1.1         # via jinja2
 mccabe==0.6.1             # via pylint
-packaging==16.8           # via caniusepython3
-path.py==10.3.1           # via edx-i18n-tools
-pip-tools==1.9.0
-pkginfo==1.4.1            # via twine
-pluggy==0.4.0             # via tox
-polib==1.0.8              # via edx-i18n-tools
-py==1.4.34                # via tox
-pycodestyle==2.3.1
+packaging==19.0           # via caniusepython3
+path.py==11.5.2           # via edx-i18n-tools
+pathlib2==2.3.3           # via importlib-metadata
+pip-tools==3.8.0
+pkginfo==1.5.0.1          # via twine
+pluggy==0.12.0            # via tox
+polib==1.1.0              # via edx-i18n-tools
+py==1.8.0                 # via tox
+pycodestyle==2.5.0
 pydocstyle==1.1.1
-pygments==2.2.0           # via diff-cover, readme-renderer
+pygments==2.4.2           # via diff-cover, readme-renderer
 pylint-celery==0.3        # via edx-lint
 pylint-django==0.7.2      # via edx-lint
-pylint-plugin-utils==0.2.6  # via pylint-celery, pylint-django
-pylint==1.7.1             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pyparsing==2.2.0          # via packaging
-pytz==2017.2              # via django
-pyyaml==3.12              # via edx-i18n-tools
-readme-renderer==17.2
-requests-toolbelt==0.8.0  # via twine
-requests==2.18.1          # via caniusepython3, requests-toolbelt, twine
+pylint-plugin-utils==0.5  # via pylint-celery, pylint-django
+pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pyparsing==2.4.0          # via packaging
+pytz==2019.1              # via django
+pyyaml==5.1.1             # via edx-i18n-tools
+readme-renderer==24.0
+requests-toolbelt==0.9.1  # via twine
+requests==2.22.0          # via caniusepython3, requests-toolbelt, twine
+scandir==1.10.0           # via pathlib2
 singledispatch==3.4.0.3   # via astroid, pylint
-six==1.10.0
-tox-battery==0.4
-tox==2.7.0
-tqdm==4.14.0              # via twine
-twine==1.9.1
-urllib3==1.21.1           # via requests
-virtualenv==15.1.0        # via tox
-webencodings==0.5.1       # via html5lib
-wheel==0.29.0
-wrapt==1.10.10            # via astroid
+six==1.12.0
+toml==0.10.0              # via tox
+tox-battery==0.5.1
+tox==3.12.1
+tqdm==4.32.1              # via twine
+twine==1.13.0
+urllib3==1.25.3           # via requests
+virtualenv==16.6.0        # via tox
+webencodings==0.5.1       # via bleach
+wheel==0.33.4
+wrapt==1.11.1             # via astroid
+zipp==0.5.1               # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==41.0.1        # via caniusepython3, tox, twine
diff --git a/requirements/quality.in b/requirements/quality.in
@@ -1,5 +1,7 @@
 # Requirements for code quality checks
 
+-c constraints.txt
+
 caniusepython3            # Additional Python 3 compatibility pylint checks
 edx-lint                  # edX pylint rules and plugins
 isort                     # to standardize order of imports
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -2,41 +2,43 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file requirements/quality.txt requirements/quality.in
+#    make upgrade
 #
 argparse==1.4.0           # via caniusepython3
-astroid==1.5.2            # via edx-lint, pylint, pylint-celery, pylint-plugin-utils
-backports.functools-lru-cache==1.4  # via astroid, caniusepython3, pylint
-bleach==2.0.0             # via readme-renderer
-caniusepython3==5.0.0
-certifi==2017.4.17        # via requests
+astroid==1.5.3            # via pylint, pylint-celery
+backports.functools-lru-cache==1.5  # via astroid, caniusepython3, isort, pylint
+bleach==3.1.0             # via readme-renderer
+caniusepython3==7.1.0
+certifi==2019.3.9         # via requests
 chardet==3.0.4            # via requests
-click-log==0.1.8          # via edx-lint
-click==6.7                # via click-log, edx-lint
-configparser==3.5.0       # via pylint
-distlib==0.2.5            # via caniusepython3
-docutils==0.13.1          # via readme-renderer
-edx-lint==0.5.4
+click-log==0.3.2          # via edx-lint
+click==7.0                # via click-log, edx-lint
+configparser==3.7.4       # via pylint
+distlib==0.2.9.post0      # via caniusepython3
+docutils==0.14            # via readme-renderer
+edx-lint==1.3.0
 enum34==1.1.6             # via astroid
-futures==3.1.1            # via caniusepython3
-html5lib==0.999999999     # via bleach
-idna==2.5                 # via requests
-isort==4.2.15
-lazy-object-proxy==1.3.1  # via astroid
+futures==3.2.0 ; python_version == "2.7"  # via caniusepython3, isort
+idna==2.8                 # via requests
+isort==4.3.20
+lazy-object-proxy==1.4.1  # via astroid
 mccabe==0.6.1             # via pylint
-packaging==16.8           # via caniusepython3
-pycodestyle==2.3.1
+packaging==19.0           # via caniusepython3
+pycodestyle==2.5.0
 pydocstyle==1.1.1
-pygments==2.2.0           # via readme-renderer
+pygments==2.4.2           # via readme-renderer
 pylint-celery==0.3        # via edx-lint
 pylint-django==0.7.2      # via edx-lint
-pylint-plugin-utils==0.2.6  # via pylint-celery, pylint-django
-pylint==1.7.1             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pyparsing==2.2.0          # via packaging
-readme-renderer==17.2
-requests==2.18.1          # via caniusepython3
+pylint-plugin-utils==0.5  # via pylint-celery, pylint-django
+pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pyparsing==2.4.0          # via packaging
+readme-renderer==24.0
+requests==2.22.0          # via caniusepython3
 singledispatch==3.4.0.3   # via astroid, pylint
-six==1.10.0               # via astroid, bleach, edx-lint, html5lib, packaging, pylint, readme-renderer, singledispatch
-urllib3==1.21.1           # via requests
-webencodings==0.5.1       # via html5lib
-wrapt==1.10.10            # via astroid
+six==1.12.0               # via astroid, bleach, edx-lint, packaging, pylint, readme-renderer, singledispatch
+urllib3==1.25.3           # via requests
+webencodings==0.5.1       # via bleach
+wrapt==1.11.1             # via astroid
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==41.0.1        # via caniusepython3
diff --git a/requirements/test.in b/requirements/test.in
@@ -1,5 +1,6 @@
 # Requirements for test runs.
 
+-c constraints.txt
 
 pytest-catchlog           # Show log output for test failures
 pytest-cov                # pytest extension for code coverage statistics
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -2,13 +2,27 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file requirements/test.txt requirements/base.in requirements/test.in
+#    make upgrade
 #
-coverage==4.4.1           # via pytest-cov
-py==1.4.34                # via pytest, pytest-catchlog
+atomicwrites==1.3.0       # via pytest
+attrs==19.1.0             # via pytest
+configparser==3.7.4       # via importlib-metadata
+contextlib2==0.5.5        # via importlib-metadata
+coverage==4.5.3           # via pytest-cov
+funcsigs==1.0.2           # via pytest
+importlib-metadata==0.18  # via pluggy, pytest
+more-itertools==5.0.0     # via pytest
+packaging==19.0           # via pytest
+pathlib2==2.3.3           # via importlib-metadata, pytest, pytest-django
+pluggy==0.12.0            # via pytest
+py==1.8.0                 # via pytest, pytest-catchlog
+pyparsing==2.4.0          # via packaging
 pytest-catchlog==1.2.2
-pytest-cov==2.5.1
-pytest-django==3.1.2
-pytest==3.1.2             # via pytest-catchlog, pytest-cov, pytest-django
-pytz==2017.2              # via django
-six==1.10.0
+pytest-cov==2.7.1
+pytest-django==3.5.0
+pytest==4.6.3             # via pytest-catchlog, pytest-cov, pytest-django
+pytz==2019.1              # via django
+scandir==1.10.0           # via pathlib2
+six==1.12.0
+wcwidth==0.1.7            # via pytest
+zipp==0.5.1               # via importlib-metadata
diff --git a/requirements/travis.in b/requirements/travis.in
@@ -1,5 +1,7 @@
 # Requirements for running tests in Travis
 
+-c constraints.txt
+
 codecov                   # Code coverage reporting
 tox                       # Virtualenv management for tests
 tox-battery               # Makes tox aware of requirements file changes
diff --git a/requirements/travis.txt b/requirements/travis.txt
@@ -2,17 +2,29 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file requirements/travis.txt requirements/travis.in
+#    make upgrade
 #
-certifi==2017.4.17        # via requests
+certifi==2019.3.9         # via requests
 chardet==3.0.4            # via requests
-codecov==2.0.9
-coverage==4.4.1           # via codecov
-idna==2.5                 # via requests
-pluggy==0.4.0             # via tox
-py==1.4.34                # via tox
-requests==2.18.1          # via codecov
-tox-battery==0.4
-tox==2.7.0
-urllib3==1.21.1           # via requests
-virtualenv==15.1.0        # via tox
+codecov==2.0.15
+configparser==3.7.4       # via importlib-metadata
+contextlib2==0.5.5        # via importlib-metadata
+coverage==4.5.3           # via codecov
+filelock==3.0.12          # via tox
+idna==2.8                 # via requests
+importlib-metadata==0.18  # via pluggy
+pathlib2==2.3.3           # via importlib-metadata
+pluggy==0.12.0            # via tox
+py==1.8.0                 # via tox
+requests==2.22.0          # via codecov
+scandir==1.10.0           # via pathlib2
+six==1.12.0               # via pathlib2, tox
+toml==0.10.0              # via tox
+tox-battery==0.5.1
+tox==3.12.1
+urllib3==1.25.3           # via requests
+virtualenv==16.6.0        # via tox
+zipp==0.5.1               # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==41.0.1        # via tox
diff --git a/setup.py b/setup.py
