From e4a903619cc3a58a1c585af2f877088de27aa828 Mon Sep 17 00:00:00 2001
From: Christopher Pappas <cpappas@edx.org>
Date: Thu, 20 Dec 2018 10:26:54 -0500
Subject: [PATCH] ENT-1427 | Running make upgrade to bump edx-enterprise
 version

Bumped version of django-simple-history

Bumping django-simple-history in other requirements files

Removing the django-simple-history constraint as it is no longer an issue

Removing the comment from requirements/constraints about django-simple-history
---
 requirements/constraints.txt     | 3 +--
 requirements/edx/base.txt        | 4 ++--
 requirements/edx/development.txt | 8 ++++----
 requirements/edx/pip-tools.txt   | 2 +-
 requirements/edx/testing.txt     | 6 +++---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index ec325e4998..a77a74eb9d 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -12,8 +12,7 @@
 # https://github.com/transifex/transifex-client/issues/252
 six==1.11.0
 
-# version 2.6.0 changes the data model, which results in a failure in common.djangoapps.util.tests.test_db.MigrationTests.test_migrations_are_in_sync
-django-simple-history==2.5.1
+
 
 # Convert text markup to HTML; used in capa problems, forums, and course wikis; pin Markdown version as tests failed for its upgrade to latest release
 Markdown==2.6.11
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index ebce9cc120..0429405f91 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -94,7 +94,7 @@ django-require==1.0.11
 django-rest-swagger==2.2.0
 django-sekizai==0.10.0
 django-ses==0.8.4
-django-simple-history==2.5.1
+django-simple-history==2.6.0
 django-splash==0.2.2
 django-statici18n==1.4.0
 django-storages==1.4.1
@@ -118,7 +118,7 @@ edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.3
 edx-drf-extensions==2.0.1
-edx-enterprise==1.1.3
+edx-enterprise==1.2.0
 edx-i18n-tools==0.4.6
 edx-milestones==0.1.13
 edx-oauth2-provider==1.2.2
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 4df51efb4e..e49d10fca4 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -113,7 +113,7 @@ django-require==1.0.11
 django-rest-swagger==2.2.0
 django-sekizai==0.10.0
 django-ses==0.8.4
-django-simple-history==2.5.1
+django-simple-history==2.6.0
 django-splash==0.2.2
 django-statici18n==1.4.0
 django-storages==1.4.1
@@ -137,7 +137,7 @@ edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.3
 edx-drf-extensions==2.0.1
-edx-enterprise==1.1.3
+edx-enterprise==1.2.0
 edx-i18n-tools==0.4.6
 edx-lint==1.0.0
 edx-milestones==0.1.13
@@ -234,7 +234,7 @@ pbr==5.1.1
 pdfminer==20140328
 piexif==1.0.2
 pillow==5.3.0
-pip-tools==3.1.0
+pip-tools==3.2.0
 pluggy==0.6.0
 polib==1.1.0
 psutil==1.2.1
@@ -319,7 +319,7 @@ sqlparse==0.2.4
 stevedore==1.10.0
 sure==1.4.11
 sympy==0.7.1
-testfixtures==6.3.0
+testfixtures==6.4.0
 testtools==2.3.0
 text-unidecode==1.2
 tincan==0.0.5
diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt
index 741de0eea1..546f9d2811 100644
--- a/requirements/edx/pip-tools.txt
+++ b/requirements/edx/pip-tools.txt
@@ -5,5 +5,5 @@
 #    make upgrade
 #
 click==7.0                # via pip-tools
-pip-tools==3.1.0
+pip-tools==3.2.0
 six==1.11.0               # via pip-tools
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 93a1353a06..71eee7e828 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -109,7 +109,7 @@ django-require==1.0.11
 django-rest-swagger==2.2.0
 django-sekizai==0.10.0
 django-ses==0.8.4
-django-simple-history==2.5.1
+django-simple-history==2.6.0
 django-splash==0.2.2
 django-statici18n==1.4.0
 django-storages==1.4.1
@@ -132,7 +132,7 @@ edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.3
 edx-drf-extensions==2.0.1
-edx-enterprise==1.1.3
+edx-enterprise==1.2.0
 edx-i18n-tools==0.4.6
 edx-lint==1.0.0
 edx-milestones==0.1.13
@@ -304,7 +304,7 @@ sqlparse==0.2.4
 stevedore==1.10.0
 sure==1.4.11
 sympy==0.7.1
-testfixtures==6.3.0
+testfixtures==6.4.0
 testtools==2.3.0          # via fixtures, python-subunit
 text-unidecode==1.2       # via faker
 tincan==0.0.5