Merge pull request #22462 from edx/aj/ENT-2082_offers_2

Upgrade edx-enterprise

requirements/constraints.txt

@@ -82,3 +82,8 @@ more-itertools==5.0.0
 
 # Constraining this Gunicorn requires Python 3.x >= 3.4.
 gunicorn<20.0.0
+
+
+# Upgrading to django-object-actions <=1.1.2 requires support for Python 3. In newer versions Python 2 support is
+# dropped.  This constraint can be removed once we have Python 3.
+django-object-actions==1.1.2

requirements/edx/base.txt

@@ -37,7 +37,7 @@ botocore==1.8.17
 git+https://github.com/edx/bridgekeeper.git@4e34894e4ac5d0467ed1901811a81fd87ee01937#egg=bridgekeeper==0.0
 git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4
 celery==3.1.25
-certifi==2019.9.11
+certifi==2019.11.28
 cffi==1.13.2
 chardet==3.0.4
 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0
@@ -49,7 +49,7 @@ coreschema==0.0.4         # via coreapi, drf-yasg
 git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2
 cryptography==2.8
 cssutils==1.0.2           # via pynliner
-ddt==1.2.1
+ddt==1.2.2
 decorator==4.4.1          # via pycontracts
 defusedxml==0.5.0
 django-appconf==1.0.3     # via django-statici18n
@@ -60,7 +60,7 @@ django-classy-tags==0.9.0  # via django-sekizai
 django-config-models==1.0.3
 django-cors-headers==2.1.0
 django-countries==4.6.1
-django-crum==0.7.4
+django-crum==0.7.5
 django-fernet-fields==0.6
 django-filter==1.0.4
 django-ipware==2.1.0
@@ -79,11 +79,11 @@ django-ratelimit==2.0.0
 django-require==1.0.11
 django-sekizai==1.0.0
 django-ses==0.8.4
-django-simple-history==2.7.3
+django-simple-history==2.8.0
 django-splash==0.2.5
 django-statici18n==1.4.0
 django-storages==1.4.1
-django-user-tasks==0.2.1
+django-user-tasks==0.3.0
 django-waffle==0.12.0
 django-webpack-loader==0.6.0
 django==1.11.26
@@ -98,7 +98,7 @@ edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
 edx-bulk-grades==0.6.5
 edx-ccx-keys==1.0.0
-edx-celeryutils==0.3.0
+edx-celeryutils==0.3.1
 edx-completion==3.0.2
 edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.2
@@ -107,7 +107,7 @@ edx-django-utils==2.0.2
 edx-drf-extensions==2.4.5
 edx-enterprise==2.0.30
 edx-i18n-tools==0.4.8
-edx-milestones==0.2.5
+edx-milestones==0.2.6
 edx-oauth2-provider==1.3.1
 edx-opaque-keys[django]==2.0.1
 edx-organizations==2.1.1
@@ -117,10 +117,10 @@ edx-rbac==1.0.3           # via edx-enterprise
 edx-rest-api-client==1.9.2
 edx-search==1.2.2
 edx-sga==0.10.0
-edx-submissions==3.0.2
+edx-submissions==3.0.3
 edx-user-state-client==1.1.2
 edx-when==0.5.2
-edxval==1.1.30
+edxval==1.1.32
 elasticsearch==1.9.0      # via edx-search
 enum34==1.1.6
 event-tracking==0.3.0
@@ -188,7 +188,7 @@ pycountry==19.8.18
 pycparser==2.19
 pycryptodome==3.9.4       # via pdfminer.six
 pycryptodomex==3.4.7
-pygments==2.5.1
+pygments==2.5.2
 pygraphviz==1.5
 pyjwkest==1.3.2
 pyjwt==1.5.2
@@ -205,7 +205,7 @@ python-swiftclient==3.8.1
 python3-saml==1.5.0
 pytz==2019.3
 pyuca==1.1
-pyyaml==5.1.2
+pyyaml==5.2
 random2==1.0.1
 recommender-xblock==1.4.5
 redis==2.10.6

requirements/edx/coverage.txt

@@ -8,14 +8,14 @@ configparser==4.0.2       # via importlib-metadata
 contextlib2==0.6.0.post1  # via importlib-metadata
 coverage==5.0b1
 diff-cover==0.9.8
-importlib-metadata==0.23  # via inflect
+importlib-metadata==1.2.0  # via inflect
 inflect==3.0.2            # via jinja2-pluralize
 jinja2-pluralize==0.3.0   # via diff-cover
 jinja2==2.10.3            # via diff-cover, jinja2-pluralize
 markupsafe==1.1.1         # via jinja2
 more-itertools==5.0.0     # via zipp
 pathlib2==2.3.5           # via importlib-metadata
