diff --git a/requirements/deploy.txt b/requirements/deploy.txt index 1a73a66da5a..261338c6f5e 100644 --- a/requirements/deploy.txt +++ b/requirements/deploy.txt @@ -1,8 +1,9 @@ -r pip.txt -psycopg2==2.7.3.2 -gunicorn==19.1.0 -pysolr==2.0.13 -django-redis-cache==1.6.3 +# http://initd.org/psycopg/docs/install.html#binary-install-from-pypi +psycopg2==2.7.5 --no-binary psycopg2 +gunicorn==19.9.0 +pysolr==3.7.0 +django-redis-cache==1.7.1 #For resizing images pillow diff --git a/requirements/lint.txt b/requirements/lint.txt index b0877c50185..16d825061de 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -1,7 +1,7 @@ -r pip.txt -astroid==1.6.4 -pylint==1.9.1 -pylint-django==0.11.1 +astroid==2.0.4 +pylint==2.1.1 +pylint-django==2.0.2 pylint-celery==0.3 -prospector==0.12.10 +prospector==1.1.2 pyflakes==2.0.0 diff --git a/requirements/pip.txt b/requirements/pip.txt index fe587d962ad..2bb8009a2b9 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,10 +1,10 @@ # Base packages -pip==10.0.1 +pip==18.0 appdirs==1.4.3 virtualenv==16.0.0 docutils==0.14 -Sphinx==1.7.4 -sphinx_rtd_theme==0.3.1 +Sphinx==1.7.8 +sphinx_rtd_theme==0.4.1 Pygments==2.2.0 @@ -18,7 +18,7 @@ future==0.16.0 django-tastypie==0.13.0 django-guardian==1.4.9 -django-extensions==2.0.7 +django-extensions==2.1.2 # djangorestframework 3.7.x drops support for django 1.9.x djangorestframework==3.6.4 @@ -29,15 +29,15 @@ django-filter==1.1.0 django-vanilla-views==1.0.5 jsonfield==2.0.2 -requests==2.18.4 +requests==2.19.1 requests-toolbelt==0.8.0 slumber==0.7.1 -lxml==4.2.1 +lxml==4.2.4 defusedxml==0.5.0 # Basic tools redis==2.10.6 -celery==4.1.1 +celery==4.2.1 # django-allauth 0.33.0 dropped support for Django 1.9 # https://django-allauth.readthedocs.io/en/latest/release-notes.html#backwards-incompatible-changes @@ -47,7 +47,7 @@ dnspython==1.15.0 # VCS httplib2==0.11.3 -GitPython==2.1.10 +GitPython==2.1.11 # Search elasticsearch==1.5.0 @@ -56,8 +56,8 @@ pyquery==1.4.0 # Utils django-gravatar2==1.4.2 -pytz==2018.4 -beautifulsoup4==4.6.0 +pytz==2018.5 +beautifulsoup4==4.6.3 Unipath==1.1 django-kombu==0.9.4 mock==2.0.0 @@ -78,11 +78,11 @@ django-textclassifier==1.0 django-annoying==0.10.4 django-messages-extends==0.6.0 djangorestframework-jsonp==1.0.2 -django-taggit==0.22.2 +django-taggit==0.23.0 dj-pagination==2.3.2 # Docs -sphinxcontrib-httpdomain==1.6.1 +sphinxcontrib-httpdomain==1.7.0 # commonmark 0.5.5 is the latest version compatible with our docs, the # newer ones make `tox -e docs` to fail diff --git a/requirements/testing.txt b/requirements/testing.txt index d742a8f4c7f..c23542019f7 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -4,13 +4,21 @@ django-dynamic-fixture==2.0.0 # 3.6.1 and >3.2.5 is incompatible # with pytest-describe 0.11.0 -pytest==3.2.5 -pytest-django==3.1.2 -pytest-describe==0.11.0 -pytest-xdist==1.22.0 -apipkg==1.4 +pytest==3.7.4 +pytest-django==3.4.2 +pytest-describe==0.11.1 +pytest-xdist==1.23.0 +apipkg==1.5 execnet==1.5.0 + +# Mercurial 4.3 and newer require Python 2.7 +# Mercurial is actively being ported to Python 3. As of Mercurial 4.3, +# some commands work on Python 3. However, Python 3 is not yet a +# supported platform. +# mercurial-scm.org/wiki/SupportedPythonVersions +# (Pinned to 4.4.2 since what we need for testing is still useful) Mercurial==4.4.2 + yamale==1.7.0 pytest-mock==1.10.0