diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 6128bd6..2cf6c60 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -6,12 +6,12 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ['3.8', '3.11', '3.12'] + python-version: ['3.11', '3.12'] TOX_ENV: [coverage, quality, django42] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - run: make ci.test TOX_ENV=${{ matrix.TOX_ENV }} diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index a8e10c3..14b354e 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -11,11 +11,11 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.11 - name: Install pip run: pip install -r requirements/pip.txt diff --git a/requirements/base.txt b/requirements/base.txt index 5400434..6f1dc79 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -41,7 +41,7 @@ web-fragments==2.2.0 # via xblock webob==1.8.7 # via xblock -xblock==4.0.1 +xblock==5.0.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 18b92f9..7634792 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.1.2 +pip==24.2 # via -r requirements/pip.in -setuptools==71.0.4 +setuptools==72.0.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 38fe6d1..79a35c8 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -61,9 +61,9 @@ pluggy==1.5.0 # pytest pycodestyle==2.12.0 # via -r requirements/quality.in -pylint==3.2.5 +pylint==3.2.6 # via -r requirements/quality.in -pytest==8.3.1 +pytest==8.3.2 # via # -r requirements/test.txt # pytest-django @@ -104,7 +104,7 @@ webob==1.8.7 # via # -r requirements/base.txt # xblock -xblock==4.0.1 +xblock==5.0.0 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index c111bc1..1f8fbd2 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -14,7 +14,7 @@ packaging==24.1 # via pytest pluggy==1.5.0 # via pytest -pytest==8.3.1 +pytest==8.3.2 # via pytest-django pytest-django==4.8.0 # via -r requirements/test.in diff --git a/setup.py b/setup.py index 2896d7d..c637608 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,6 @@ import re from setuptools import setup -from setuptools.command.test import test as TestCommand def package_data(pkg, roots): @@ -89,30 +88,6 @@ def is_requirement(line): return line and line.strip() and not line.startswith(('-r', '#', '-e', 'git+', '-c')) -class Tox(TestCommand): - user_options = [('tox-args=', 'a', 'Arguments to pass to tox')] - - def initialize_options(self): - TestCommand.initialize_options(self) - self.tox_args = None - - def finalize_options(self): - TestCommand.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - # import here, cause outside the eggs aren't loaded - import shlex - - import tox - args = self.tox_args - if args: - args = shlex.split(self.tox_args) - errno = tox.cmdline(args=args) - sys.exit(errno) - - def get_version(file_path): """ Extract the version string from the file at the given relative path fragments. @@ -155,7 +130,6 @@ def get_version(file_path): 'License :: OSI Approved :: Apache Software License', 'Natural Language :: English', "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", ], diff --git a/tox.ini b/tox.ini index 2ecfc35..dc039fb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] downloadcache = {toxworkdir}/_download/ -envlist = py{38,311,312}-django{42},coverage,quality +envlist = py{311,312}-django{42},coverage,quality [testenv] deps =