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.

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

perf: quince release support #47

Merged
merged 14 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/bumpversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
default_prerelease_bump: false
dry_run: true
- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.8"
- name: Create bumpversion
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
name: Label the PR size
steps:
- uses: CodelyTV/pr-size-labeler@v1
- uses: CodelyTV/pr-size-labeler@v1.7.0
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
xs_max_size: '10'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v4.1.1
with:
python-version: '3.10'
- name: Install dependencies
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version: ["3.8", "3.10", "3.11"]
bra-i-am marked this conversation as resolved.
Show resolved Hide resolved
django: ["32"]
python-version: ["3.8"]
django: ["32", "42"]
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1

- name: Cache dependency
uses: actions/cache@v3
uses: actions/cache@v4.0.0
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements/test.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5.0.0
with:
python-version: ${{ matrix.python-version }}

Expand Down
10 changes: 10 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ Compatibility Notes
+-------------------+----------------+
| Palm | >= 5.0 |
+-------------------+----------------+
| Quince | >= 6.0 |
+-------------------+----------------+

The following changes to the plugin settings are necessary. If the release you are looking for is
not listed, then the accumulation of changes from previous releases is enough.
Expand Down Expand Up @@ -95,6 +97,14 @@ not listed, then the accumulation of changes from previous releases is enough.
EOX_HOOKS_COURSE_MODES_BACKEND: "eox_hooks.edxapp_wrapper.backends.course_modes_l_v1"
EOX_HOOKS_MODELS_BACKEND: "eox_hooks.edxapp_wrapper.backends.models_l_v1"

**Quince**

.. code-block:: yaml
EOX_HOOKS_ENROLLMENTS_BACKEND: "eox_hooks.edxapp_wrapper.backends.enrollments_l_v1"
EOX_HOOKS_COURSES_BACKEND: "eox_hooks.edxapp_wrapper.backends.courses_p_v1"
EOX_HOOKS_COURSE_MODES_BACKEND: "eox_hooks.edxapp_wrapper.backends.course_modes_l_v1"
EOX_HOOKS_MODELS_BACKEND: "eox_hooks.edxapp_wrapper.backends.models_l_v1"


These settings can be changed in ``eox_hooks/settings/common.py`` or, for example, in ansible configurations.

Expand Down
2 changes: 1 addition & 1 deletion eox_hooks/receivers.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def hooks_handler(sender, signal, **kwargs):

trigger_event = None
for uid in _get_dispatch_uid(signal.receivers):
if uid.startswith('eox-hooks:'):
if str(uid).startswith('eox-hooks:'):
bra-i-am marked this conversation as resolved.
Show resolved Hide resolved
trigger_event = uid.split(':')[1]
break

Expand Down
4 changes: 2 additions & 2 deletions eox_hooks/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""
from django.conf.urls import url
from django.urls import re_path

from eox_hooks import views

