Skip to content

Commit

Permalink
Integrate .readthedocs.yaml.
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Havlik committed Sep 22, 2023
1 parent 370396d commit 57ccd87
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 16 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/tests.yml
Expand Up @@ -102,7 +102,7 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12.0-alpha.7"
- "3.12.0-rc.3"
os: [ubuntu-20.04, macos-11]
exclude:
- os: macos-11
Expand Down Expand Up @@ -180,15 +180,15 @@ jobs:
python setup.py build_ext -i
python setup.py bdist_wheel
- name: Install zope.container and dependencies (3.12.0-alpha.7)
if: matrix.python-version == '3.12.0-alpha.7'
- name: Install zope.container and dependencies (3.12.0-rc.3)
if: matrix.python-version == '3.12.0-rc.3'
run: |
# Install to collect dependencies into the (pip) cache.
# Use "--pre" here because dependencies with support for this future
# Python release may only be available as pre-releases
pip install --pre .[test]
- name: Install zope.container and dependencies
if: matrix.python-version != '3.12.0-alpha.7'
if: matrix.python-version != '3.12.0-rc.3'
run: |
# Install to collect dependencies into the (pip) cache.
pip install .[test]
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
&& startsWith(github.ref, 'refs/tags')
&& startsWith(runner.os, 'Mac')
&& !startsWith(matrix.python-version, 'pypy')
&& !startsWith(matrix.python-version, '3.12.0-alpha.7')
&& !startsWith(matrix.python-version, '3.12.0-rc.3')
env:
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
run: |
Expand All @@ -251,7 +251,7 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12.0-alpha.7"
- "3.12.0-rc.3"
os: [ubuntu-20.04, macos-11]
exclude:
- os: macos-11
Expand Down Expand Up @@ -288,8 +288,8 @@ jobs:
with:
name: zope.container-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/
- name: Install zope.container 3.12.0-alpha.7
if: ${{ startsWith(matrix.python-version, '3.12.0-alpha.7') }}
- name: Install zope.container 3.12.0-rc.3
if: ${{ startsWith(matrix.python-version, '3.12.0-rc.3') }}
run: |
pip install -U wheel setuptools
# coverage has a wheel on PyPI for a future python version which is
Expand All @@ -303,7 +303,7 @@ jobs:
# Python release may only be available as pre-releases
pip install --pre -U -e .[test]
- name: Install zope.container
if: ${{ !startsWith(matrix.python-version, '3.12.0-alpha.7') }}
if: ${{ !startsWith(matrix.python-version, '3.12.0-rc.3') }}
run: |
pip install -U wheel setuptools
pip install -U coverage
Expand Down
3 changes: 2 additions & 1 deletion .meta.toml
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/c-code
[meta]
template = "c-code"
commit-id = "fe63cb4c"
commit-id = "b21fbbf2"

[python]
with-appveyor = true
Expand Down Expand Up @@ -41,6 +41,7 @@ additional-config = [

[manifest]
additional-rules = [
"include *.yaml",
"include *.sh",
"include .readthedocs.yaml",
"include compat.cfg",
Expand Down
23 changes: 19 additions & 4 deletions .readthedocs.yaml
@@ -1,10 +1,25 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/c-code
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: "ubuntu-20.04"
os: ubuntu-22.04
tools:
python: "3.8"
python: "3.11"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# We recommend specifying your dependencies to enable reproducible builds:
# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
python:
install:
- requirements: doc-requirements.txt
install:
- requirements: docs/requirements.txt
- method: pip
path: .
1 change: 1 addition & 0 deletions MANIFEST.in
Expand Up @@ -14,6 +14,7 @@ recursive-include docs *.txt
recursive-include docs Makefile

recursive-include src *.py
include *.yaml
include *.sh
include .readthedocs.yaml
include compat.cfg
Expand Down
1 change: 0 additions & 1 deletion doc-requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion docs/conf.py
Expand Up @@ -111,7 +111,7 @@

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'sphinx_rtd_theme'
html_theme = 'default'

# 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 Down
2 changes: 2 additions & 0 deletions docs/requirements.txt
@@ -0,0 +1,2 @@
Sphinx
repoze.sphinx.autointerface
2 changes: 2 additions & 0 deletions tox.ini
Expand Up @@ -22,6 +22,8 @@ setenv =
pure: PURE_PYTHON=1
!pure-!pypy3: PURE_PYTHON=0
ZOPE_INTERFACE_STRICT_IRO=1
py312: VIRTUALENV_PIP=23.1.2
py312: PIP_REQUIRE_VIRTUALENV=0
commands =
zope-testrunner --test-path=src {posargs:-vc}
extras =
Expand Down

0 comments on commit 57ccd87

Please sign in to comment.