Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18705 from edx/feanil/make_ugprade_and_update_django

Browse Source 
`Make Upgrade` + Update Django to latest patch version.
This commit is contained in:
Jeremy Bowman
2018-08-01 18:41:25 -04:00
committed by GitHub
parent 1824ca2657 d5dfbb77aa
commit 8a558902e0
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
requirements/edx/base.in
View File

@@ -70,7 +70,7 @@ edx-ccx-keys
edx-celeryutils edx-celeryutils
edx-completion edx-completion
edx-django-release-util # Release utils for the edx release pipeline edx-django-release-util # Release utils for the edx release pipeline
edx-drf-extensions edx-drf-extensions==1.5.2 # Pinning as this is causing various test failures due to query count and content changes.
edx-django-oauth2-provider==1.3.4 edx-django-oauth2-provider==1.3.4
edx-django-sites-extensions==2.3.1 edx-django-sites-extensions==2.3.1
edx-enterprise edx-enterprise
@@ -82,7 +82,7 @@ edx-rest-api-client
edx-search edx-search
edx-submissions edx-submissions
edx-user-state-client edx-user-state-client
edxval edxval==0.1.17 # Pin because the newer version causes test failures.
enum34==1.1.6 # Backport of Enum from Python 3.4+ enum34==1.1.6 # Backport of Enum from Python 3.4+
event-tracking event-tracking
feedparser==5.1.3 feedparser==5.1.3

8
requirements/edx/base.txt
View File

@@ -83,7 +83,7 @@ django-method-override==0.1.0
django-model-utils==3.0.0 django-model-utils==3.0.0
django-mptt==0.8.7 django-mptt==0.8.7
django-multi-email-field==0.5.1 # via edx-enterprise django-multi-email-field==0.5.1 # via edx-enterprise
django-mysql==2.3.1 django-mysql==2.4.0
django-oauth-toolkit==0.12.0 django-oauth-toolkit==0.12.0
django-object-actions==0.10.0 # via edx-enterprise django-object-actions==0.10.0 # via edx-enterprise
django-pyfs==2.0 django-pyfs==2.0
@@ -115,7 +115,7 @@ edx-completion==0.1.8
edx-django-oauth2-provider==1.3.4 edx-django-oauth2-provider==1.3.4
edx-django-release-util==0.3.1 edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1 edx-django-sites-extensions==2.3.1
edx-drf-extensions==1.5.5 edx-drf-extensions==1.5.2
edx-enterprise==0.72.2 edx-enterprise==0.72.2
edx-i18n-tools==0.4.6 edx-i18n-tools==0.4.6
edx-milestones==0.1.13 edx-milestones==0.1.13
@@ -167,7 +167,7 @@ mock==1.0.1
mongoengine==0.10.0 mongoengine==0.10.0
mysql-python==1.2.5 mysql-python==1.2.5
networkx==1.7 networkx==1.7
newrelic==4.0.0.99 newrelic==4.2.0.100
nltk==3.3.0 nltk==3.3.0
nodeenv==1.1.1 nodeenv==1.1.1
numpy==1.6.2 numpy==1.6.2
@@ -232,7 +232,7 @@ unicodecsv==0.14.1
uritemplate==3.0.0 # via coreapi uritemplate==3.0.0 # via coreapi
urllib3==1.23 # via elasticsearch urllib3==1.23 # via elasticsearch
user-util==0.1.4 user-util==0.1.4
voluptuous==0.11.1 voluptuous==0.11.5
watchdog==0.8.3 watchdog==0.8.3
web-fragments==0.2.2 web-fragments==0.2.2
webob==1.8.2 # via xblock webob==1.8.2 # via xblock

14
requirements/edx/development.txt
View File

@@ -57,7 +57,7 @@ atomicwrites==1.1.5
attrs==17.4.0 attrs==17.4.0
babel==1.3 babel==1.3
backports.functools-lru-cache==1.5 backports.functools-lru-cache==1.5
beautifulsoup4==4.6.0 beautifulsoup4==4.6.1
beautifulsoup==3.2.1 beautifulsoup==3.2.1
before-after==1.0.1 before-after==1.0.1
billiard==3.3.0.23 billiard==3.3.0.23
@@ -103,7 +103,7 @@ django-method-override==0.1.0
django-model-utils==3.0.0 django-model-utils==3.0.0
django-mptt==0.8.7 django-mptt==0.8.7
django-multi-email-field==0.5.1 django-multi-email-field==0.5.1
django-mysql==2.3.1 django-mysql==2.4.0
django-oauth-toolkit==0.12.0 django-oauth-toolkit==0.12.0
django-object-actions==0.10.0 django-object-actions==0.10.0
django-pyfs==2.0 django-pyfs==2.0
@@ -212,12 +212,12 @@ mccabe==0.6.1
mock==1.0.1 mock==1.0.1
modernize==0.6.1 modernize==0.6.1
mongoengine==0.10.0 mongoengine==0.10.0
more-itertools==4.2.0 more-itertools==4.3.0
moto==0.3.1 moto==0.3.1
mysql-python==1.2.5 mysql-python==1.2.5
needle==0.5.0 needle==0.5.0
networkx==1.7 networkx==1.7
newrelic==4.0.0.99 newrelic==4.2.0.100
nltk==3.3.0 nltk==3.3.0
nodeenv==1.1.1 nodeenv==1.1.1
nose==1.3.7 nose==1.3.7
@@ -271,7 +271,7 @@ pytest-cov==2.5.1
pytest-django==3.1.2 pytest-django==3.1.2
pytest-forked==0.2 pytest-forked==0.2
pytest-randomly==1.2.3 pytest-randomly==1.2.3
pytest-xdist==1.22.4 pytest-xdist==1.22.5
pytest==3.6.3 pytest==3.6.3
python-dateutil==2.4.0 python-dateutil==2.4.0
python-levenshtein==0.12.0 python-levenshtein==0.12.0
@@ -338,8 +338,8 @@ urllib3==1.23
urlobject==2.4.3 urlobject==2.4.3
user-util==0.1.4 user-util==0.1.4
virtualenv==16.0.0 virtualenv==16.0.0
voluptuous==0.11.1 voluptuous==0.11.5
vulture==0.28 vulture==0.29
w3lib==1.19.0 w3lib==1.19.0
watchdog==0.8.3 watchdog==0.8.3
web-fragments==0.2.2 web-fragments==0.2.2

