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

feat: add python 3.11 support #181

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Python CI
on:
push:
branches:
- master
- master
pull_request:
branches:
- '**'
- '**'

jobs:
run_tests:
Expand All @@ -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.11']
toxenv: [formatting, quality, python]
steps:
- uses: actions/checkout@v2
- name: setup python
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -112,7 +112,7 @@ tomli==2.0.1
# tox
tox==4.14.2
# via -r requirements/ci.in
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# -r requirements/quality.txt
# black
Expand Down
18 changes: 12 additions & 6 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
#
# make upgrade
#
backports-tarfile==1.0.0
# via jaraco-context
black==24.3.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
build==1.1.1
build==1.2.1
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down Expand Up @@ -90,7 +92,11 @@ iniconfig==2.0.0
# -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
jaraco-context==4.3.0
# via keyring
Expand All @@ -100,9 +106,9 @@ jeepney==0.8.0
# via
# keyring
# secretstorage
keyring==25.0.0
keyring==25.1.0
# via twine
lxml==5.1.0
lxml==5.2.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand Down Expand Up @@ -163,7 +169,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
Expand Down Expand Up @@ -230,7 +236,7 @@ tox==4.14.2
# via -r requirements/ci.txt
twine==5.0.0
# via -r requirements/dev.in
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
build==1.1.1
build==1.2.1
# via pip-tools
click==8.1.7
# via pip-tools
Expand Down
4 changes: 2 additions & 2 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ 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
Expand Down Expand Up @@ -74,7 +74,7 @@ tomli==2.0.1
# black
# coverage
# pytest
typing-extensions==4.10.0
typing-extensions==4.11.0
# via black
urllib3==2.2.1
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ idna==3.6
# requests
iniconfig==2.0.0
# via pytest
lxml==5.1.0
lxml==5.2.1
# via -r requirements/base.txt
packaging==24.0
# via pytest
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."),
Expand Down
2 changes: 1 addition & 1 deletion src/cc2olx/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.1.0"
__version__ = "0.2.0"
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38, quality, formatting
envlist = py{38, 311}, quality, formatting

[testenv:quality]
basepython = python
Expand All @@ -13,12 +13,12 @@ commands = black --check --diff --line-length 120 src tests setup.py

[testenv]
setenv =
PYTHONPATH = {toxinidir}
PYTHONPATH = {toxinidir}
deps =
-r{toxinidir}/requirements/test.txt
-r{toxinidir}/requirements/test.txt
commands =
pip install -U pip
pytest --basetemp={envtmpdir} --cov cc2olx --cov-report term-missing --cov-report xml
pip install -U pip
pytest --basetemp={envtmpdir} --cov cc2olx --cov-report term-missing --cov-report xml

[testenv:python]

Loading