diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 678220b..c2cc919 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,32 +6,19 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # Need to use an older Ubuntu so Python 3.6 is available - os: [macos-latest, windows-latest, ubuntu-20.04] - python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10'] + os: ubuntu-latest + python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13'] myst-parser-version: [ '<0.18.0', '>=0.18.0' ] - exclude: - # myst-parser 0.18.0 dropped support for Python 3.6 - - python-version: '3.6' - myst-parser-version: '>=0.18.0' - # GitHub Actions dropped support for Python 3.6 on macos and windows - - os: macos-latest - python-version: '3.6' - - os: windows-latest - python-version: '3.6' steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v1 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: pip - run: pip install .[test] - run: pip install "myst-parser${{ matrix.myst-parser-version }}" # Run pytest - - run: pytest -vv --cov sphinxcontrib + - run: pytest -vv sphinxcontrib # Also try building the docs in the docs directory - run: pip install sphinx_rtd_theme - run: cd docs && make dirhtml - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: coveralls --service=github diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6c0b61d..ade924a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,14 +3,13 @@ on: [push, pull_request] jobs: lint: - # Need to use an older Ubuntu so Python 3.6 is available - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest 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: 3.6 + python-version: 3.9 architecture: x64 cache: pip - run: pip install .[test] diff --git a/CHANGELOG.md b/CHANGELOG.md index 15bd4d9..b163639 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Changed + +- Dropped support for Python 3.8 and lower, as these are end of life +- Only test on Linux, as standard for Open Data Services libraries + ## [0.5.0] - 2022-09-26 ### Changed diff --git a/setup.py b/setup.py index 2172318..deac17b 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,7 @@ author_email='code@opendataservices.coop', packages=['sphinxcontrib'], url='https://github.com/OpenDataServices/sphinxcontrib-opendataservices', + python_requires=">=3.9.0", install_requires=[ 'docutils', 'jsonpointer',