Skip to content

Commit

Permalink
Merge pull request #46 from edx/iamsobanjaved/python38
Browse files Browse the repository at this point in the history
BOM-1546: Added python 3.8 in test matrix
  • Loading branch information
iamsobanjaved authored Apr 30, 2020
2 parents 9df7424 + b2103cc commit 0238082
Show file tree
Hide file tree
Showing 13 changed files with 122 additions and 117 deletions.
17 changes: 5 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
language: python
python:
- 3.5
- 3.8
env:
- TOXENV=django111
- TOXENV=django20
- TOXENV=django21
- TOXENV=django22
matrix:
include:
- python: 3.5
env: TOXENV=quality
- python: 3.5
env: TOXENV=docs
- python: 3.5
env: TOXENV=pii_check
- TOXENV=django22
- TOXENV=quality
- TOXENV=docs
- TOXENV=pii_check
cache:
- pip
install:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ Change Log
Unreleased
~~~~~~~~~~

[1.2.3] - 2020-04-30
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

* Dropped support for Django versions below 2.2
* Added support for python 3.8

[1.1.4] - 2019-03-30
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion edx_when/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

from __future__ import absolute_import, unicode_literals

__version__ = '1.2.2'
__version__ = '1.2.3'

default_app_config = 'edx_when.apps.EdxWhenConfig' # pylint: disable=invalid-name
19 changes: 10 additions & 9 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,39 @@
# make upgrade
#
appdirs==1.4.3 # via fs
certifi==2019.11.28 # via requests
certifi==2020.4.5.1 # via requests
chardet==3.0.4 # via requests
django-model-utils==4.0.0 # via -r requirements/base.in
django-waffle==0.20.0 # via edx-django-utils, edx-drf-extensions
django==2.2.11 # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, djangorestframework, drf-jwt, edx-django-utils, edx-drf-extensions, rest-condition
django==2.2.12 # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, djangorestframework, drf-jwt, edx-django-utils, edx-drf-extensions, rest-condition
djangorestframework==3.11.0 # via drf-jwt, edx-drf-extensions, rest-condition
drf-jwt==1.14.0 # via edx-drf-extensions
edx-django-utils==3.1 # via -r requirements/base.in, edx-drf-extensions
edx-django-utils==3.2.1 # via -r requirements/base.in, edx-drf-extensions
edx-drf-extensions==5.0.2 # via -r requirements/base.in
edx-opaque-keys==2.0.1 # via -r requirements/base.in, edx-drf-extensions
edx-opaque-keys==2.1.0 # via -r requirements/base.in, edx-drf-extensions
fs==2.4.11 # via xblock
future==0.18.2 # via pyjwkest
idna==2.9 # via requests
lxml==4.5.0 # via xblock
markupsafe==1.1.1 # via xblock
newrelic==5.10.0.138 # via edx-django-utils
pbr==5.4.4 # via stevedore
newrelic==5.12.0.140 # via edx-django-utils
pbr==5.4.5 # via stevedore
psutil==1.2.1 # via edx-django-utils
pycryptodomex==3.9.7 # via pyjwkest
pyjwkest==1.4.2 # via edx-drf-extensions
pyjwt==1.7.1 # via drf-jwt
pymongo==3.10.1 # via edx-opaque-keys
python-dateutil==2.8.1 # via edx-drf-extensions, xblock
pytz==2019.3 # via django, fs, xblock
pytz==2020.1 # via django, fs, xblock
pyyaml==5.3.1 # via xblock
requests==2.23.0 # via edx-drf-extensions, pyjwkest
rest-condition==1.0.3 # via edx-drf-extensions
semantic-version==2.8.4 # via edx-drf-extensions
semantic-version==2.8.5 # via edx-drf-extensions
six==1.14.0 # via django-waffle, edx-drf-extensions, edx-opaque-keys, fs, pyjwkest, python-dateutil, stevedore, xblock
sqlparse==0.3.1 # via django
stevedore==1.32.0 # via edx-opaque-keys
urllib3==1.25.8 # via requests
typing==3.7.4.1 # via fs
urllib3==1.25.9 # via requests
web-fragments==0.3.1 # via xblock
webob==1.8.6 # via xblock
xblock==1.2.9 # via -r requirements/base.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# 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"

