From 69bb6b582b20dd69a49f7b6b48576a674089dcba Mon Sep 17 00:00:00 2001 From: Chris Pappas Date: Thu, 3 Oct 2019 16:55:55 -0400 Subject: [PATCH] =?UTF-8?q?ENT-2310,=20ENT-1289=20|=20Running=20make=20upg?= =?UTF-8?q?rade=20to=20bump=20edx-enterprise=20to=202=E2=80=A6=20(#21916)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2.0.0 (and 1.11.0) * Skipping db_migration test for first part of removal of enterprisecustomerentitlements --- common/djangoapps/util/tests/test_db.py | 1 + requirements/edx/base.txt | 10 +++++----- requirements/edx/development.txt | 12 ++++++------ requirements/edx/testing.txt | 12 ++++++------ 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/common/djangoapps/util/tests/test_db.py b/common/djangoapps/util/tests/test_db.py index 5b080acf98..dd5d19f100 100644 --- a/common/djangoapps/util/tests/test_db.py +++ b/common/djangoapps/util/tests/test_db.py @@ -223,6 +223,7 @@ class MigrationTests(TestCase): Tests for migrations. """ + @unittest.skip("Migration in edx-enterprise has deletes. Removing all references first. ENT-1289.") @override_settings(MIGRATION_MODULES={}) def test_migrations_are_in_sync(self): """ diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index cdc5dd7693..0a4d492e00 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -106,7 +106,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.0 edx-drf-extensions==2.4.0 -edx-enterprise==1.10.8 +edx-enterprise==2.0.0 edx-i18n-tools==0.4.8 edx-milestones==0.2.3 edx-oauth2-provider==1.3.1 @@ -120,8 +120,8 @@ edx-search==1.2.2 git+https://github.com/mitodl/edx-sga.git@237ad328ba3f03d189c421073c85e48091041f8b#egg=edx-sga==0.0 edx-submissions==3.0.1 edx-user-state-client==1.1.2 -edx-when==0.4 -edxval==1.1.27 +edx-when==0.5.1 +edxval==1.1.28 elasticsearch==1.9.0 # via edx-search enum34==1.1.6 event-tracking==0.2.9 @@ -166,7 +166,7 @@ mongoengine==0.10.0 mpmath==1.1.0 # via sympy mysqlclient==1.4.4 networkx==1.7 -newrelic==5.0.2.126 +newrelic==5.2.0.127 nltk==3.4.5 nodeenv==1.1.1 numpy==1.16.5 @@ -179,7 +179,7 @@ paver==1.3.4 pbr==5.4.3 pdfminer.six==20181108 piexif==1.0.2 -pillow==6.1.0 +pillow==6.2.0 pkgconfig==1.5.1 # via xmlsec polib==1.1.0 # via edx-i18n-tools psutil==1.2.1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index d8617a4421..fcb73f5226 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -129,7 +129,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.0 edx-drf-extensions==2.4.0 -edx-enterprise==1.10.8 +edx-enterprise==2.0.0 edx-i18n-tools==0.4.8 edx-lint==1.3.0 edx-milestones==0.2.3 @@ -145,8 +145,8 @@ git+https://github.com/mitodl/edx-sga.git@237ad328ba3f03d189c421073c85e48091041f edx-sphinx-theme==1.5.0 edx-submissions==3.0.1 edx-user-state-client==1.1.2 -edx-when==0.4 -edxval==1.1.27 +edx-when==0.5.1 +edxval==1.1.28 elasticsearch==1.9.0 entrypoints==0.3 enum34==1.1.6 @@ -214,7 +214,7 @@ moto==1.3.1 mpmath==1.1.0 mysqlclient==1.4.4 networkx==1.7 -newrelic==5.0.2.126 +newrelic==5.2.0.127 nltk==3.4.5 nodeenv==1.1.1 numpy==1.16.5 @@ -229,7 +229,7 @@ paver==1.3.4 pbr==5.4.3 pdfminer.six==20181108 piexif==1.0.2 -pillow==6.1.0 +pillow==6.2.0 pip-tools==4.1.0 pkgconfig==1.5.1 pluggy==0.13.0 @@ -266,7 +266,7 @@ pytest-django==3.5.1 pytest-faulthandler==1.6.0 pytest-forked==1.0.2 pytest-randomly==1.2.3 -pytest-xdist==1.29.0 +pytest-xdist==1.30.0 pytest==4.5.0 python-dateutil==2.4.0 python-levenshtein==0.12.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4c2408a4b0..342bbfe457 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -125,7 +125,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.0 edx-drf-extensions==2.4.0 -edx-enterprise==1.10.8 +edx-enterprise==2.0.0 edx-i18n-tools==0.4.8 edx-lint==1.3.0 edx-milestones==0.2.3 @@ -140,8 +140,8 @@ edx-search==1.2.2 git+https://github.com/mitodl/edx-sga.git@237ad328ba3f03d189c421073c85e48091041f8b#egg=edx-sga==0.0 edx-submissions==3.0.1 edx-user-state-client==1.1.2 -edx-when==0.4 -edxval==1.1.27 +edx-when==0.5.1 +edxval==1.1.28 elasticsearch==1.9.0 entrypoints==0.3 # via flake8 enum34==1.1.6 @@ -207,7 +207,7 @@ moto==1.3.1 mpmath==1.1.0 mysqlclient==1.4.4 networkx==1.7 -newrelic==5.0.2.126 +newrelic==5.2.0.127 nltk==3.4.5 nodeenv==1.1.1 numpy==1.16.5 @@ -222,7 +222,7 @@ paver==1.3.4 pbr==5.4.3 pdfminer.six==20181108 piexif==1.0.2 -pillow==6.1.0 +pillow==6.2.0 pkgconfig==1.5.1 pluggy==0.13.0 # via pytest, tox polib==1.1.0 @@ -257,7 +257,7 @@ pytest-django==3.5.1 pytest-faulthandler==1.6.0 pytest-forked==1.0.2 # via pytest-xdist pytest-randomly==1.2.3 -pytest-xdist==1.29.0 +pytest-xdist==1.30.0 pytest==4.5.0 python-dateutil==2.4.0 python-levenshtein==0.12.0