Skip to content

Commit

Permalink
Update Actions and python & sphinx matrix
Browse files Browse the repository at this point in the history
Update pytest to work with newer python versions
Update supported Python versions to currently supported
  • Loading branch information
sciencewhiz committed Oct 8, 2024
1 parent 1ce6549 commit 4755582
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 30 deletions.
40 changes: 16 additions & 24 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
name: CI
on:
push:
branches:
- main
pull_request:
branches:
- main
create:
tags:
- '*'
on: [pull_request, push]

jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: psf/black@20.8b1
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: psf/black@24.4.2

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.6
python-version: 3.9
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -33,7 +25,7 @@ jobs:
python setup.py sdist
python setup.py bdist_wheel
- name: Upload build artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: dist
path: dist
Expand All @@ -43,14 +35,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy3']
sphinx-version: ['2', '3']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy3.9']
sphinx-version: ['2', '3', '4', '5', '6', '7']

name: "Test - Python(${{ matrix.python-version }}), Sphinx(${{ matrix.sphinx-version }})"
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 }}

Expand All @@ -60,7 +52,7 @@ jobs:
pip install -r ./dev-requirements.txt
- name: Download build artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: dist
path: dist
Expand All @@ -80,12 +72,12 @@ jobs:
if: contains(github.ref, 'refs/tags/') && github.repository_owner == 'wpilibsuite'
steps:
- name: Download build artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: dist
path: dist
- name: Publish a Python distribution to PyPI
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.pypi_password }}
7 changes: 4 additions & 3 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
sphinx
six
pytest==5.4.3
wheel==0.34.2
requests==2.25.1
wheel==0.43.0
pytest==7.4.4
requests==2.25.1
defusedxml
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,17 @@
"License :: OSI Approved :: MIT License",
"Natural Language :: English",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python",
"Topic :: Documentation :: Sphinx",
"Topic :: Documentation",
"Topic :: Software Development :: Documentation",
"Topic :: Text Processing",
"Topic :: Utilities",
],
python_requires=">=3.6",
python_requires=">=3.8",
)

0 comments on commit 4755582

Please sign in to comment.