Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): Credly Badges re-configuration #64

Merged
merged 3 commits into from
Feb 13, 2024
Merged

fix(deps): Credly Badges re-configuration #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
353d51e
fix: [ACI-435] install Credly Badges in a correct way
wowkalucky Feb 13, 2024
18553dd
fix: remove duplicated notes
wowkalucky Feb 13, 2024
6ea16a3
fix: auto-discover Credly Badges internal modules
wowkalucky Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions credentials/apps/badges/distribution/credly/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ badges = "credly_badges.apps:CredlyBadgesConfig"
[project.urls]
Repository = "https://github.com/openedx/credentials.git"

[tool.setuptools]
packages = ["credly_badges"]

[tool.setuptools.dynamic]
version = { attr = "credly_badges.__version__" }
dependencies = { file = "requirements/base.txt" }
Expand Down
14 changes: 8 additions & 6 deletions requirements/all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# make upgrade
#
-e file:///edx/app/credentials/credentials/credentials/apps/badges/distribution/credly
# via -r requirements/dev.txt
asgiref==3.7.2
# via
# -r requirements/dev.txt
Expand Down Expand Up @@ -38,17 +36,17 @@ bcrypt==4.1.2
# via
# -r requirements/dev.txt
# paramiko
black==24.1.1
black==24.2.0
# via -r requirements/dev.txt
bleach==6.1.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
boto3==1.34.39
boto3==1.34.40
# via
# -r requirements/production.txt
# django-ses
botocore==1.34.39
botocore==1.34.40
# via
# -r requirements/production.txt
# boto3
Expand Down Expand Up @@ -200,7 +198,7 @@ django-filter==23.5
# via
# -r requirements/dev.txt
# -r requirements/production.txt
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -453,6 +451,10 @@ openedx-atlas==0.6.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
openedx-badges-credly @ git+https://github.com/raccoongang/[email protected]#subdirectory=credentials/apps/badges/distribution/credly
# via
# -r requirements/dev.txt
# -r requirements/production.txt
openedx-events @ git+https://github.com/raccoongang/[email protected]
# via
# -r requirements/dev.txt
Expand Down
8 changes: 5 additions & 3 deletions requirements/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ segment-analytics-python
social-auth-app-django
xss-utils

# Badges baked-in backends:
-e credentials/apps/badges/distribution/credly

# TODO Install in configuration
git+https://github.com/openedx/[email protected]#egg=edx_credentials_themes==0.3.22

# Badges baked-in backends:
openedx-badges-credly @ git+https://github.com/raccoongang/[email protected]#subdirectory=credentials/apps/badges/distribution/credly

