Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
python-version: ${{ matrix.python }}
allow-prereleases: true
cache: pip
cache-dependency-path: test-requirements.txt
cache-dependency-path: pyproject.toml
- name: Run tests
run: ./ci.sh
shell: bash
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
python-version: ${{ matrix.python }}
allow-prereleases: true
cache: pip
cache-dependency-path: test-requirements.txt
cache-dependency-path: pyproject.toml
- name: Run tests
run: ./ci.sh
env:
Expand All @@ -76,7 +76,7 @@ jobs:
python-version: ${{ matrix.python }}
allow-prereleases: true
cache: pip
cache-dependency-path: test-requirements.txt
cache-dependency-path: pyproject.toml
- name: Set PYTHON_GIL
if: endsWith(matrix.python-version, 't')
run: |
Expand Down
12 changes: 6 additions & 6 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
version: 2

build:
os: ubuntu-22.04
os: ubuntu-24.04
tools:
python: "3.8"
python: "3.12"
jobs:
install:
- python -m pip install --no-cache-dir "pip >= 25.1"
- python -m pip install --upgrade --upgrade-strategy only-if-needed --no-cache-dir --group rtd .

formats:
- htmlzip
- epub

python:
install:
- requirements: ci/rtd-requirements.txt

sphinx:
configuration: docs/source/conf.py
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
include README.rst CHEATSHEET.rst LICENSE* CODE_OF_CONDUCT* CONTRIBUTING*
include .coveragerc .style.yapf
include test-requirements.txt
recursive-include docs *
prune docs/build
5 changes: 1 addition & 4 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@ EOF
exit 0
fi

pip install .

# Actual tests
pip install -Ur test-requirements.txt
pip install --upgrade --group test .

mkdir empty
cd empty
Expand Down
4 changes: 0 additions & 4 deletions ci/rtd-requirements.txt

This file was deleted.

12 changes: 12 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ Homepage = "https://github.com/python-trio/sniffio"
Documentation = "https://sniffio.readthedocs.io/"
Changelog = "https://sniffio.readthedocs.io/en/latest/history.html"

[dependency-groups]
test = [
"pytest",
"pytest-cov",
"curio",
]
rtd = [
"sphinx >= 1.6.1",
"sphinx_rtd_theme",
"sphinxcontrib-trio",
]

[tool.setuptools.dynamic]
version = {attr = "sniffio._version.__version__"}

Expand Down
3 changes: 0 additions & 3 deletions test-requirements.txt

This file was deleted.