-pygments==2.5.1           # via diff-cover
+pygments==2.5.2           # via diff-cover
 scandir==1.10.0           # via pathlib2
 six==1.13.0               # via diff-cover, pathlib2
 zipp==0.6.0               # via importlib-metadata

requirements/edx/development.txt

@@ -48,7 +48,7 @@ git+https://github.com/edx/bridgekeeper.git@4e34894e4ac5d0467ed1901811a81fd87ee0
 git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4
 caniusepython3==7.2.0
 celery==3.1.25
-certifi==2019.9.11
+certifi==2019.11.28
 cffi==1.13.2
 chardet==3.0.4
 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0
@@ -67,7 +67,7 @@ git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb
 cryptography==2.8
 cssselect==1.1.0
 cssutils==1.0.2
-ddt==1.2.1
+ddt==1.2.2
 decorator==4.4.1
 defusedxml==0.5.0
 diff-cover==0.9.8
@@ -80,7 +80,7 @@ django-classy-tags==0.9.0
 django-config-models==1.0.3
 django-cors-headers==2.1.0
 django-countries==4.6.1
-django-crum==0.7.4
+django-crum==0.7.5
 django-debug-toolbar==1.8
 django-fernet-fields==0.6
 django-filter==1.0.4
@@ -100,11 +100,11 @@ django-ratelimit==2.0.0
 django-require==1.0.11
 django-sekizai==1.0.0
 django-ses==0.8.4
-django-simple-history==2.7.3
+django-simple-history==2.8.0
 django-splash==0.2.5
 django-statici18n==1.4.0
 django-storages==1.4.1
-django-user-tasks==0.2.1
+django-user-tasks==0.3.0
 django-waffle==0.12.0
 django-webpack-loader==0.6.0
 django==1.11.26
@@ -120,7 +120,7 @@ edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
 edx-bulk-grades==0.6.5
 edx-ccx-keys==1.0.0
-edx-celeryutils==0.3.0
+edx-celeryutils==0.3.1
 edx-completion==3.0.2
 edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.2
@@ -130,7 +130,7 @@ edx-drf-extensions==2.4.5
 edx-enterprise==2.0.30
 edx-i18n-tools==0.4.8
 edx-lint==1.3.0
-edx-milestones==0.2.5
+edx-milestones==0.2.6
 edx-oauth2-provider==1.3.1
 edx-opaque-keys[django]==2.0.1
 edx-organizations==2.1.1
@@ -141,17 +141,17 @@ edx-rest-api-client==1.9.2
 edx-search==1.2.2
 edx-sga==0.10.0
 edx-sphinx-theme==1.5.0
-edx-submissions==3.0.2
+edx-submissions==3.0.3
 edx-user-state-client==1.1.2
 edx-when==0.5.2
-edxval==1.1.30
+edxval==1.1.32
 elasticsearch==1.9.0
 entrypoints==0.3
 enum34==1.1.6
 event-tracking==0.3.0
 execnet==1.7.1
 factory_boy==2.8.1
-faker==2.0.4
+faker==3.0.0
 faulthandler==3.1 ; python_version == "2.7"
 feedparser==5.1.3
 filelock==3.0.12
@@ -173,7 +173,7 @@ httplib2==0.14.0
 httpretty==0.9.7
 idna==2.8
 imagesize==1.1.0          # via sphinx
-importlib-metadata==0.23
+importlib-metadata==1.2.0
 inflect==3.0.2
 inflection==0.3.1
 ipaddress==1.0.23
@@ -246,7 +246,7 @@ pycparser==2.19
 pycryptodome==3.9.4
 pycryptodomex==3.4.7
 pyflakes==2.1.1
-pygments==2.5.1
+pygments==2.5.2
 pygraphviz==1.5
 pyinotify==0.9.6
 pyjwkest==1.3.2
@@ -279,7 +279,7 @@ python-swiftclient==3.8.1
 python3-saml==1.5.0
 pytz==2019.3
 pyuca==1.1
-pyyaml==5.1.2
+pyyaml==5.2
 radon==4.0.0
 random2==1.0.1
 recommender-xblock==1.4.5
@@ -324,7 +324,7 @@ text-unidecode==1.3
 tincan==0.0.5
 toml==0.10.0
 tox-battery==0.5.1
-tox==3.14.1
+tox==3.14.2
 transifex-client==0.13.4
 typing==3.7.4.1
 unicodecsv==0.14.1

requirements/edx/paver.txt

@@ -5,7 +5,7 @@
 #    make upgrade
 #
 argh==0.26.2              # via watchdog
-certifi==2019.9.11        # via requests
+certifi==2019.11.28       # via requests
 chardet==3.0.4            # via requests
 edx-opaque-keys==2.0.1
 funcsigs==1.0.2           # via mock
@@ -21,7 +21,7 @@ pbr==5.4.4                # via stevedore
 psutil==1.2.1
 pymongo==2.9.1
 python-memcached==1.59