Django<3.0 # not yet testing django 3.0
mock<4.0 # requires python>3.5

zipp<2.0 # newer versions require python>3.5
47 changes: 25 additions & 22 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,47 +10,48 @@ astroid==2.3.3 # via -r requirements/quality.txt, pylint, pylint-cele
attrs==19.3.0 # via -r requirements/quality.txt, pytest
backports.functools-lru-cache==1.6.1 # via -r requirements/quality.txt, caniusepython3
caniusepython3==7.2.0 # via -r requirements/quality.txt
certifi==2019.11.28 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
certifi==2020.4.5.1 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
chardet==3.0.4 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
click-log==0.3.2 # via -r requirements/quality.txt, edx-lint
click==7.1.1 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, click-log, code-annotations, edx-lint, pip-tools
click==7.1.2 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, click-log, code-annotations, edx-lint, pip-tools
code-annotations==0.3.3 # via -r requirements/quality.txt
codecov==2.0.22 # via -r requirements/travis.txt
coverage==5.0.4 # via -r requirements/quality.txt, -r requirements/travis.txt, codecov, pytest-cov
coverage==5.1 # via -r requirements/quality.txt, -r requirements/travis.txt, codecov, pytest-cov
ddt==1.3.1 # via -r requirements/quality.txt
diff-cover==2.6.0 # via -r requirements/dev.in
diff-cover==2.6.1 # via -r requirements/dev.in
distlib==0.3.0 # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, virtualenv
django-model-utils==4.0.0 # via -r requirements/quality.txt
django-waffle==0.20.0 # via -r requirements/quality.txt, edx-django-utils, edx-drf-extensions
django==2.2.11 # via -c requirements/constraints.txt, -r requirements/quality.txt, code-annotations, django-model-utils, djangorestframework, drf-jwt, edx-django-utils, edx-drf-extensions, edx-i18n-tools, rest-condition
django==2.2.12 # via -c requirements/constraints.txt, -r requirements/quality.txt, code-annotations, django-model-utils, djangorestframework, drf-jwt, edx-django-utils, edx-drf-extensions, edx-i18n-tools, rest-condition
djangorestframework==3.11.0 # via -r requirements/quality.txt, drf-jwt, edx-drf-extensions, rest-condition
drf-jwt==1.14.0 # via -r requirements/quality.txt, edx-drf-extensions
edx-django-utils==3.1 # via -r requirements/quality.txt, edx-drf-extensions
edx-django-utils==3.2.1 # via -r requirements/quality.txt, edx-drf-extensions
edx-drf-extensions==5.0.2 # via -r requirements/quality.txt
edx-i18n-tools==0.5.0 # via -r requirements/dev.in
edx-lint==1.4.1 # via -r requirements/quality.txt
edx-opaque-keys==2.0.1 # via -r requirements/quality.txt, edx-drf-extensions
edx-opaque-keys==2.1.0 # via -r requirements/quality.txt, edx-drf-extensions
filelock==3.0.12 # via -r requirements/travis.txt, tox, virtualenv
fs==2.4.11 # via -r requirements/quality.txt, xblock
future==0.18.2 # via -r requirements/quality.txt, pyjwkest
idna==2.9 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
importlib-metadata==1.5.0 # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-resources, path.py, pluggy, pytest, tox, virtualenv
importlib-resources==1.4.0 # via -r requirements/travis.txt, virtualenv
inflect==4.1.0 # via jinja2-pluralize
importlib-metadata==1.6.0 # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-resources, path.py, pluggy, pytest, tox, virtualenv
importlib-resources==1.5.0 # via -r requirements/travis.txt, virtualenv
inflect==3.0.2 # via jinja2-pluralize
isort==4.3.21 # via -r requirements/quality.txt, pylint
jinja2-pluralize==0.3.0 # via diff-cover
jinja2==2.11.1 # via -r requirements/quality.txt, code-annotations, diff-cover, jinja2-pluralize
jinja2==2.11.2 # via -r requirements/quality.txt, code-annotations, diff-cover, jinja2-pluralize
lazy-object-proxy==1.4.3 # via -r requirements/quality.txt, astroid
lxml==4.5.0 # via -r requirements/quality.txt, xblock
markupsafe==1.1.1 # via -r requirements/quality.txt, jinja2, xblock
mccabe==0.6.1 # via -r requirements/quality.txt, pylint
mock==3.0.5 # via -c requirements/constraints.txt, -r requirements/quality.txt
more-itertools==8.2.0 # via -r requirements/quality.txt, pytest
newrelic==5.10.0.138 # via -r requirements/quality.txt, edx-django-utils
newrelic==5.12.0.140 # via -r requirements/quality.txt, edx-django-utils
packaging==20.3 # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, pytest, tox
path.py==11.5.0 # via -r requirements/dev.in, edx-i18n-tools
pbr==5.4.4 # via -r requirements/quality.txt, stevedore
pip-tools==4.5.1 # via -r requirements/pip-tools.txt
pathlib2==2.3.5 # via -r requirements/quality.txt, pytest
pbr==5.4.5 # via -r requirements/quality.txt, stevedore
pip-tools==5.1.0 # via -r requirements/pip-tools.txt
pluggy==0.13.1 # via -r requirements/quality.txt, -r requirements/travis.txt, diff-cover, pytest, tox
polib==1.1.0 # via edx-i18n-tools
psutil==1.2.1 # via -r requirements/quality.txt, edx-django-utils
Expand All @@ -66,28 +67,29 @@ pylint-django==2.0.11 # via -r requirements/quality.txt, edx-lint
pylint-plugin-utils==0.6 # via -r requirements/quality.txt, pylint-celery, pylint-django
pylint==2.4.2 # via -r requirements/quality.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
pymongo==3.10.1 # via -r requirements/quality.txt, edx-opaque-keys
pyparsing==2.4.6 # via -r requirements/quality.txt, -r requirements/travis.txt, packaging
pyparsing==2.4.7 # via -r requirements/quality.txt, -r requirements/travis.txt, packaging
pytest-cov==2.8.1 # via -r requirements/quality.txt
pytest-django==3.8.0 # via -r requirements/quality.txt
pytest-django==3.9.0 # via -r requirements/quality.txt
pytest==5.4.1 # via -r requirements/quality.txt, pytest-cov, pytest-django
python-dateutil==2.8.1 # via -r requirements/quality.txt, edx-drf-extensions, xblock
python-slugify==4.0.0 # via -r requirements/quality.txt, code-annotations
pytz==2019.3 # via -r requirements/quality.txt, django, fs, xblock
pytz==2020.1 # via -r requirements/quality.txt, django, fs, xblock
pyyaml==5.3.1 # via -r requirements/quality.txt, code-annotations, edx-i18n-tools, xblock
requests==2.23.0 # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, codecov, edx-drf-extensions, pyjwkest
rest-condition==1.0.3 # via -r requirements/quality.txt, edx-drf-extensions
semantic-version==2.8.4 # via -r requirements/quality.txt, edx-drf-extensions
six==1.14.0 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, -r requirements/travis.txt, astroid, diff-cover, django-waffle, edx-drf-extensions, edx-i18n-tools, edx-lint, edx-opaque-keys, fs, mock, packaging, pip-tools, pyjwkest, python-dateutil, stevedore, tox, virtualenv, xblock
semantic-version==2.8.5 # via -r requirements/quality.txt, edx-drf-extensions
six==1.14.0 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, -r requirements/travis.txt, astroid, diff-cover, django-waffle, edx-drf-extensions, edx-i18n-tools, edx-lint, edx-opaque-keys, fs, mock, packaging, pathlib2, pip-tools, pyjwkest, python-dateutil, stevedore, tox, virtualenv, xblock
snowballstemmer==2.0.0 # via -r requirements/quality.txt, pydocstyle
sqlparse==0.3.1 # via -r requirements/quality.txt, django
stevedore==1.32.0 # via -r requirements/quality.txt, code-annotations, edx-opaque-keys
text-unidecode==1.3 # via -r requirements/quality.txt, python-slugify
toml==0.10.0 # via -r requirements/travis.txt, tox
tox-battery==0.5.2 # via -r requirements/travis.txt
tox==3.14.5 # via -r requirements/travis.txt, tox-battery
tox==3.14.6 # via -r requirements/travis.txt, tox-battery
typed-ast==1.4.1 # via -r requirements/quality.txt, astroid
urllib3==1.25.8 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
virtualenv==20.0.13 # via -r requirements/travis.txt, tox
typing==3.7.4.1 # via -r requirements/quality.txt, fs
urllib3==1.25.9 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
virtualenv==20.0.18 # via -r requirements/travis.txt, tox
wcwidth==0.1.9 # via -r requirements/quality.txt, pytest
web-fragments==0.3.1 # via -r requirements/quality.txt, xblock
webob==1.8.6 # via -r requirements/quality.txt, xblock
Expand All @@ -96,4 +98,5 @@ xblock==1.2.9 # via -r requirements/quality.txt
zipp==1.2.0 # via -c requirements/constraints.txt, -r requirements/quality.txt, -r requirements/travis.txt, importlib-metadata, importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
42 changes: 22 additions & 20 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,38 @@ alabaster==0.7.12 # via sphinx
appdirs==1.4.3 # via -r requirements/test.txt, fs
attrs==19.3.0 # via -r requirements/test.txt, pytest
babel==2.8.0 # via sphinx
bleach==3.1.3 # via readme-renderer
certifi==2019.11.28 # via -r requirements/test.txt, requests
bleach==3.1.5 # via readme-renderer
certifi==2020.4.5.1 # via -r requirements/test.txt, requests
chardet==3.0.4 # via -r requirements/test.txt, doc8, requests
click==7.1.1 # via -r requirements/test.txt, code-annotations
click==7.1.2 # via -r requirements/test.txt, code-annotations
code-annotations==0.3.3 # via -r requirements/test.txt
coverage==5.0.4 # via -r requirements/test.txt, pytest-cov
coverage==5.1 # via -r requirements/test.txt, pytest-cov
ddt==1.3.1 # via -r requirements/test.txt
django-model-utils==4.0.0 # via -r requirements/test.txt
django-waffle==0.20.0 # via -r requirements/test.txt, edx-django-utils, edx-drf-extensions
django==2.2.11 # via -c requirements/constraints.txt, -r requirements/test.txt, code-annotations, django-model-utils, djangorestframework, drf-jwt, edx-django-utils, edx-drf-extensions, rest-condition
django==2.2.12 # via -c requirements/constraints.txt, -r requirements/test.txt, code-annotations, django-model-utils, djangorestframework, drf-jwt, edx-django-utils, edx-drf-extensions, rest-condition
djangorestframework==3.11.0 # via -r requirements/test.txt, drf-jwt, edx-drf-extensions, rest-condition
doc8==0.8.0 # via -r requirements/doc.in
docutils==0.16 # via doc8, readme-renderer, restructuredtext-lint, sphinx
drf-jwt==1.14.0 # via -r requirements/test.txt, edx-drf-extensions
edx-django-utils==3.1 # via -r requirements/test.txt, edx-drf-extensions
edx-django-utils==3.2.1 # via -r requirements/test.txt, edx-drf-extensions
edx-drf-extensions==5.0.2 # via -r requirements/test.txt
edx-opaque-keys==2.0.1 # via -r requirements/test.txt, edx-drf-extensions
edx-opaque-keys==2.1.0 # via -r requirements/test.txt, edx-drf-extensions
edx-sphinx-theme==1.5.0 # via -r requirements/doc.in
fs==2.4.11 # via -r requirements/test.txt, xblock
future==0.18.2 # via -r requirements/test.txt, pyjwkest
idna==2.9 # via -r requirements/test.txt, requests
imagesize==1.2.0 # via sphinx
importlib-metadata==1.5.0 # via -r requirements/test.txt, pluggy, pytest
jinja2==2.11.1 # via -r requirements/test.txt, code-annotations, sphinx
importlib-metadata==1.6.0 # via -r requirements/test.txt, pluggy, pytest
jinja2==2.11.2 # via -r requirements/test.txt, code-annotations, sphinx
lxml==4.5.0 # via -r requirements/test.txt, xblock
markupsafe==1.1.1 # via -r requirements/test.txt, jinja2, xblock
mock==3.0.5 # via -c requirements/constraints.txt, -r requirements/test.txt
more-itertools==8.2.0 # via -r requirements/test.txt, pytest
newrelic==5.10.0.138 # via -r requirements/test.txt, edx-django-utils
packaging==20.3 # via -r requirements/test.txt, pytest, sphinx
pbr==5.4.4 # via -r requirements/test.txt, stevedore
newrelic==5.12.0.140 # via -r requirements/test.txt, edx-django-utils
packaging==20.3 # via -r requirements/test.txt, bleach, pytest, sphinx
pathlib2==2.3.5 # via -r requirements/test.txt, pytest
pbr==5.4.5 # via -r requirements/test.txt, stevedore
pluggy==0.13.1 # via -r requirements/test.txt, pytest
psutil==1.2.1 # via -r requirements/test.txt, edx-django-utils
py==1.8.1 # via -r requirements/test.txt, pytest
Expand All @@ -47,27 +48,28 @@ pygments==2.6.1 # via readme-renderer, sphinx
pyjwkest==1.4.2 # via -r requirements/test.txt, edx-drf-extensions
pyjwt==1.7.1 # via -r requirements/test.txt, drf-jwt
pymongo==3.10.1 # via -r requirements/test.txt, edx-opaque-keys
pyparsing==2.4.6 # via -r requirements/test.txt, packaging
pyparsing==2.4.7 # via -r requirements/test.txt, packaging
pytest-cov==2.8.1 # via -r requirements/test.txt
pytest-django==3.8.0 # via -r requirements/test.txt
pytest-django==3.9.0 # via -r requirements/test.txt
pytest==5.4.1 # via -r requirements/test.txt, pytest-cov, pytest-django
python-dateutil==2.8.1 # via -r requirements/test.txt, edx-drf-extensions, xblock
python-slugify==4.0.0 # via -r requirements/test.txt, code-annotations
pytz==2019.3 # via -r requirements/test.txt, babel, django, fs, xblock
pytz==2020.1 # via -r requirements/test.txt, babel, django, fs, xblock
pyyaml==5.3.1 # via -r requirements/test.txt, code-annotations, xblock
readme-renderer==25.0 # via -r requirements/doc.in
readme-renderer==26.0 # via -r requirements/doc.in
requests==2.23.0 # via -r requirements/test.txt, edx-drf-extensions, pyjwkest, sphinx
rest-condition==1.0.3 # via -r requirements/test.txt, edx-drf-extensions
restructuredtext-lint==1.3.0 # via doc8
semantic-version==2.8.4 # via -r requirements/test.txt, edx-drf-extensions
six==1.14.0 # via -r requirements/test.txt, bleach, django-waffle, doc8, edx-drf-extensions, edx-opaque-keys, edx-sphinx-theme, fs, mock, packaging, pyjwkest, python-dateutil, readme-renderer, sphinx, stevedore, xblock
semantic-version==2.8.5 # via -r requirements/test.txt, edx-drf-extensions
six==1.14.0 # via -r requirements/test.txt, bleach, django-waffle, doc8, edx-drf-extensions, edx-opaque-keys, edx-sphinx-theme, fs, mock, packaging, pathlib2, pyjwkest, python-dateutil, readme-renderer, sphinx, stevedore, xblock
snowballstemmer==2.0.0 # via sphinx
sphinx==1.8.5 # via -r requirements/doc.in, edx-sphinx-theme
sphinxcontrib-websupport==1.2.1 # via sphinx
sphinxcontrib-websupport==1.2.2 # via sphinx
sqlparse==0.3.1 # via -r requirements/test.txt, django
stevedore==1.32.0 # via -r requirements/test.txt, code-annotations, doc8, edx-opaque-keys
text-unidecode==1.3 # via -r requirements/test.txt, python-slugify
urllib3==1.25.8 # via -r requirements/test.txt, requests
typing==3.7.4.1 # via -r requirements/test.txt, fs
urllib3==1.25.9 # via -r requirements/test.txt, requests
wcwidth==0.1.9 # via -r requirements/test.txt, pytest
web-fragments==0.3.1 # via -r requirements/test.txt, xblock
webencodings==0.5.1 # via bleach
Expand Down
Loading

0 comments on commit 0238082

Please sign in to comment.