From e4b6e4cae097aa769435fd40342964a1d120ebca Mon Sep 17 00:00:00 2001 From: Maria Grimaldi Date: Fri, 27 Jan 2023 13:42:01 -0400 Subject: [PATCH] perf(DS-368): add support for olive Open edX release (#24) BREAKING CHANGE: add compatibility with olive --- .github/workflows/bump_version.yml | 10 ++++----- .github/workflows/commitlint.yml | 2 +- .github/workflows/labeler.yml | 2 +- .github/workflows/tests.yml | 6 ++--- README.rst | 30 +++++++++++++------------ requirements/base.txt | 10 ++++----- requirements/constraints.txt | 11 ++------- requirements/pip-tools.txt | 22 +++++++++--------- requirements/test.txt | 31 ++++++++++++------------- requirements/tox.txt | 36 ++++++++++++++++++------------ 10 files changed, 80 insertions(+), 80 deletions(-) diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index 357a24a..9f7a429 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -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 @@ -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 }}" @@ -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 }} diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index 67e6df3..5fcfeae 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -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 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 33dda30..b8025ef 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -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' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 42006ca..750c804 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 }} diff --git a/README.rst b/README.rst index a229919..3604377 100644 --- a/README.rst +++ b/README.rst @@ -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 diff --git a/requirements/base.txt b/requirements/base.txt index 76f8b4a..2822c85 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 @@ -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 @@ -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 @@ -56,5 +56,5 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.5 +wcwidth==0.2.6 # via prompt-toolkit diff --git a/requirements/constraints.txt b/requirements/constraints.txt index ca1e9d9..c89db8c 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -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 \ No newline at end of file diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index c139599..8821f08 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -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: diff --git a/requirements/test.txt b/requirements/test.txt index 364faa3..e8358e4 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -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 @@ -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 @@ -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 @@ -55,7 +55,7 @@ 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 @@ -63,15 +63,15 @@ 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 @@ -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 @@ -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 diff --git a/requirements/tox.txt b/requirements/tox.txt index 4933e18..dae18b5 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -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