Skip to content

Commit

Permalink
Bump versions for python 3.13 support and drop 3.8 (#434)
Browse files Browse the repository at this point in the history
  • Loading branch information
richardsheridan authored Oct 20, 2024
1 parent c0fc806 commit 4fea5fa
Show file tree
Hide file tree
Showing 14 changed files with 81 additions and 89 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup python
uses: actions/[email protected]
with:
python-version: "3.12"
python-version: "3.13"
- name: Install requirements
run: |
python -m pip install -U pip
Expand All @@ -53,7 +53,7 @@ jobs:
with:
cache: pip
cache-dependency-path: requirements/lint.txt
python-version: "3.12"
python-version: "3.13"
- name: Install requirements
run: |
python -m pip install -U pip
Expand Down Expand Up @@ -125,9 +125,6 @@ jobs:
# python: '3.13-dev'
# experimental: true
# test-timeout: 3
exclude:
- os: macos-latest
python: '3.8'
steps:
- name: Input settings
run: echo "${{ needs.Build.outputs.settings }}" | base64 -d | tar xz
Expand Down Expand Up @@ -180,7 +177,7 @@ jobs:
- ubuntu-latest
- macos-latest
python:
- '3.12'
- '3.13'
- 'pypy-3.10'
steps:
- name: Checkout
Expand Down Expand Up @@ -211,7 +208,7 @@ jobs:
- name: Setup python
uses: actions/[email protected]
with:
python-version: '3.12'
python-version: '3.13'
- name: Download build artifact
uses: actions/[email protected]
with:
Expand Down Expand Up @@ -243,7 +240,7 @@ jobs:
with:
cache: pip
cache-dependency-path: requirements/coverage.txt
python-version: "3.12"
python-version: "3.13"
- name: Install coverage
run: |
pip install -U pip
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
version: 2

build:
os: ubuntu-20.04
os: ubuntu-22.04
tools:
python: "3.10"
python: "3.12"
jobs:
post_checkout:
- git fetch --unshallow
Expand Down
8 changes: 0 additions & 8 deletions codecov.yml

This file was deleted.

77 changes: 39 additions & 38 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
#
import os
import sys

# So autodoc can import our package
sys.path.insert(0, os.path.abspath('../..'))
sys.path.insert(0, os.path.abspath("../.."))


# Warn about all references to unknown targets
Expand Down Expand Up @@ -57,17 +58,17 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'sphinx.ext.coverage',
'sphinx.ext.napoleon',
'sphinxcontrib_trio',
'sphinxcontrib.jquery',
"sphinx.ext.autodoc",
"sphinx.ext.intersphinx",
"sphinx.ext.coverage",
"sphinx.ext.napoleon",
"sphinxcontrib_trio",
"sphinxcontrib.jquery",
]

intersphinx_mapping = {
"python": ('https://docs.python.org/3', None),
"trio": ('https://trio.readthedocs.io/en/stable', None),
"python": ("https://docs.python.org/3", None),
"trio": ("https://trio.readthedocs.io/en/stable", None),
}

autodoc_member_order = "bysource"
Expand All @@ -79,32 +80,35 @@
# You can specify multiple suffix as a list of string:
#
# source_suffix = ['.rst', '.md']
source_suffix = '.rst'
source_suffix = ".rst"

# The master toctree document.
master_doc = 'index'
master_doc = "index"

# General information about the project.
project = 'trio-parallel'
copyright = 'Richard J. Sheridan'
author = 'Richard J. Sheridan'
project = "trio-parallel"
copyright = "Richard J. Sheridan"
author = "Richard J. Sheridan"

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
from importlib.metadata import version
version = version('trio-parallel')

version = version("trio-parallel")
# The full version, including alpha/beta/rc tags.
release = version

# https://docs.readthedocs.io/en/stable/builds.html#build-environment
if "READTHEDOCS" in os.environ:
import glob

if glob.glob("../../newsfragments/*.*.rst"):
print("-- Found newsfragments; running towncrier --", flush=True)
import subprocess

subprocess.run(
["towncrier", "build", "--yes", "--version", version],
cwd="../..",
Expand All @@ -120,18 +124,18 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = 'en'
language = "en"

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This patterns also effect to html_static_path and html_extra_path
exclude_patterns = []

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
pygments_style = "sphinx"

# The default language for :: blocks
highlight_language = 'python3'
highlight_language = "python3"

# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = False
Expand All @@ -150,14 +154,12 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
#html_theme = 'alabaster'
# html_theme = 'alabaster'

# We have to set this ourselves, not only because it's useful for local
# testing, but also because if we don't then RTD will throw away our
# html_theme_options.
import sphinx_rtd_theme
html_theme = 'sphinx_rtd_theme'
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
html_theme = "sphinx_rtd_theme"

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
Expand All @@ -171,22 +173,22 @@
# versions/settings...
"navigation_depth": 4,
"logo_only": True,
'prev_next_buttons_location': 'both'
"prev_next_buttons_location": "both",
}

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_static_path = ["_static"]

html_css_files = [
'custom.css',
"custom.css",
]

# -- Options for HTMLHelp output ------------------------------------------

# Output file base name for HTML help builder.
htmlhelp_basename = 'trio-paralleldoc'
htmlhelp_basename = "trio-paralleldoc"


# -- Options for LaTeX output ---------------------------------------------
Expand All @@ -195,15 +197,12 @@
# The paper size ('letterpaper' or 'a4paper').
#
# 'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#
# 'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#
# 'preamble': '',

# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
Expand All @@ -213,19 +212,15 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'trio-parallel.tex', 'Trio Documentation',
author, 'manual'),
(master_doc, "trio-parallel.tex", "Trio Documentation", author, "manual"),
]


# -- Options for manual page output ---------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'trio-parallel', 'trio-parallel Documentation',
[author], 1)
]
man_pages = [(master_doc, "trio-parallel", "trio-parallel Documentation", [author], 1)]


# -- Options for Texinfo output -------------------------------------------
Expand All @@ -234,7 +229,13 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'trio-parallel', 'trio-parallel Documentation',
author, 'trio-parallel', 'CPU parallelism for Trio',
'Miscellaneous'),
(
master_doc,
"trio-parallel",
"trio-parallel Documentation",
author,
"trio-parallel",
"CPU parallelism for Trio",
"Miscellaneous",
),
]
1 change: 1 addition & 0 deletions newsfragments/434.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Advertise support for Python-3.13, although no code changes were made to support it.
1 change: 1 addition & 0 deletions newsfragments/434.removal.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Stop advertising support for Python-3.8, although no code changes were made to break it.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ classifiers = [
"Operating System :: MacOS :: MacOS X",
"Operating System :: Microsoft :: Windows",
"Programming Language :: Python :: 3 :: Only",
"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 :: 3.13",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Development Status :: 5 - Production/Stable",
Expand Down
2 changes: 1 addition & 1 deletion requirements/coverage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
#
# pip-compile-multi
#
coverage[toml]==7.5.4
coverage[toml]==7.6.3
# via -r requirements\coverage.in
3 changes: 2 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-r test.in
-r docs.in
-r lint.in
-r lint.in
-r coverage.in
3 changes: 2 additions & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# SHA1:657999018ebf5f3362ebb8566642201085ff09d3
# SHA1:64f3330cb21a24de944be0c0611a2d1920d63b44
#
# This file is autogenerated by pip-compile-multi
# To update, run:
#
# pip-compile-multi
#
-r coverage.txt
-r docs.txt
-r lint.txt
-r test.txt
Loading

0 comments on commit 4fea5fa

Please sign in to comment.