Skip to content

Commit

Permalink
perf(DS-368): add support for olive Open edX release (#24)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: add compatibility with olive
  • Loading branch information
mariajgrimaldi committed Jan 27, 2023
1 parent 64e8904 commit e4b6e4c
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 80 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/bump_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
token: ${{ secrets.DEDALO_PAT }}
- name: Get next version
id: tag_version
uses: mathieudutour/github-tag-action@v6.0
uses: mathieudutour/github-tag-action@v6.1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
default_bump: false
default_prerelease_bump: false
dry_run: true
- name: Set up Python 3.8
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: "3.8"
- name: Create bumpversion
Expand All @@ -33,14 +33,14 @@ jobs:
bumpversion --new-version ${{ steps.tag_version.outputs.new_version }} setup.cfg
- name: Update Changelog
if: steps.tag_version.outputs.new_version
uses: stefanzweifel/changelog-updater-action@v1.6.2
uses: stefanzweifel/changelog-updater-action@v1
with:
latest-version: ${{ steps.tag_version.outputs.new_tag }}
release-notes: ${{ steps.tag_version.outputs.changelog }}
- name: Commit bumpversion
id: bumpversion
if: steps.tag_version.outputs.new_version
uses: stefanzweifel/git-auto-commit-action@v4.14.1
uses: stefanzweifel/git-auto-commit-action@v4
with:
branch: ${{ github.ref }}
commit_message: "docs(bumpversion): ${{ steps.tag_version.outputs.previous_tag }} → ${{ steps.tag_version.outputs.new_version }}"
Expand All @@ -58,7 +58,7 @@ jobs:
token: ${{ secrets.DEDALO_PAT }}
- name: Create tag
id: tag_version
uses: mathieudutour/github-tag-action@v6.0
uses: mathieudutour/github-tag-action@v6.1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
commit_sha: ${{ needs.bumpversion.outputs.bump_commit_sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
commitlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: wagoid/commitlint-github-action@v4
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.7.0
- uses: CodelyTV/pr-size-labeler@v1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
xs_max_size: '10'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:
django: ["32"]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache dependency
uses: actions/cache@v2
uses: actions/cache@v3
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@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}

Expand Down
30 changes: 16 additions & 14 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,26 @@ Installation

.. code-block:: python
python manage.py migrate
python manage.py migrate eox_audit_model
Open edX compatibility notes
----------------------------

+-------------------+----------------+
| Open edX Release | Version |
+===================+================+
| Juniper | >=0.2, < 0.4 |
+-------------------+----------------+
| Koa | >=0.4, <= 0.7 |
+-------------------+----------------+
| Lilac | >=0.4, <= 0.7 |
+-------------------+----------------+
| Maple | >=0.7, <1.0 |
+-------------------+----------------+
| Nutmeg | >=1.0 |
+-------------------+----------------+
+------------------+---------------+
| Open edX Release | Version |
+==================+===============+
| Juniper | >=0.2, < 0.4 |
+------------------+---------------+
| Koa | >=0.4, <= 0.7 |
+------------------+---------------+
| Lilac | >=0.4, <= 0.7 |
+------------------+---------------+
| Maple | >=0.7, <1.0 |
+------------------+---------------+
| Nutmeg | >=1.0 |
+------------------+---------------+
| Olive | >=2.0 |
+------------------+---------------+


Usage
Expand Down
10 changes: 5 additions & 5 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# This file is autogenerated by pip-compile with python 3.9
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
amqp==5.1.1
# via kombu
asgiref==3.5.2
asgiref==3.6.0
# via django
billiard==3.6.4.0
# via celery
Expand All @@ -26,7 +26,7 @@ click-plugins==1.1.1
# via celery
click-repl==0.2.0
# via celery
django==3.2.15
django==3.2.16
# via
# -c requirements/constraints.txt
# -r requirements/base.in
Expand All @@ -40,7 +40,7 @@ jsonfield==3.1.0
# via -r requirements/base.in
kombu==5.2.4
# via celery
prompt-toolkit==3.0.31
prompt-toolkit==3.0.36
# via click-repl
pytz==2022.1
# via
Expand All @@ -56,5 +56,5 @@ vine==5.0.0
# amqp
# celery
# kombu
wcwidth==0.2.5
wcwidth==0.2.6
# via prompt-toolkit
11 changes: 2 additions & 9 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,11 @@
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.

# Django version 3.0.0 dropped support for python 3.5
Django<3.3
# Use same versions as edx-platform release


# Version used in Nutmeg version of edx-platform
# Drop support for python 3.5
Django<4.0
celery>=5.2.2,<6.0.0
pylint<2.14
pip-tools<6.7
pep517<0.13
pycodestyle<2.9
pytz<2022.2
testfixtures<6.19
typing-extensions<4.2
wrapt<1.12
22 changes: 11 additions & 11 deletions requirements/pip-tools.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.9
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
build==0.10.0
# via pip-tools
click==8.1.3
# via pip-tools
pep517==0.12.0
# via
# -c requirements/constraints.txt
# pip-tools
pip-tools==6.6.2
# via
# -c requirements/constraints.txt
# -r requirements/pip-tools.in
packaging==23.0
# via build
pip-tools==6.12.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via pep517
wheel==0.37.1
# via build
wheel==0.38.4
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
31 changes: 14 additions & 17 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.9
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
Expand All @@ -8,7 +8,7 @@ amqp==5.1.1
# via
# -r requirements/base.txt
# kombu
asgiref==3.5.2
asgiref==3.6.0
# via
# -r requirements/base.txt
# django
Expand Down Expand Up @@ -41,11 +41,11 @@ click-repl==0.2.0
# via
# -r requirements/base.txt
# celery
coverage==6.4.4
coverage==7.0.5
# via -r requirements/test.in
dill==0.3.5.1
dill==0.3.6
# via pylint
django==3.2.15
django==3.2.16
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
Expand All @@ -55,23 +55,23 @@ django-crum==0.7.9
# via -r requirements/base.txt
django-ipware==4.0.2
# via -r requirements/base.txt
isort==5.10.1
isort==5.11.4
# via pylint
jsonfield==3.1.0
# via -r requirements/base.txt
kombu==5.2.4
# via
# -r requirements/base.txt
# celery
lazy-object-proxy==1.7.1
lazy-object-proxy==1.9.0
# via astroid
mccabe==0.7.0
# via pylint
mock==4.0.3
mock==5.0.1
# via -r requirements/test.in
platformdirs==2.5.2
platformdirs==2.6.2
# via pylint
prompt-toolkit==3.0.31
prompt-toolkit==3.0.36
# via
# -r requirements/base.txt
# click-repl
Expand Down Expand Up @@ -103,9 +103,8 @@ testfixtures==6.18.5
# -r requirements/test.in
tomli==2.0.1
# via pylint
typing-extensions==4.1.1
typing-extensions==4.4.0
# via
# -c requirements/constraints.txt
# astroid
# pylint
vine==5.0.0
Expand All @@ -114,14 +113,12 @@ vine==5.0.0
# amqp
# celery
# kombu
wcwidth==0.2.5
wcwidth==0.2.6
# via
# -r requirements/base.txt
# prompt-toolkit
wrapt==1.11.2
# via
# -c requirements/constraints.txt
# astroid
wrapt==1.14.1
# via astroid

# The following packages are considered to be unsafe in a requirements file:
# setuptools
36 changes: 22 additions & 14 deletions requirements/tox.txt
Original file line number Diff line number Diff line change
@@ -1,30 +1,38 @@
#
# This file is autogenerated by pip-compile with python 3.9
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
cachetools==5.3.0
# via tox
chardet==5.1.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.6
# via virtualenv
filelock==3.8.0
filelock==3.9.0
# via
# tox
# virtualenv
packaging==23.0
# via
# pyproject-api
# tox
platformdirs==2.6.2
# via
# tox
# virtualenv
packaging==21.3
# via tox
platformdirs==2.5.2
# via virtualenv
pluggy==1.0.0
# via tox
py==1.11.0
# via tox
pyparsing==3.0.9
# via packaging
six==1.16.0
pyproject-api==1.5.0
# via tox
tomli==2.0.1
# via tox
tox==3.26.0
# via
# pyproject-api
# tox
tox==4.3.5
# via -r requirements/tox.in
virtualenv==20.16.5
virtualenv==20.17.1
# via tox

0 comments on commit e4b6e4c

Please sign in to comment.