2
requirements/edx/testing.in
View File

@@ -35,7 +35,7 @@ pycodestyle # Checker for compliance with the Python style guide (
polib # Library for manipulating gettext translation files, used to test paver i18n commands polib # Library for manipulating gettext translation files, used to test paver i18n commands
pyquery # jQuery-like API for retrieving fragments of HTML and XML files in tests pyquery # jQuery-like API for retrieving fragments of HTML and XML files in tests
pysqlite # DB-API 2.0 interface for SQLite 3.x (used as the relational database for most tests) pysqlite # DB-API 2.0 interface for SQLite 3.x (used as the relational database for most tests)
pytest # Testing framework pytest==3.6.3 # Testing framework # Pinned due to https://github.com/pytest-dev/pytest/issues/3749
pytest-attrib # Select tests based on attributes pytest-attrib # Select tests based on attributes
pytest-cov # pytest plugin for measuring code coverage pytest-cov # pytest plugin for measuring code coverage
pytest-django==3.1.2 # Django support for pytest pytest-django==3.1.2 # Django support for pytest

12
requirements/edx/testing.txt
View File

@@ -54,7 +54,7 @@ atomicwrites==1.1.5 # via pytest
attrs==17.4.0 attrs==17.4.0
babel==1.3 babel==1.3
backports.functools-lru-cache==1.5 # via astroid, pylint backports.functools-lru-cache==1.5 # via astroid, pylint
beautifulsoup4==4.6.0 beautifulsoup4==4.6.1
beautifulsoup==3.2.1 beautifulsoup==3.2.1
before-after==1.0.1 before-after==1.0.1
billiard==3.3.0.23 billiard==3.3.0.23
@@ -99,7 +99,7 @@ django-method-override==0.1.0
django-model-utils==3.0.0 django-model-utils==3.0.0
django-mptt==0.8.7 django-mptt==0.8.7
django-multi-email-field==0.5.1 django-multi-email-field==0.5.1
django-mysql==2.3.1 django-mysql==2.4.0
django-oauth-toolkit==0.12.0 django-oauth-toolkit==0.12.0
django-object-actions==0.10.0 django-object-actions==0.10.0
django-pyfs==2.0 django-pyfs==2.0
@@ -203,12 +203,12 @@ markupsafe==1.0
mccabe==0.6.1 # via flake8, pylint mccabe==0.6.1 # via flake8, pylint
mock==1.0.1 mock==1.0.1
mongoengine==0.10.0 mongoengine==0.10.0
more-itertools==4.2.0 # via pytest more-itertools==4.3.0 # via pytest
moto==0.3.1 moto==0.3.1
mysql-python==1.2.5 mysql-python==1.2.5
needle==0.5.0 # via bok-choy needle==0.5.0 # via bok-choy
networkx==1.7 networkx==1.7
newrelic==4.0.0.99 newrelic==4.2.0.100
nltk==3.3.0 nltk==3.3.0
nodeenv==1.1.1 nodeenv==1.1.1
nose==1.3.7 nose==1.3.7
@@ -260,7 +260,7 @@ pytest-cov==2.5.1
pytest-django==3.1.2 pytest-django==3.1.2
pytest-forked==0.2 # via pytest-xdist pytest-forked==0.2 # via pytest-xdist
pytest-randomly==1.2.3 pytest-randomly==1.2.3
pytest-xdist==1.22.4 pytest-xdist==1.22.5
pytest==3.6.3 pytest==3.6.3
python-dateutil==2.4.0 python-dateutil==2.4.0
python-levenshtein==0.12.0 python-levenshtein==0.12.0
@@ -321,7 +321,7 @@ urllib3==1.23
urlobject==2.4.3 # via pa11ycrawler urlobject==2.4.3 # via pa11ycrawler
user-util==0.1.4 user-util==0.1.4
virtualenv==16.0.0 # via tox virtualenv==16.0.0 # via tox
voluptuous==0.11.1 voluptuous==0.11.5
w3lib==1.19.0 # via parsel, scrapy w3lib==1.19.0 # via parsel, scrapy
watchdog==0.8.3 watchdog==0.8.3
web-fragments==0.2.2 web-fragments==0.2.2