Skip to content

Commit

Permalink
bumped markdown version to resolve the conflict with rest-framework (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
marslanabdulrauf authored Aug 21, 2023
1 parent a3a0392 commit 4edbb96
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions ecommerce/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'))),
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4edbb96

Please sign in to comment.