Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
fix: fix conflicting slugify modules (#1171)
Browse files Browse the repository at this point in the history 
* fix: remove duplicate slugify library

* chore: remove unused closure jar

* fix: removing failing datadog coverage script

* style: long line
  • Loading branch information
@zacharis278
zacharis278 authored Sep 1, 2021
1 parent 8399d7f commit f277a12
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 95 deletions.
2 changes: 0 additions & 2 deletions .travis/run_coverage.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@
cd /edx/app/insights/edx_analytics_dashboard

make coverage

bash ./scripts/build-stats-to-datadog.sh
5 changes: 4 additions & 1 deletion analytics_dashboard/courses/views/performance.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,10 @@ def _deslugify_assignment_type(self):
the assignment type is unchanged.
"""
for assignment_type in self.presenter.assignment_types():
if self.assignment_type['name'] == slugify(assignment_type['name']):
if (
self.assignment_type['name'] and
self.assignment_type['name'].lower() == slugify(assignment_type['name'])
):
self.assignment_type = assignment_type
break

Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-c constraints.txt

awesome-slugify # GPLv3
bpython # MIT License
Django # BSD License
django-appconf
Expand Down Expand Up @@ -32,6 +31,7 @@ logutils # BSD
requests # Apache 2.0
stevedore
path.py
python-slugify

# This can be removed once an official social-auth-app-django Pypi release with Django 2.2 support is available in the future.
-e git+https://github.com/python-social-auth/social-app-django.git@ffa0fb99a80d11479bea2c4eae9a01ee835d52b9#egg=social-auth-app-django
12 changes: 4 additions & 8 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
# edx-auth-backends
asgiref==3.4.1
# via django
awesome-slugify==1.6.5
# via -r requirements/base.in
blessings==1.7
# via curtsies
bpython==0.21
Expand All @@ -38,7 +36,7 @@ defusedxml==0.7.1
# via
# python3-openid
# social-auth-core
django==3.2.6
django==3.2.7
# via
# -r requirements/base.in
# django-appconf
Expand Down Expand Up @@ -177,7 +175,9 @@ pymongo==3.12.0
python-dateutil==2.8.2
# via edx-drf-extensions
python-slugify==5.0.2
# via code-annotations
# via
# -r requirements/base.in
# code-annotations
python3-openid==3.2.0
# via social-auth-core
pytz==2021.1
Expand All @@ -189,8 +189,6 @@ pyyaml==5.4.1
# code-annotations
# edx-django-release-util
# edx-i18n-tools
regex==2021.8.28
# via awesome-slugify
requests==2.26.0
# via
# -r requirements/base.in
Expand Down Expand Up @@ -242,7 +240,5 @@ text-unidecode==1.3
# via python-slugify
unicodecsv==0.14.1
# via djangorestframework-csv
unidecode==0.4.21
# via awesome-slugify
urllib3==1.26.6
# via requests
2 changes: 1 addition & 1 deletion requirements/django.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
django==3.2.6
django==3.2.7
12 changes: 1 addition & 11 deletions requirements/doc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ asgiref==3.4.1
# via
# -r requirements/base.txt
# django
awesome-slugify==1.6.5
# via -r requirements/base.txt
babel==2.9.1
# via sphinx
blessings==1.7
Expand Down Expand Up @@ -62,7 +60,7 @@ defusedxml==0.7.1
# -r requirements/base.txt
# python3-openid
# social-auth-core
django==3.2.6
django==3.2.7
# via
# -r requirements/base.txt
# django-appconf
Expand Down Expand Up @@ -271,10 +269,6 @@ pyyaml==5.4.1
# code-annotations
# edx-django-release-util
# edx-i18n-tools
regex==2021.8.28
# via
# -r requirements/base.txt
# awesome-slugify
requests==2.26.0
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -362,10 +356,6 @@ unicodecsv==0.14.1
# via
# -r requirements/base.txt
# djangorestframework-csv
unidecode==0.4.21
# via
# -r requirements/base.txt
# awesome-slugify
urllib3==1.26.6
# via
# -r requirements/base.txt
Expand Down
12 changes: 1 addition & 11 deletions requirements/local.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ attrs==21.2.0
# via
# -r requirements/test.txt
# pytest
awesome-slugify==1.6.5
# via -r requirements/test.txt
blessings==1.7
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -76,7 +74,7 @@ defusedxml==0.7.1
# -r requirements/test.txt
# python3-openid
# social-auth-core
django==3.2.6
django==3.2.7
# via
# -r requirements/test.txt
# django-appconf
Expand Down Expand Up @@ -340,10 +338,6 @@ pyyaml==5.4.1
# code-annotations
# edx-django-release-util
# edx-i18n-tools
regex==2021.8.28
# via
# -r requirements/test.txt
# awesome-slugify
requests==2.26.0
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -436,10 +430,6 @@ unicodecsv==0.14.1
# via
# -r requirements/test.txt
# djangorestframework-csv
unidecode==0.4.21
# via
# -r requirements/test.txt
# awesome-slugify
urllib3==1.26.6
# via
# -r requirements/test.txt
Expand Down
12 changes: 1 addition & 11 deletions requirements/production.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ asgiref==3.4.1
# via
# -r requirements/base.txt
# django
awesome-slugify==1.6.5
# via -r requirements/base.txt
blessings==1.7
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -58,7 +56,7 @@ defusedxml==0.7.1
# -r requirements/base.txt
# python3-openid
# social-auth-core
django==3.2.6
django==3.2.7
# via
# -r requirements/base.txt
# django-appconf
Expand Down Expand Up @@ -263,10 +261,6 @@ pyyaml==5.4.1
# code-annotations
# edx-django-release-util
# edx-i18n-tools
regex==2021.8.28
# via
# -r requirements/base.txt
# awesome-slugify
requests==2.26.0
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -335,10 +329,6 @@ unicodecsv==0.14.1
# via
# -r requirements/base.txt
# djangorestframework-csv
unidecode==0.4.21
# via
# -r requirements/base.txt
# awesome-slugify
urllib3==1.26.6
# via
# -r requirements/base.txt
Expand Down
10 changes: 0 additions & 10 deletions requirements/test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ astroid==2.3.3
# pylint
attrs==21.2.0
# via pytest
awesome-slugify==1.6.5
# via -r requirements/base.txt
blessings==1.7
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -308,10 +306,6 @@ pyyaml==5.4.1
# code-annotations
# edx-django-release-util
# edx-i18n-tools
regex==2021.8.28
# via
# -r requirements/base.txt
# awesome-slugify
requests==2.26.0
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -392,10 +386,6 @@ unicodecsv==0.14.1
# via
# -r requirements/base.txt
# djangorestframework-csv
unidecode==0.4.21
# via
# -r requirements/base.txt
# awesome-slugify
urllib3==1.26.6
# via
# -r requirements/base.txt
Expand Down
39 changes: 0 additions & 39 deletions scripts/build-stats-to-datadog.sh
View file

This file was deleted.

Binary file removed scripts/closure-compiler.jar
View file
Binary file not shown.

0 comments on commit f277a12

Please sign in to comment.