Skip to content

Commit

Permalink
Merge branch 'master' into saraburns1_upgrade_ubuntu
Browse files Browse the repository at this point in the history
  • Loading branch information
ziafazal authored Aug 28, 2024
2 parents feea8f7 + 58cea8f commit c49a27d
Show file tree
Hide file tree
Showing 15 changed files with 222 additions and 421 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os: [ 'ubuntu-24.04' ]
python-version: ['3.8', '3.11', '3.12']
python-version: ['3.11', '3.12']
toxenv: [ 'django42' ]
# Only run these other workflows on the latest python version we support.
include:
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
if: matrix.python-version == '3.11' && matrix.toxenv=='django42'
uses: codecov/codecov-action@v4
with:
flags: unittests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.11

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sphinx:
build:
os: "ubuntu-22.04"
tools:
python: "3.8"
python: "3.11"

python:
install:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ def get_object(self):
)


@ XApiTransformersRegistry.register('edx.ui.lms.sequence.outline.selected')
@ XApiTransformersRegistry.register('edx.ui.lms.outline.selected')
@XApiTransformersRegistry.register('edx.ui.lms.sequence.outline.selected')
@XApiTransformersRegistry.register('edx.ui.lms.outline.selected')
class OutlineSelectedTransformer(NavigationTransformersMixin):
"""
xAPI transformer for Navigation events.
Expand All @@ -91,9 +91,9 @@ def get_object(self):
)


@ XApiTransformersRegistry.register('edx.ui.lms.sequence.next_selected')
@ XApiTransformersRegistry.register('edx.ui.lms.sequence.previous_selected')
@ XApiTransformersRegistry.register('edx.ui.lms.sequence.tab_selected')
@XApiTransformersRegistry.register('edx.ui.lms.sequence.next_selected')
@XApiTransformersRegistry.register('edx.ui.lms.sequence.previous_selected')
@XApiTransformersRegistry.register('edx.ui.lms.sequence.tab_selected')
class TabNavigationTransformer(NavigationTransformersMixin):
"""
xAPI transformer for Navigation events.
Expand Down
68 changes: 27 additions & 41 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -12,26 +12,17 @@ apache-libcloud==3.8.0
# via -r requirements/base.in
asgiref==3.8.1
# via django
async-timeout==4.0.3
# via redis
attrs==23.2.0
attrs==24.2.0
# via openedx-events
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# celery
# django
# djangorestframework
# kombu
billiard==4.2.0
# via celery
celery==5.4.0
# via
# edx-celeryutils
# event-tracking
certifi==2024.6.2
certifi==2024.7.4
# via requests
cffi==1.16.0
cffi==1.17.0
# via
# cryptography
# pynacl
Expand All @@ -53,9 +44,9 @@ click-repl==0.3.0
# via celery
code-annotations==1.8.0
# via edx-toggles
cryptography==42.0.8
cryptography==43.0.0
# via django-fernet-fields-v2
django==4.2.13
django==4.2.15
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
Expand Down Expand Up @@ -89,19 +80,19 @@ django-waffle==4.1.0
# via
# edx-django-utils
# edx-toggles
djangorestframework==3.15.1
djangorestframework==3.15.2
# via django-config-models
edx-ccx-keys==1.3.0
# via openedx-events
edx-celeryutils==1.3.0
# via -r requirements/base.in
edx-django-utils==5.14.2
edx-django-utils==5.15.0
# via
# django-config-models
# edx-toggles
# event-tracking
# openedx-events
edx-opaque-keys[django]==2.9.0
edx-opaque-keys[django]==2.10.0
# via
# edx-ccx-keys
# openedx-events
Expand All @@ -111,13 +102,13 @@ edx-toggles==5.2.0
# event-tracking
event-tracking==2.4.0
# via
# -c requirements/constraints.txt
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
fastavro==1.9.4
fastavro==1.9.5
# via openedx-events
fasteners==0.19
# via -r requirements/base.in
idna==3.7
idna==3.8
# via requests
isodate==0.6.1
# via -r requirements/base.in
Expand All @@ -127,21 +118,21 @@ jsonfield==3.1.0
# via
# -r requirements/base.in
# edx-celeryutils
kombu==5.3.7
kombu==5.4.0
# via celery
markupsafe==2.1.5
# via jinja2
newrelic==9.10.0
newrelic==9.13.0
# via edx-django-utils
openedx-events==9.10.0
openedx-events==9.12.0
# via event-tracking
openedx-filters==1.8.1
openedx-filters==1.9.0
# via -r requirements/base.in
pbr==6.0.0
pbr==6.1.0
# via stevedore
prompt-toolkit==3.0.46
prompt-toolkit==3.0.47
# via click-repl
psutil==5.9.8
psutil==6.0.0
# via edx-django-utils
pycparser==2.22
# via cffi
Expand All @@ -162,9 +153,9 @@ pytz==2024.1
# -r requirements/base.in
# event-tracking
# tincan
pyyaml==6.0.1
pyyaml==6.0.2
# via code-annotations
redis==5.0.4
redis==5.0.8
# via django-redis
requests==2.32.3
# via
Expand All @@ -176,9 +167,9 @@ six==1.16.0
# event-tracking
# isodate
# python-dateutil
sqlparse==0.5.0
sqlparse==0.5.1
# via django
stevedore==5.2.0
stevedore==5.3.0
# via
# code-annotations
# edx-django-utils
Expand All @@ -187,16 +178,11 @@ text-unidecode==1.3
# via python-slugify
tincan==1.0.0
# via -r requirements/base.in
typing-extensions==4.12.1
# via
# asgiref
# edx-opaque-keys
# kombu
typing-extensions==4.12.2
# via edx-opaque-keys
tzdata==2024.1
# via
# backports-zoneinfo
# celery
urllib3==2.2.1
# via celery
urllib3==2.2.2
# via requests
vine==5.1.0
# via
Expand Down
18 changes: 7 additions & 11 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
cachetools==5.3.3
cachetools==5.5.0
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.14.0
filelock==3.15.4
# via
# tox
# virtualenv
packaging==24.0
packaging==24.1
# via
# pyproject-api
# tox
Expand All @@ -26,13 +26,9 @@ platformdirs==4.2.2
# virtualenv
pluggy==1.5.0
# via tox
pyproject-api==1.6.1
pyproject-api==1.7.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.15.0
tox==4.18.0
# via -r requirements/ci.in
virtualenv==20.26.2
virtualenv==20.26.3
# via tox
16 changes: 0 additions & 16 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,3 @@

# Common constraints for edx repos
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

# diff-cover latest requires (pluggy>=0.13.1,<0.14.0)
# which conflicts with pytest(pluggy>=0.12,<2.0.0) and tox(pluggy>0.12) both of these fetch pluggy==1.0.0
# but diff-cover latest has a pin (pluggy<1.0.0a1)
# Using the same version of diff-cover which is being used currently in edx-platform to avoid this conflict.
diff-cover==4.0.0

# greater version failing docs build
sphinx==4.2.0
# Sphinx requires docutils<0.18 && doc8<1.0.0
# This pin can be removed once sphinx constraint is removed.
docutils<0.18
doc8<1.0.0
event-tracking>=2.3.2
# it is not availablein python3.9
backports.zoneinfo;python_version<"3.9"
Loading

0 comments on commit c49a27d

Please sign in to comment.