-pyyaml==5.1.2             # via watchdog
+pyyaml==5.2               # via watchdog
 requests==2.22.0
 six==1.13.0               # via edx-opaque-keys, libsass, mock, paver, python-memcached, stevedore
 stevedore==1.31.0

requirements/edx/testing.txt

@@ -47,7 +47,7 @@ git+https://github.com/edx/bridgekeeper.git@4e34894e4ac5d0467ed1901811a81fd87ee0
 git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4
 caniusepython3==7.2.0
 celery==3.1.25
-certifi==2019.9.11
+certifi==2019.11.28
 cffi==1.13.2
 chardet==3.0.4
 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0
@@ -66,7 +66,7 @@ git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb
 cryptography==2.8
 cssselect==1.1.0
 cssutils==1.0.2
-ddt==1.2.1
+ddt==1.2.2
 decorator==4.4.1
 defusedxml==0.5.0
 diff-cover==0.9.8
@@ -79,7 +79,7 @@ django-classy-tags==0.9.0
 django-config-models==1.0.3
 django-cors-headers==2.1.0
 django-countries==4.6.1
-django-crum==0.7.4
+django-crum==0.7.5
 django-fernet-fields==0.6
 django-filter==1.0.4
 django-ipware==2.1.0
@@ -98,11 +98,11 @@ django-ratelimit==2.0.0
 django-require==1.0.11
 django-sekizai==1.0.0
 django-ses==0.8.4
-django-simple-history==2.7.3
+django-simple-history==2.8.0
 django-splash==0.2.5
 django-statici18n==1.4.0
 django-storages==1.4.1
-django-user-tasks==0.2.1
+django-user-tasks==0.3.0
 django-waffle==0.12.0
 django-webpack-loader==0.6.0
 djangorestframework-jwt==1.11.0
@@ -117,7 +117,7 @@ edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
 edx-bulk-grades==0.6.5
 edx-ccx-keys==1.0.0
-edx-celeryutils==0.3.0
+edx-celeryutils==0.3.1
 edx-completion==3.0.2
 edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.2
@@ -127,7 +127,7 @@ edx-drf-extensions==2.4.5
 edx-enterprise==2.0.30
 edx-i18n-tools==0.4.8
 edx-lint==1.3.0
-edx-milestones==0.2.5
+edx-milestones==0.2.6
 edx-oauth2-provider==1.3.1
 edx-opaque-keys[django]==2.0.1
 edx-organizations==2.1.1
@@ -137,17 +137,17 @@ edx-rbac==1.0.3
 edx-rest-api-client==1.9.2
 edx-search==1.2.2
 edx-sga==0.10.0
-edx-submissions==3.0.2
+edx-submissions==3.0.3
 edx-user-state-client==1.1.2
 edx-when==0.5.2
-edxval==1.1.30
+edxval==1.1.32
 elasticsearch==1.9.0
 entrypoints==0.3          # via flake8
 enum34==1.1.6
 event-tracking==0.3.0
 execnet==1.7.1            # via pytest-xdist
 factory_boy==2.8.1
-faker==2.0.4              # via factory-boy
+faker==3.0.0              # via factory-boy
 faulthandler==3.1 ; python_version == "2.7"  # via pytest-faulthandler
 feedparser==5.1.3
 filelock==3.0.12          # via tox
@@ -168,7 +168,7 @@ html5lib==1.0.1
 httplib2==0.14.0
 httpretty==0.9.7
 idna==2.8
-importlib-metadata==0.23
+importlib-metadata==1.2.0
 inflect==3.0.2
 inflection==0.3.1
 ipaddress==1.0.23
@@ -236,7 +236,7 @@ pycparser==2.19
 pycryptodome==3.9.4
 pycryptodomex==3.4.7
 pyflakes==2.1.1           # via flake8
-pygments==2.5.1
+pygments==2.5.2
 pygraphviz==1.5
 pyjwkest==1.3.2
 pyjwt==1.5.2
@@ -267,7 +267,7 @@ python-swiftclient==3.8.1
 python3-saml==1.5.0
 pytz==2019.3
 pyuca==1.1
-pyyaml==5.1.2
+pyyaml==5.2
 radon==4.0.0
 random2==1.0.1
 recommender-xblock==1.4.5
@@ -307,7 +307,7 @@ text-unidecode==1.3
 tincan==0.0.5
 toml==0.10.0              # via tox
 tox-battery==0.5.1
-tox==3.14.1
+tox==3.14.2
 transifex-client==0.13.4
 typing==3.7.4.1           # via flake8
 unicodecsv==0.14.1

scripts/xblock/requirements.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-certifi==2019.9.11        # via requests
+certifi==2019.11.28       # via requests
 chardet==3.0.4            # via requests
 idna==2.8                 # via requests
 requests==2.22.0