diff --git a/.travis.yml b/.travis.yml index 99f1dbf4..3a9d95a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,3 +48,5 @@ deploy: distributions: sdist bdist_wheel on: tags: true + python: 3.6 + condition: '$TOXENV = django111' diff --git a/requirements/base.txt b/requirements/base.txt index b6f33c08..cb33ec56 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,7 +4,7 @@ # # make upgrade # -django==1.11.21 +django==1.11.22 elasticsearch==1.9.0 event-tracking==0.2.9 pymongo==3.8.0 # via event-tracking diff --git a/requirements/dev.txt b/requirements/dev.txt index 5122cd33..24ab156e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -14,21 +14,18 @@ codecov==2.0.15 configparser==3.7.4 contextlib2==0.5.5 coverage==4.5.3 -ddt==1.2.1 -django==1.11.21 +django==1.11.22 edx-lint==1.3.0 elasticsearch==1.9.0 enum34==1.1.6 event-tracking==0.2.9 filelock==3.0.12 -funcsigs==1.0.2 futures==3.2.0 ; python_version == "2.7" idna==2.8 importlib-metadata==0.18 -isort==4.3.20 +isort==4.3.21 lazy-object-proxy==1.4.1 mccabe==0.6.1 -mock==3.0.5 packaging==19.0 pathlib2==2.3.4 pip-tools==3.8.0 @@ -47,8 +44,8 @@ scandir==1.10.0 singledispatch==3.4.0.3 six==1.12.0 toml==0.10.0 -tox==3.13.0 +tox==3.13.2 urllib3==1.25.3 virtualenv==16.6.1 wrapt==1.11.2 -zipp==0.5.1 +zipp==0.5.2 diff --git a/requirements/quality.in b/requirements/quality.in index 9fb65beb..9ab3ca73 100644 --- a/requirements/quality.in +++ b/requirements/quality.in @@ -1,7 +1,7 @@ # Requirements for code quality checks -c constraints.txt --r testing.txt # Core and testing dependencies for this package +-r testing.txt # Core and testing dependencies for this package coverage edx-lint # edX pylint rules and plugins diff --git a/requirements/quality.txt b/requirements/quality.txt index 1ac60464..2fb53444 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -10,26 +10,17 @@ click-log==0.3.2 # via edx-lint click==7.0 # via click-log, edx-lint configparser==3.7.4 # via pylint coverage==4.5.3 -ddt==1.2.1 -django==1.11.21 edx-lint==1.3.0 -elasticsearch==1.9.0 enum34==1.1.6 # via astroid -event-tracking==0.2.9 -funcsigs==1.0.2 futures==3.2.0 ; python_version == "2.7" # via isort -isort==4.3.20 # via pylint +isort==4.3.21 # via pylint lazy-object-proxy==1.4.1 # via astroid mccabe==0.6.1 # via pylint -mock==3.0.5 pycodestyle==2.5.0 pylint-celery==0.3 # via edx-lint pylint-django==0.7.2 # via edx-lint pylint-plugin-utils==0.5 # via pylint-celery, pylint-django pylint==1.7.6 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils -pymongo==3.8.0 -pytz==2019.1 singledispatch==3.4.0.3 # via astroid, pylint -six==1.12.0 -urllib3==1.25.3 +six==1.12.0 # via astroid, edx-lint, pylint, singledispatch wrapt==1.11.2 # via astroid diff --git a/requirements/testing.in b/requirements/testing.in index 8b2d843b..a34fb289 100644 --- a/requirements/testing.in +++ b/requirements/testing.in @@ -2,7 +2,6 @@ -c constraints.txt -r base.txt # Core dependencies for this package --r quality.txt ddt mock \ No newline at end of file diff --git a/requirements/testing.txt b/requirements/testing.txt index f7418c9b..231de16f 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -4,12 +4,31 @@ # # make upgrade # +astroid==1.5.3 +backports.functools-lru-cache==1.5 +click-log==0.3.2 +click==7.0 +configparser==3.7.4 +coverage==4.5.3 ddt==1.2.1 +edx-lint==1.3.0 elasticsearch==1.9.0 +enum34==1.1.6 event-tracking==0.2.9 funcsigs==1.0.2 # via mock +futures==3.2.0 ; python_version == "2.7" +isort==4.3.21 +lazy-object-proxy==1.4.1 +mccabe==0.6.1 mock==3.0.5 +pycodestyle==2.5.0 +pylint-celery==0.3 +pylint-django==0.7.2 +pylint-plugin-utils==0.5 +pylint==1.7.6 pymongo==3.8.0 pytz==2019.1 +singledispatch==3.4.0.3 six==1.12.0 urllib3==1.25.3 +wrapt==1.11.2 diff --git a/requirements/travis.txt b/requirements/travis.txt index 5cab6b7b..292dbdbb 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -22,7 +22,7 @@ requests==2.22.0 # via codecov scandir==1.10.0 # via pathlib2 six==1.12.0 # via packaging, pathlib2, tox toml==0.10.0 # via tox -tox==3.13.0 +tox==3.13.2 urllib3==1.25.3 # via requests virtualenv==16.6.1 # via tox -zipp==0.5.1 # via importlib-metadata +zipp==0.5.2 # via importlib-metadata diff --git a/setup.py b/setup.py index 20e19c8e..61080f8e 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ def is_requirement(line): setup( name='edx-search', - version='1.2.2', + version='1.2.3', description='Search and index routines for index access', author='edX', author_email='oscm@edx.org',