# FIXME: switch this to upstream once approved/merged:
git+https://github.com/raccoongang/[email protected]#egg=openedx_events
6 changes: 3 additions & 3 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# make upgrade
#
-e file:///edx/app/credentials/credentials/credentials/apps/badges/distribution/credly
# via -r requirements/base.in
asgiref==3.7.2
# via
# django
Expand Down Expand Up @@ -91,7 +89,7 @@ django-extensions==3.2.3
# via -r requirements/base.in
django-filter==23.5
# via -r requirements/base.in
django-model-utils==4.3.1
django-model-utils==4.4.0
# via -r requirements/base.in
django-ratelimit==4.1.0
# via -r requirements/base.in
Expand Down Expand Up @@ -192,6 +190,8 @@ openapi-codec==1.3.2
# via django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/base.in
openedx-badges-credly @ git+https://github.com/raccoongang/[email protected]#subdirectory=credentials/apps/badges/distribution/credly
# via -r requirements/base.in
openedx-events @ git+https://github.com/raccoongang/[email protected]
# via
# -r requirements/base.in
Expand Down
5 changes: 0 additions & 5 deletions requirements/common_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# A central location for most common version constraints
# (across edx repos) for pip-installation.
#
Expand Down
8 changes: 4 additions & 4 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# make upgrade
#
-e file:///edx/app/credentials/credentials/credentials/apps/badges/distribution/credly
# via -r requirements/test.txt
asgiref==3.7.2
# via
# -r requirements/test.txt
Expand All @@ -32,7 +30,7 @@ backports-zoneinfo==0.2.1
# django
bcrypt==4.1.2
# via paramiko
black==24.1.1
black==24.2.0
# via -r requirements/test.txt
bleach==6.1.0
# via -r requirements/test.txt
Expand Down Expand Up @@ -160,7 +158,7 @@ django-extensions==3.2.3
# via -r requirements/test.txt
django-filter==23.5
# via -r requirements/test.txt
django-model-utils==4.3.1
django-model-utils==4.4.0
# via -r requirements/test.txt
django-ratelimit==4.1.0
# via -r requirements/test.txt
Expand Down Expand Up @@ -332,6 +330,8 @@ openapi-codec==1.3.2
# django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/test.txt
openedx-badges-credly @ git+https://github.com/raccoongang/[email protected]#subdirectory=credentials/apps/badges/distribution/credly
# via -r requirements/test.txt
openedx-events @ git+https://github.com/raccoongang/[email protected]
# via
# -r requirements/test.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.42.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.0.3
setuptools==69.1.0
# via -r requirements/pip.in
10 changes: 5 additions & 5 deletions requirements/production.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# make upgrade
#
-e file:///edx/app/credentials/credentials/credentials/apps/badges/distribution/credly
# via -r requirements/base.txt
asgiref==3.7.2
# via
# -r requirements/base.txt
Expand All @@ -26,9 +24,9 @@ backports-zoneinfo==0.2.1
# django
bleach==6.1.0
# via -r requirements/base.txt
boto3==1.34.39
boto3==1.34.40
# via django-ses
botocore==1.34.39
botocore==1.34.40
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -119,7 +117,7 @@ django-extensions==3.2.3
# via -r requirements/base.txt
django-filter==23.5
# via -r requirements/base.txt
django-model-utils==4.3.1
django-model-utils==4.4.0
# via -r requirements/base.txt
django-ratelimit==4.1.0
# via -r requirements/base.txt
Expand Down Expand Up @@ -258,6 +256,8 @@ openapi-codec==1.3.2
# django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/base.txt
openedx-badges-credly @ git+https://github.com/raccoongang/[email protected]#subdirectory=credentials/apps/badges/distribution/credly
# via -r requirements/base.txt
openedx-events @ git+https://github.com/raccoongang/[email protected]
# via
# -r requirements/base.txt
Expand Down
8 changes: 4 additions & 4 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# make upgrade
#
-e file:///edx/app/credentials/credentials/credentials/apps/badges/distribution/credly
# via -r requirements/base.txt
asgiref==3.7.2
# via
# -r requirements/base.txt
Expand All @@ -28,7 +26,7 @@ backports-zoneinfo==0.2.1
# via
# -r requirements/base.txt
# django
black==24.1.1
black==24.2.0
# via -r requirements/test.in
bleach==6.1.0
# via -r requirements/base.txt
Expand Down Expand Up @@ -138,7 +136,7 @@ django-extensions==3.2.3
# via -r requirements/base.txt
django-filter==23.5
# via -r requirements/base.txt
django-model-utils==4.3.1
django-model-utils==4.4.0
# via -r requirements/base.txt
django-ratelimit==4.1.0
# via -r requirements/base.txt
Expand Down Expand Up @@ -286,6 +284,8 @@ openapi-codec==1.3.2
# django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/base.txt
openedx-badges-credly @ git+https://github.com/raccoongang/[email protected]#subdirectory=credentials/apps/badges/distribution/credly
# via -r requirements/base.txt
openedx-events @ git+https://github.com/raccoongang/[email protected]
# via
# -r requirements/base.txt
Expand Down
Loading