diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5802fe..8ab106d 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,18 +15,17 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 - python-version: - - 3.8 + - ubuntu-20.04 + python-version: ['3.8', '3.11'] steps: - - uses: actions/checkout@v2 - - name: setup python - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v2 + - name: setup python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: pip install -r requirements/ci.txt + - name: Install dependencies + run: pip install -r requirements/ci.txt - - name: Run Tests - run: tox + - name: Run Tests + run: tox diff --git a/HISTORY.rst b/HISTORY.rst index 76031ed..9eedba8 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,12 @@ History ======= +1.1.0 (2024-04-05) +------------------ + +* Adding python3.11 support. + + 0.3.1 (2020-09-16) ------------------ diff --git a/requirements/base.txt b/requirements/base.txt index f07317c..b15d04d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -click==8.1.3 +click==8.1.7 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index 803aaa9..a076b8b 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,50 +1,56 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -distlib==0.3.4 +cachetools==5.3.3 # via # -r requirements/tox.txt - # virtualenv -filelock==3.7.1 + # tox +chardet==5.2.0 # via # -r requirements/tox.txt # tox - # virtualenv -packaging==21.3 +colorama==0.4.6 # via # -r requirements/tox.txt # tox -platformdirs==2.5.2 +distlib==0.3.8 + # via + # -r requirements/tox.txt + # virtualenv +filelock==3.13.3 # via # -r requirements/tox.txt + # tox # virtualenv -pluggy==1.0.0 +packaging==24.0 # via # -r requirements/tox.txt + # pyproject-api # tox -py==1.11.0 +platformdirs==4.2.0 # via # -r requirements/tox.txt # tox -pyparsing==3.0.9 + # virtualenv +pluggy==1.4.0 # via # -r requirements/tox.txt - # packaging -six==1.16.0 + # tox +pyproject-api==1.6.1 # via # -r requirements/tox.txt # tox - # virtualenv -toml==0.10.2 +tomli==2.0.1 # via # -r requirements/tox.txt + # pyproject-api # tox -tox==3.25.0 +tox==4.14.2 # via -r requirements/tox.txt -virtualenv==20.14.1 +virtualenv==20.25.1 # via # -r requirements/tox.txt # tox diff --git a/requirements/doc.txt b/requirements/doc.txt index b738464..1f45c41 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,50 +1,50 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -alabaster==0.7.12 +alabaster==0.7.13 # via sphinx -babel==2.10.1 +babel==2.14.0 # via sphinx -certifi==2022.5.18.1 +certifi==2024.2.2 # via requests -charset-normalizer==2.0.12 +charset-normalizer==3.3.2 # via requests -click==8.1.3 +click==8.1.7 # via -r requirements/base.in -docutils==0.18.1 +docutils==0.20.1 # via sphinx -idna==3.3 +idna==3.6 # via requests -imagesize==1.3.0 +imagesize==1.4.1 # via sphinx -importlib-metadata==4.11.4 +importlib-metadata==6.11.0 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # sphinx +jinja2==3.1.3 # via sphinx -jinja2==3.1.2 - # via sphinx -markupsafe==2.1.1 +markupsafe==2.1.5 # via jinja2 -packaging==21.3 +packaging==24.0 # via sphinx -pygments==2.12.0 +pygments==2.17.2 # via sphinx -pyparsing==3.0.9 - # via packaging -pytz==2022.1 +pytz==2024.1 # via babel -requests==2.27.1 +requests==2.31.0 # via sphinx snowballstemmer==2.2.0 # via sphinx -sphinx==5.0.1 +sphinx==7.1.2 # via -r requirements/doc.in -sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx @@ -52,7 +52,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -urllib3==1.26.9 +urllib3==2.2.1 # via requests -zipp==3.8.0 +zipp==3.18.1 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index dd0c9da..36d791b 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # make upgrade # -wheel==0.37.1 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==22.1.2 +pip==24.0 # via -r requirements/pip.in -setuptools==62.3.3 +setuptools==69.2.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index f97219b..5be4fc9 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,19 +1,34 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # make upgrade # -click==8.1.3 +build==1.2.1 # via pip-tools -pep517==0.12.0 +click==8.1.7 # via pip-tools -pip-tools==6.6.2 +importlib-metadata==6.11.0 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # build +packaging==24.0 + # via build +pip-tools==7.4.1 # via -r requirements/pip_tools.in +pyproject-hooks==1.0.0 + # via + # build + # pip-tools tomli==2.0.1 - # via pep517 -wheel==0.37.1 + # via + # build + # pip-tools + # pyproject-hooks +wheel==0.43.0 # via pip-tools +zipp==3.18.1 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/test.txt b/requirements/test.txt index 650ace5..4fb9f37 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,94 +1,103 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -attrs==21.4.0 - # via pytest -bleach==5.0.0 - # via readme-renderer bump2version==1.0.1 # via bumpversion bumpversion==0.6.0 # via -r requirements/test.in -certifi==2022.5.18.1 +certifi==2024.2.2 # via requests -charset-normalizer==2.0.12 +charset-normalizer==3.3.2 # via requests -click==8.1.3 +click==8.1.7 # via -r requirements/base.txt -commonmark==0.9.1 - # via rich -coverage==6.4.1 +coverage==7.4.4 # via -r requirements/test.in -docutils==0.18.1 +docutils==0.20.1 # via readme-renderer -flake8==4.0.1 +exceptiongroup==1.2.0 + # via pytest +flake8==7.0.0 # via -r requirements/test.in -idna==3.3 +idna==3.6 # via requests -importlib-metadata==4.11.4 +importlib-metadata==6.11.0 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # keyring # twine -iniconfig==1.1.1 +importlib-resources==6.4.0 + # via keyring +iniconfig==2.0.0 # via pytest -keyring==23.6.0 +jaraco-classes==3.4.0 + # via keyring +jaraco-context==5.1.0 + # via keyring +jaraco-functools==4.0.0 + # via keyring +keyring==25.1.0 # via twine -mccabe==0.6.1 +markdown-it-py==3.0.0 + # via rich +mccabe==0.7.0 # via flake8 -packaging==21.3 +mdurl==0.1.2 + # via markdown-it-py +more-itertools==10.2.0 + # via + # jaraco-classes + # jaraco-functools +nh3==0.2.17 + # via readme-renderer +packaging==24.0 # via pytest -pkginfo==1.8.3 +pkginfo==1.10.0 # via twine -pluggy==1.0.0 +pluggy==1.4.0 # via pytest -py==1.11.0 - # via pytest -pycodestyle==2.8.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==2.4.0 +pyflakes==3.2.0 # via flake8 -pygments==2.12.0 +pygments==2.17.2 # via # readme-renderer # rich -pyparsing==3.0.9 - # via packaging -pytest==7.1.2 +pytest==8.1.1 # via -r requirements/test.in -pytest-runner==6.0.0 +pytest-runner==6.0.1 # via -r requirements/test.in -readme-renderer==35.0 +readme-renderer==43.0 # via twine -requests==2.27.1 +requests==2.31.0 # via # requests-toolbelt # twine -requests-toolbelt==0.9.1 +requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==12.4.4 +rich==13.7.1 # via twine -six==1.16.0 - # via bleach tomli==2.0.1 # via pytest -twine==4.0.1 +twine==5.0.0 # via -r requirements/test.in -typing-extensions==4.2.0 +typing-extensions==4.10.0 # via rich -urllib3==1.26.9 +urllib3==2.2.1 # via # requests # twine -watchdog==2.1.8 +watchdog==4.0.0 # via -r requirements/test.in -webencodings==0.5.1 - # via bleach -wheel==0.37.1 +wheel==0.43.0 # via -r requirements/test.in -zipp==3.8.0 - # via importlib-metadata +zipp==3.18.1 + # via + # importlib-metadata + # importlib-resources diff --git a/requirements/tox.txt b/requirements/tox.txt index b0e7f0a..cc5293d 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -1,32 +1,38 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -distlib==0.3.4 +cachetools==5.3.3 + # via tox +chardet==5.2.0 + # via tox +colorama==0.4.6 + # via tox +distlib==0.3.8 # via virtualenv -filelock==3.7.1 +filelock==3.13.3 # 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 +packaging==24.0 + # via + # pyproject-api + # tox +platformdirs==4.2.0 # via # tox # virtualenv -toml==0.10.2 +pluggy==1.4.0 # via tox -tox==3.25.0 +pyproject-api==1.6.1 + # via tox +tomli==2.0.1 + # via + # pyproject-api + # tox +tox==4.14.2 # via -r requirements/tox.in -virtualenv==20.14.1 +virtualenv==20.25.1 # via tox diff --git a/setup.py b/setup.py index 4ff349b..8d89e2e 100644 --- a/setup.py +++ b/setup.py @@ -69,6 +69,7 @@ def get_version(*file_paths): 'Natural Language :: English', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.11', ], description="User utilities for the Open edX platform", entry_points={ diff --git a/tox.ini b/tox.ini index f5d0190..2d33273 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] -envlist = py38-django{22,30,31},quality +envlist = py{38, 311}-django{42},quality [ci] python = - 3.8: py38 - quality: flake8 + 3.8: py38 + quality: flake8 [testenv:quality] basepython = python @@ -13,10 +13,11 @@ commands = flake8 user_util [testenv] setenv = - PYTHONPATH = {toxinidir} + PYTHONPATH = {toxinidir} deps = - -r requirements/test.txt + -r requirements/test.txt commands = - pip install -U pip - python setup.py develop - py.test --basetemp={envtmpdir} + pip install -U pip + python setup.py develop + py.test --basetemp={envtmpdir} + diff --git a/user_util/__init__.py b/user_util/__init__.py index 2cfa905..0e20ad9 100644 --- a/user_util/__init__.py +++ b/user_util/__init__.py @@ -1,3 +1,3 @@ """Top-level package for Open edX User Utilities.""" -__version__ = '1.0.0' +__version__ = '1.1.0'