urlpatterns = [
url(r'^eox-info$', views.info_view, name='eox-info'),
re_path(r'^eox-info$', views.info_view, name='eox-info'),
]
27 changes: 17 additions & 10 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.10
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
Expand All @@ -8,11 +8,15 @@ amqp==5.2.0
# via kombu
asgiref==3.7.2
# via django
attrs==23.1.0
attrs==23.2.0
# via openedx-events
backports-zoneinfo[tzdata]==0.2.1
# via
# celery
# kombu
billiard==4.2.0
# via celery
celery==5.3.5
celery==5.3.6
# via
# -c requirements/constraints.txt
# -r requirements/base.in
Expand Down Expand Up @@ -45,17 +49,17 @@ edx-opaque-keys[django]==2.5.1
# via
# -r requirements/base.in
# openedx-events
fastavro==1.9.0
fastavro==1.9.3
# via openedx-events
kombu==5.3.4
kombu==5.3.5
# via celery
openedx-events==4.1.1
# via
# -c requirements/constraints.txt
# -r requirements/base.in
pbr==6.0.0
# via stevedore
prompt-toolkit==3.0.41
prompt-toolkit==3.0.43
# via click-repl
pymongo==3.13.0
# via edx-opaque-keys
Expand All @@ -71,16 +75,19 @@ sqlparse==0.4.4
# via django
stevedore==5.1.0
# via edx-opaque-keys
typing-extensions==4.8.0
typing-extensions==4.9.0
# via
# asgiref
# edx-opaque-keys
tzdata==2023.3
# via celery
# kombu
tzdata==2023.4
# via
# backports-zoneinfo
# celery
vine==5.1.0
# via
# amqp
# celery
# kombu
wcwidth==0.2.10
wcwidth==0.2.13
# via prompt-toolkit
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
# Keep same platform version
celery>=5.2.2,<6.0.0
djangorestframework<3.13.0
Django<3.3
Django<5.0
openedx-events==4.1.1
pytz==2022.2.1
1 change: 1 addition & 0 deletions requirements/django32.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
django==3.2.23
1 change: 1 addition & 0 deletions requirements/django42.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Django==4.2.8
8 changes: 6 additions & 2 deletions requirements/pip-tools.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.10
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
Expand All @@ -8,6 +8,8 @@ build==1.0.3
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.0.1
# via build
packaging==23.2
# via build
pip-tools==7.3.0
Expand All @@ -19,8 +21,10 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.3
wheel==0.42.0
# via pip-tools
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
40 changes: 24 additions & 16 deletions requirements/test.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.10
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
Expand All @@ -12,21 +12,26 @@ asgiref==3.7.2
# via
# -r requirements/base.txt
# django
astroid==3.0.1
astroid==3.0.2
# via pylint
attrs==23.1.0
attrs==23.2.0
# via
# -r requirements/base.txt
# openedx-events
backports-zoneinfo[tzdata]==0.2.1
# via
# -r requirements/base.txt
# celery
# kombu
billiard==4.2.0
# via
# -r requirements/base.txt
# celery
celery==5.3.5
celery==5.3.6
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
certifi==2023.7.22
certifi==2023.11.17
# via requests
charset-normalizer==3.3.2
# via requests
Expand All @@ -49,7 +54,7 @@ click-repl==0.3.0
# via
# -r requirements/base.txt
# celery
coverage==7.3.2
coverage==7.4.0
# via -r requirements/test.in
dill==0.3.7
# via pylint
Expand All @@ -69,15 +74,15 @@ edx-opaque-keys[django]==2.5.1
# via
# -r requirements/base.txt
# openedx-events
fastavro==1.9.0
fastavro==1.9.3
# via
# -r requirements/base.txt
# openedx-events
idna==3.4
idna==3.6
# via requests
isort==5.12.0
isort==5.13.2
# via pylint
kombu==5.3.4
kombu==5.3.5
# via
# -r requirements/base.txt
# celery
Expand All @@ -93,15 +98,15 @@ pbr==6.0.0
# via
# -r requirements/base.txt
# stevedore
platformdirs==4.0.0
platformdirs==4.1.0
# via pylint
prompt-toolkit==3.0.41
prompt-toolkit==3.0.43
# via
# -r requirements/base.txt
# click-repl
pycodestyle==2.11.1
# via -r requirements/test.in
pylint==3.0.2
pylint==3.0.3
# via -r requirements/test.in
pymongo==3.13.0
# via
Expand Down Expand Up @@ -136,15 +141,18 @@ tomli==2.0.1
# via pylint
tomlkit==0.12.3
# via pylint
typing-extensions==4.8.0
typing-extensions==4.9.0
# via
# -r requirements/base.txt
# asgiref
# astroid
# edx-opaque-keys
tzdata==2023.3
# kombu
# pylint
tzdata==2023.4
# via
# -r requirements/base.txt
# backports-zoneinfo
# celery
urllib3==2.1.0
# via requests
Expand All @@ -154,7 +162,7 @@ vine==5.1.0
# amqp
# celery
# kombu
wcwidth==0.2.10
wcwidth==0.2.13
# via
# -r requirements/base.txt
# prompt-toolkit
12 changes: 6 additions & 6 deletions requirements/tox.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.10
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
Expand All @@ -10,7 +10,7 @@ chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.7
distlib==0.3.8
# via virtualenv
filelock==3.13.1
# via
Expand All @@ -20,19 +20,19 @@ packaging==23.2
# via
# pyproject-api
# tox
platformdirs==3.11.0
platformdirs==4.1.0
# via
# tox
# virtualenv
pluggy==1.3.0
pluggy==1.4.0
# via tox
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.11.3
tox==4.12.1
# via -r requirements/tox.in
virtualenv==20.24.6
virtualenv==20.25.0
# via tox
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{38,310,311}-django{32}
envlist = py{38,310,311}-django{32,42}


[testenv]
Expand All @@ -11,6 +11,8 @@ envdir=

deps =
django32: -r requirements/django.txt
django32: -r requirements/django32.txt
django42: -r requirements/django42.txt
-r requirements/test.txt

commands =
Expand Down
Loading