Skip to content

Commit

Permalink
Update all dependencies (wpilibsuite#56)
Browse files Browse the repository at this point in the history
  • Loading branch information
sciencewhiz authored Dec 30, 2023
1 parent d8961c2 commit dd1ee93
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 26 deletions.
28 changes: 16 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,27 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python 3.8
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.8
- uses: pre-commit/action@v2.0.0
- uses: pre-commit/action@v3.0.0

test:
name: "Test - ${{ matrix.os }}, py ${{ matrix.python-version }}, Sphinx ${{ matrix.sphinx }}"
runs-on: "${{ matrix.os }}-latest"
strategy:
matrix:
os: [ubuntu, windows, macos]
python-version: ['3.7', '3.8', '3.9']
sphinx: ['2', '3', '4']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
sphinx: ['4', '5', '6', '7']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dev dependencies
Expand Down Expand Up @@ -64,11 +66,13 @@ jobs:
build-docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install dependencies
run: |
pip install -r docs/requirements.txt
Expand All @@ -82,13 +86,13 @@ jobs:
needs: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.11'
- name: Install Dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ repos:
# - id: flake8

- repo: https://github.com/psf/black
rev: 20.8b1
rev: 23.12.1
hooks:
- id: black
6 changes: 5 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
version: 2

build:
os: ubuntu-22.04
tools:
python: "3.11"

python:
version: 3
install:
- method: pip
path: .
Expand Down
4 changes: 2 additions & 2 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sphinx
jinja2
wheel==0.34.2
setuptools==47.3.1
wheel<43
setuptools<70
6 changes: 3 additions & 3 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
myst-parser==0.13.0
furo==2020.12.30b24
sphinx==3.4.0
myst-parser==2.0.0
furo==2023.9.10
sphinx==7.2.6
./
10 changes: 6 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
long_description_content_type="text/markdown",
url="https://github.com/wpilibsuite/sphinxext-rediraffe",
packages=["sphinxext"],
install_requires=["sphinx>=2.0"],
install_requires=["sphinx>=4.0"],
classifiers=[
"Environment :: Plugins",
"Environment :: Web Environment",
Expand All @@ -32,16 +32,18 @@
"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",
include_package_data=True,
)
1 change: 0 additions & 1 deletion sphinxext/rediraffe.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ def abs_path_in_src_dir_w_src_suffix(filename: str) -> Union[Path, None]:
self.app.statuscode = 1

with redirects_path.open("a") as redirects_file:

for renamed_file in rename_hints:
hint_to, perc = rename_hints[renamed_file]

Expand Down
3 changes: 1 addition & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ def git(cmd: str):
commits = []

for item_path in src_item_paths:

if not item_path.name.startswith("HEAD"):
continue

Expand Down Expand Up @@ -143,7 +142,7 @@ def rel2url(outdir, path):

@pytest.fixture(scope="session")
def _sb(request):
""" Same as the sb fixture but with a session scope"""
"""Same as the sb fixture but with a session scope"""
from seleniumbase import BaseCase

class BaseClass(BaseCase):
Expand Down

0 comments on commit dd1ee93

Please sign in to comment.