diff --git a/.travis.yml b/.travis.yml index b3bf67f..59408b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,6 @@ python: env: - TOXENV=django22 - TOXENV=quality - -matrix: - allow_failures: - - python: 3.8 - services: - xvfb addons: diff --git a/requirements/base.txt b/requirements/base.txt index 55f5e2a..540f3ab 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -17,7 +17,7 @@ six==1.14.0 # via fs, python-dateutil, xblock typing==3.7.4.1 # via fs web-fragments==0.3.1 # via -r requirements/base.in, xblock webob==1.8.6 # via xblock -xblock==1.2.9 # via -r requirements/base.in +xblock==1.3.1 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/dev.txt b/requirements/dev.txt index 9cfaee0..7b57ebe 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,14 +4,14 @@ # # make upgrade # --e git+https://github.com/edx/xblock-sdk.git@c541e4fee8c90647b136f75b404e55c04c8b67f4#egg=xblock-sdk==0.1.7 # via -r requirements/test.txt +-e git+https://github.com/edx/xblock-sdk.git@446e979bad1f3bf7f891787b32d5b2e7620b2f23#egg=xblock-sdk==0.1.9 # via -r requirements/test.txt appdirs==1.4.3 # via -r requirements/test.txt, -r requirements/travis.txt, fs, virtualenv astroid==2.3.3 # via -r requirements/test.txt, pylint, pylint-celery attrs==19.3.0 # via -r requirements/test.txt, pytest bleach==3.1.5 # via -r requirements/test.txt, readme-renderer click-log==0.3.2 # via -r requirements/test.txt, edx-lint click==7.1.2 # via -r requirements/pip-tools.txt, -r requirements/test.txt, click-log, edx-lint, pip-tools -ddt==1.3.1 # via -r requirements/test.txt +ddt==1.4.0 # via -r requirements/test.txt distlib==0.3.0 # via -r requirements/travis.txt, virtualenv django==2.2.12 # via -r requirements/test.txt, xblock-sdk docutils==0.16 # via -r requirements/test.txt, readme-renderer @@ -30,7 +30,7 @@ mock==3.0.5 # via -r requirements/test.txt more-itertools==8.2.0 # via -r requirements/test.txt, pytest packaging==20.3 # via -r requirements/test.txt, -r requirements/travis.txt, bleach, pytest, tox pathlib2==2.3.5 # via -r requirements/test.txt, pytest -pip-tools==5.1.1 # via -r requirements/pip-tools.txt +pip-tools==5.1.2 # via -r requirements/pip-tools.txt pluggy==0.13.1 # via -r requirements/test.txt, -r requirements/travis.txt, pytest, tox py==1.8.1 # via -r requirements/test.txt, -r requirements/travis.txt, pytest, tox pycodestyle==2.5.0 # via -r requirements/test.txt @@ -52,17 +52,17 @@ six==1.14.0 # via -r requirements/pip-tools.txt, -r requirements/t sqlparse==0.3.1 # via -r requirements/test.txt, django toml==0.10.0 # via -r requirements/travis.txt, tox tox-battery==0.5.2 # via -r requirements/travis.txt -tox==3.14.6 # via -r requirements/travis.txt, tox-battery +tox==3.15.0 # via -r requirements/travis.txt, tox-battery typed-ast==1.4.1 # via -r requirements/test.txt, astroid typing==3.7.4.1 # via -r requirements/test.txt, fs urllib3==1.25.9 # via -r requirements/test.txt, selenium -virtualenv==20.0.18 # via -r requirements/travis.txt, tox +virtualenv==20.0.20 # via -r requirements/travis.txt, tox 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 -r requirements/test.txt, bleach webob==1.8.6 # via -r requirements/test.txt, xblock wrapt==1.11.2 # via -r requirements/test.txt, astroid -xblock==1.2.9 # via -r requirements/test.txt +xblock==1.3.1 # via -r requirements/test.txt zipp==1.2.0 # via -r requirements/test.txt, -r requirements/travis.txt, importlib-metadata, importlib-resources # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index b35bff2..89fbde9 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -5,7 +5,7 @@ # make upgrade # click==7.1.2 # via pip-tools -pip-tools==5.1.1 # via -r requirements/pip-tools.in +pip-tools==5.1.2 # via -r requirements/pip-tools.in six==1.14.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.in b/requirements/test.in index 94c07f4..d1c0b1a 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -2,7 +2,7 @@ -r base.txt # Package dependencies --e git+https://github.com/edx/xblock-sdk.git@c541e4fee8c90647b136f75b404e55c04c8b67f4#egg=xblock-sdk==0.1.7 +-e git+https://github.com/edx/xblock-sdk.git@446e979bad1f3bf7f891787b32d5b2e7620b2f23#egg=xblock-sdk==0.1.9 ddt edx-lint mock diff --git a/requirements/test.txt b/requirements/test.txt index 6303918..424653a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,14 +4,14 @@ # # make upgrade # --e git+https://github.com/edx/xblock-sdk.git@c541e4fee8c90647b136f75b404e55c04c8b67f4#egg=xblock-sdk==0.1.7 # via -r requirements/test.in +-e git+https://github.com/edx/xblock-sdk.git@446e979bad1f3bf7f891787b32d5b2e7620b2f23#egg=xblock-sdk==0.1.9 # via -r requirements/test.in appdirs==1.4.3 # via -r requirements/base.txt, fs astroid==2.3.3 # via pylint, pylint-celery attrs==19.3.0 # via pytest bleach==3.1.5 # via readme-renderer click-log==0.3.2 # via edx-lint click==7.1.2 # via click-log, edx-lint -ddt==1.3.1 # via -r requirements/test.in +ddt==1.4.0 # via -r requirements/test.in docutils==0.16 # via readme-renderer edx-lint==1.4.1 # via -r requirements/test.in fs==2.4.11 # via -r requirements/base.txt, xblock @@ -53,7 +53,7 @@ web-fragments==0.3.1 # via -r requirements/base.txt, xblock webencodings==0.5.1 # via bleach webob==1.8.6 # via -r requirements/base.txt, xblock wrapt==1.11.2 # via astroid -xblock==1.2.9 # via -r requirements/base.txt +xblock==1.3.1 # via -r requirements/base.txt zipp==1.2.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/travis.txt b/requirements/travis.txt index 2f89f2e..58d7e8e 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -16,6 +16,6 @@ pyparsing==2.4.7 # via packaging six==1.14.0 # via packaging, tox, virtualenv toml==0.10.0 # via tox tox-battery==0.5.2 # via -r requirements/travis.in -tox==3.14.6 # via -r requirements/travis.in, tox-battery -virtualenv==20.0.18 # via tox +tox==3.15.0 # via -r requirements/travis.in, tox-battery +virtualenv==20.0.20 # via tox zipp==1.2.0 # via importlib-metadata, importlib-resources diff --git a/setup.py b/setup.py index 4334856..5ce7fe3 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ def is_requirement(line): README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read() -VERSION = '2.0.0' +VERSION = '2.1.0' if sys.argv[-1] == 'tag': print("Tagging the version on github:")