diff --git a/ecommerce/urls.py b/ecommerce/urls.py index 5a5beecdbb6..277c7eba43f 100644 --- a/ecommerce/urls.py +++ b/ecommerce/urls.py @@ -58,6 +58,7 @@ def handler403(_, exception): # pylint: disable=unused-argument url(r'^courses/', include(('ecommerce.courses.urls', 'courses'))), url(r'^credit/', include(('ecommerce.credit.urls', 'credit'))), url(r'^enterprise/', include(('ecommerce.enterprise.urls', 'enterprise'))), + url(r'^subscriptions/', include(('ecommerce.subscriptions.urls', 'subscriptions'))), url(r'^coupons/', include(('ecommerce.coupons.urls', 'coupons'))), url(r'^health/$', core_views.health, name='health'), url(r'^i18n/', include(('django.conf.urls.i18n'))), diff --git a/requirements/base.in b/requirements/base.in index 855b4bd071d..7c4002d16f9 100755 --- a/requirements/base.in +++ b/requirements/base.in @@ -34,7 +34,7 @@ edx-rbac edx-rest-api-client jsonfield2 libsass==0.9.2 -markdown==2.6.9 +markdown==3.0 mysqlclient<1.5 newrelic ndg-httpsclient diff --git a/requirements/base.txt b/requirements/base.txt index d3963dda70d..7609cf93f87 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -88,7 +88,7 @@ libsass==0.9.2 # via -r requirements/base.in, django-libsass linecache2==1.0.0 # via cybersource-rest-client-python, traceback2 logger==1.4 # via cybersource-rest-client-python lxml==4.6.1 # via premailer, zeep -markdown==2.6.9 # via -r requirements/base.in +markdown==3.0 # via -r requirements/base.in markupsafe==1.1.1 # via jinja2 mysqlclient==1.4.6 # via -r requirements/base.in naked==0.1.31 # via crypto, cybersource-rest-client-python diff --git a/requirements/dev.txt b/requirements/dev.txt index d02326dd015..762b0450e7e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -110,7 +110,7 @@ libsass==0.9.2 # via -r requirements/test.txt, django-libsass linecache2==1.0.0 # via -r requirements/test.txt, cybersource-rest-client-python, traceback2 logger==1.4 # via -r requirements/test.txt, cybersource-rest-client-python lxml==4.6.1 # via -r requirements/test.txt, premailer, zeep -markdown==2.6.9 # via -r requirements/test.txt +markdown==3.0 # via -r requirements/test.in markupsafe==1.1.1 # via -r requirements/docs.txt, -r requirements/test.txt, jinja2 mccabe==0.6.1 # via -r requirements/test.txt, pylint mock-django==0.6.10 # via -r requirements/test.txt diff --git a/requirements/production.txt b/requirements/production.txt index e7a28f965c0..534aabd14ad 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -93,7 +93,7 @@ libsass==0.9.2 # via -r requirements/base.in, django-libsass linecache2==1.0.0 # via cybersource-rest-client-python, traceback2 logger==1.4 # via cybersource-rest-client-python lxml==4.6.1 # via premailer, zeep -markdown==2.6.9 # via -r requirements/base.in +markdown==3.0 # via -r requirements/base.in markupsafe==1.1.1 # via jinja2 mysqlclient==1.4.6 # via -r requirements/base.in naked==0.1.31 # via crypto, cybersource-rest-client-python diff --git a/requirements/test.txt b/requirements/test.txt index be1425083b8..06ba7d61e60 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -102,7 +102,7 @@ libsass==0.9.2 # via -r requirements/base.txt, django-libsass linecache2==1.0.0 # via -r requirements/base.txt, cybersource-rest-client-python, traceback2 logger==1.4 # via -r requirements/base.txt, cybersource-rest-client-python lxml==4.6.1 # via -r requirements/base.txt, -r requirements/test.in, premailer, zeep -markdown==2.6.9 # via -r requirements/base.txt +markdown==3.0 # via -r requirements/base.txt markupsafe==1.1.1 # via -r requirements/base.txt, jinja2 mccabe==0.6.1 # via pylint mock-django==0.6.10 # via -r requirements/test.in