From e4e679ad91416d94108749ddecf8129aba767cd3 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Fri, 23 Feb 2024 07:37:32 -0500 Subject: [PATCH 1/5] feat: add python 3.12 support --- .github/workflows/ci.yml | 11 +++++------ tox.ini | 16 ++++++++-------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c739620e..6526d2aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: Python CI on: push: branches: - - master + - master pull_request: branches: - - '**' + - '**' jobs: run_tests: @@ -15,10 +15,9 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 - python-version: - - 3.8 - toxenv: [ formatting,quality,python ] + - ubuntu-20.04 + python-version: [3.8, '3.8', '3.12'] + toxenv: [formatting, quality, python, django42] steps: - uses: actions/checkout@v2 - name: setup python diff --git a/tox.ini b/tox.ini index 8a81cbfd..26e3b998 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38, quality, formatting +envlist = py{38, 312} quality, formatting [testenv:quality] basepython = python @@ -12,13 +12,13 @@ deps = black commands = black --check --diff --line-length 120 src tests setup.py [testenv] -setenv = - PYTHONPATH = {toxinidir} -deps = - -r{toxinidir}/requirements/test.txt -commands = - pip install -U pip - pytest --basetemp={envtmpdir} --cov cc2olx --cov-report term-missing --cov-report xml +setenv = + PYTHONPATH = {toxinidir} +deps = + -r{toxinidir}/requirements/test.txt +commands = + pip install -U pip + pytest --basetemp={envtmpdir} --cov cc2olx --cov-report term-missing --cov-report xml [testenv:python] From 323874637964cc020eeb4673018b68552758d2e9 Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Tue, 9 Apr 2024 17:17:03 +0500 Subject: [PATCH 2/5] feat: Adding python3.11 support. --- .github/workflows/ci.yml | 2 +- setup.py | 1 + src/cc2olx/__init__.py | 2 +- tox.ini | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6526d2aa..9665d28f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: matrix: os: - ubuntu-20.04 - python-version: [3.8, '3.8', '3.12'] + python-version: ['3.8', '3.11'] toxenv: [formatting, quality, python, django42] steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index ff95b825..65ab3344 100644 --- a/setup.py +++ b/setup.py @@ -37,6 +37,7 @@ def get_version(*file_paths): "Programming Language :: Python", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.11", "Topic :: Utilities", ], description=("Command line tool, that converts Common Cartridge " "courses to Open edX Studio imports."), diff --git a/src/cc2olx/__init__.py b/src/cc2olx/__init__.py index 3dc1f76b..d3ec452c 100644 --- a/src/cc2olx/__init__.py +++ b/src/cc2olx/__init__.py @@ -1 +1 @@ -__version__ = "0.1.0" +__version__ = "0.2.0" diff --git a/tox.ini b/tox.ini index 26e3b998..f1ac0004 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38, 312} quality, formatting +envlist = py{38, 311} quality, formatting [testenv:quality] basepython = python @@ -12,11 +12,11 @@ deps = black commands = black --check --diff --line-length 120 src tests setup.py [testenv] -setenv = +setenv = PYTHONPATH = {toxinidir} -deps = +deps = -r{toxinidir}/requirements/test.txt -commands = +commands = pip install -U pip pytest --basetemp={envtmpdir} --cov cc2olx --cov-report term-missing --cov-report xml From 2d39da719f25beac222c21e8ce9024c70e39b158 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 9 Apr 2024 08:18:07 -0400 Subject: [PATCH 3/5] chore: Updating Python Requirements --- requirements/base.txt | 2 +- requirements/ci.txt | 24 +++++------ requirements/common_constraints.txt | 11 ++++- requirements/dev.txt | 62 ++++++++++++++++------------- requirements/pip-tools.txt | 12 +++--- requirements/pip.txt | 4 +- requirements/quality.txt | 16 ++++---- requirements/test.txt | 12 +++--- 8 files changed, 80 insertions(+), 63 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 03b675a6..0ac9552f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,7 +10,7 @@ charset-normalizer==3.3.2 # via requests idna==3.6 # via requests -lxml==5.1.0 +lxml==5.2.1 # via -r requirements/base.in requests==2.31.0 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index a6fb3eb4..15818bae 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,9 +4,9 @@ # # make upgrade # -black==24.2.0 +black==24.3.0 # via -r requirements/quality.txt -cachetools==5.3.2 +cachetools==5.3.3 # via tox certifi==2024.2.2 # via @@ -24,7 +24,7 @@ click==8.1.7 # black colorama==0.4.6 # via tox -coverage[toml]==7.4.1 +coverage[toml]==7.4.4 # via # -r requirements/ci.in # -r requirements/quality.txt @@ -35,7 +35,7 @@ exceptiongroup==1.2.0 # via # -r requirements/quality.txt # pytest -filelock==3.13.1 +filelock==3.13.3 # via # tox # virtualenv @@ -49,7 +49,7 @@ iniconfig==2.0.0 # via # -r requirements/quality.txt # pytest -lxml==5.1.0 +lxml==5.2.1 # via -r requirements/quality.txt mccabe==0.7.0 # via @@ -59,7 +59,7 @@ mypy-extensions==1.0.0 # via # -r requirements/quality.txt # black -packaging==23.2 +packaging==24.0 # via # -r requirements/quality.txt # black @@ -91,14 +91,14 @@ pyflakes==3.2.0 # flake8 pyproject-api==1.6.1 # via tox -pytest==8.0.1 +pytest==8.1.1 # via # -r requirements/quality.txt # pytest-cov # pytest-mock -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/quality.txt -pytest-mock==3.12.0 +pytest-mock==3.14.0 # via -r requirements/quality.txt requests==2.31.0 # via -r requirements/quality.txt @@ -110,9 +110,9 @@ tomli==2.0.1 # pyproject-api # pytest # tox -tox==4.13.0 +tox==4.14.2 # via -r requirements/ci.in -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r requirements/quality.txt # black @@ -120,7 +120,7 @@ urllib3==2.2.1 # via # -r requirements/quality.txt # requests -virtualenv==20.25.0 +virtualenv==20.25.1 # via tox xmlformatter==0.2.6 # via -r requirements/quality.txt diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 15aafb29..e3bf8eae 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -13,7 +13,7 @@ # using LTS django version -Django<4.0 +Django<5.0 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html @@ -21,3 +21,12 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 + +# opentelemetry requires version 6.x at the moment: +# https://github.com/open-telemetry/opentelemetry-python/issues/3570 +# Normally this could be added as a constraint in edx-django-utils, where we're +# adding the opentelemetry dependency. However, when we compile pip-tools.txt, +# that uses version 7.x, and then there's no undoing that when compiling base.txt. +# So we need to pin it globally, for now. +# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 +importlib-metadata<7 diff --git a/requirements/dev.txt b/requirements/dev.txt index 5a7c881e..4706f794 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,17 +4,19 @@ # # make upgrade # -black==24.2.0 +backports-tarfile==1.0.0 + # via jaraco-context +black==24.3.0 # via # -r requirements/ci.txt # -r requirements/quality.txt -build==1.0.3 +build==1.2.1 # via # -r requirements/pip-tools.txt # pip-tools bump2version==1.0.1 # via -r requirements/dev.in -cachetools==5.3.2 +cachetools==5.3.3 # via # -r requirements/ci.txt # tox @@ -45,12 +47,12 @@ colorama==0.4.6 # via # -r requirements/ci.txt # tox -coverage[toml]==7.4.1 +coverage[toml]==7.4.4 # via # -r requirements/ci.txt # -r requirements/quality.txt # pytest-cov -cryptography==42.0.3 +cryptography==42.0.5 # via secretstorage distlib==0.3.8 # via @@ -63,7 +65,7 @@ exceptiongroup==1.2.0 # -r requirements/ci.txt # -r requirements/quality.txt # pytest -filelock==3.13.1 +filelock==3.13.3 # via # -r requirements/ci.txt # tox @@ -77,28 +79,32 @@ idna==3.6 # -r requirements/ci.txt # -r requirements/quality.txt # requests -importlib-metadata==7.0.1 +importlib-metadata==7.1.0 # via # -r requirements/pip-tools.txt # build # keyring # twine -importlib-resources==6.1.1 +importlib-resources==6.4.0 # via keyring iniconfig==2.0.0 # via # -r requirements/ci.txt # -r requirements/quality.txt # pytest -jaraco-classes==3.3.1 +jaraco-classes==3.4.0 + # via keyring +jaraco-context==5.3.0 + # via keyring +jaraco-functools==4.0.0 # via keyring jeepney==0.8.0 # via # keyring # secretstorage -keyring==24.3.0 +keyring==25.1.0 # via twine -lxml==5.1.0 +lxml==5.2.1 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -112,15 +118,17 @@ mccabe==0.7.0 mdurl==0.1.2 # via markdown-it-py more-itertools==10.2.0 - # via jaraco-classes + # via + # jaraco-classes + # jaraco-functools mypy-extensions==1.0.0 # via # -r requirements/ci.txt # -r requirements/quality.txt # black -nh3==0.2.15 +nh3==0.2.17 # via readme-renderer -packaging==23.2 +packaging==24.0 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -135,9 +143,9 @@ pathspec==0.12.1 # -r requirements/ci.txt # -r requirements/quality.txt # black -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.txt -pkginfo==1.9.6 +pkginfo==1.10.0 # via twine platformdirs==4.2.0 # via @@ -157,7 +165,7 @@ pycodestyle==2.11.1 # -r requirements/ci.txt # -r requirements/quality.txt # flake8 -pycparser==2.21 +pycparser==2.22 # via cffi pyflakes==3.2.0 # via @@ -177,21 +185,21 @@ pyproject-hooks==1.0.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.0.1 +pytest==8.1.1 # via # -r requirements/ci.txt # -r requirements/quality.txt # pytest-cov # pytest-mock -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via # -r requirements/ci.txt # -r requirements/quality.txt -pytest-mock==3.12.0 +pytest-mock==3.14.0 # via # -r requirements/ci.txt # -r requirements/quality.txt -readme-renderer==42.0 +readme-renderer==43.0 # via twine requests==2.31.0 # via @@ -203,7 +211,7 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.7.0 +rich==13.7.1 # via twine secretstorage==3.3.3 # via keyring @@ -220,11 +228,11 @@ tomli==2.0.1 # pyproject-hooks # pytest # tox -tox==4.13.0 +tox==4.14.2 # via -r requirements/ci.txt twine==5.0.0 # via -r requirements/dev.in -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -236,11 +244,11 @@ urllib3==2.2.1 # -r requirements/quality.txt # requests # twine -virtualenv==20.25.0 +virtualenv==20.25.1 # via # -r requirements/ci.txt # tox -wheel==0.42.0 +wheel==0.43.0 # via # -r requirements/dev.in # -r requirements/pip-tools.txt @@ -253,7 +261,7 @@ youtube-dl==2021.12.17 # via # -r requirements/ci.txt # -r requirements/quality.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/pip-tools.txt # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 44c48d99..1471eddf 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,15 +4,15 @@ # # make upgrade # -build==1.0.3 +build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.1 +importlib-metadata==7.1.0 # via build -packaging==23.2 +packaging==24.0 # via build -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via @@ -23,9 +23,9 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.42.0 +wheel==0.43.0 # via pip-tools -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 71954cc6..cf449024 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.42.0 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.1.0 +setuptools==69.2.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 33367c4b..46254055 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,7 +4,7 @@ # # make upgrade # -black==24.2.0 +black==24.3.0 # via -r requirements/quality.in certifi==2024.2.2 # via @@ -16,7 +16,7 @@ charset-normalizer==3.3.2 # requests click==8.1.7 # via black -coverage[toml]==7.4.1 +coverage[toml]==7.4.4 # via # -r requirements/test.txt # pytest-cov @@ -34,13 +34,13 @@ iniconfig==2.0.0 # via # -r requirements/test.txt # pytest -lxml==5.1.0 +lxml==5.2.1 # via -r requirements/test.txt mccabe==0.7.0 # via flake8 mypy-extensions==1.0.0 # via black -packaging==23.2 +packaging==24.0 # via # -r requirements/test.txt # black @@ -57,14 +57,14 @@ pycodestyle==2.11.1 # via flake8 pyflakes==3.2.0 # via flake8 -pytest==8.0.1 +pytest==8.1.1 # via # -r requirements/test.txt # pytest-cov # pytest-mock -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.txt -pytest-mock==3.12.0 +pytest-mock==3.14.0 # via -r requirements/test.txt requests==2.31.0 # via -r requirements/test.txt @@ -74,7 +74,7 @@ tomli==2.0.1 # black # coverage # pytest -typing-extensions==4.9.0 +typing-extensions==4.11.0 # via black urllib3==2.2.1 # via diff --git a/requirements/test.txt b/requirements/test.txt index 01bc4a47..08d1ec06 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,7 +12,7 @@ charset-normalizer==3.3.2 # via # -r requirements/base.txt # requests -coverage[toml]==7.4.1 +coverage[toml]==7.4.4 # via # -r requirements/test.in # pytest-cov @@ -24,20 +24,20 @@ idna==3.6 # requests iniconfig==2.0.0 # via pytest -lxml==5.1.0 +lxml==5.2.1 # via -r requirements/base.txt -packaging==23.2 +packaging==24.0 # via pytest pluggy==1.4.0 # via pytest -pytest==8.0.1 +pytest==8.1.1 # via # -r requirements/test.in # pytest-cov # pytest-mock -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.in -pytest-mock==3.12.0 +pytest-mock==3.14.0 # via -r requirements/test.in requests==2.31.0 # via -r requirements/base.txt From f75dab02e3570dd2d86ba153f3e1d8c2ae1de99d Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Tue, 9 Apr 2024 17:21:32 +0500 Subject: [PATCH 4/5] feat: Adding python3.11 support. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index f1ac0004..eeea28cb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38, 311} quality, formatting +envlist = py{38, 311}-django42, quality, formatting [testenv:quality] basepython = python From 607dddec6a68fea6eac2e5b388cb37098b06f76f Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Tue, 9 Apr 2024 17:26:21 +0500 Subject: [PATCH 5/5] feat: Adding python3.11 support. --- .github/workflows/ci.yml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9665d28f..709235d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: os: - ubuntu-20.04 python-version: ['3.8', '3.11'] - toxenv: [formatting, quality, python, django42] + toxenv: [formatting, quality, python] steps: - uses: actions/checkout@v2 - name: setup python diff --git a/tox.ini b/tox.ini index eeea28cb..a3f37b71 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38, 311}-django42, quality, formatting +envlist = py{38, 311}, quality, formatting [testenv:quality] basepython = python