diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2022-09-26 20:49:49 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2022-09-26 20:49:49 -0400 |
| commit | badd7064e202635b8a94d5603b31a37ca7d58d6c (patch) | |
| tree | da76a3c2c49d17af68186e43178fe937b3199992 | |
| parent | a86428cfef419e9ef3f04a04bde2d64d395936b8 (diff) | |
| parent | b4f0ae621594316e56cede2856b6a5be605a893c (diff) | |
| download | python-setuptools-git-badd7064e202635b8a94d5603b31a37ca7d58d6c.tar.gz | |
Merge https://github.com/jaraco/skeleton
# Conflicts:
# .github/workflows/main.yml
# docs/conf.py
| -rw-r--r-- | .github/workflows/main.yml | 16 | ||||
| -rw-r--r-- | docs/conf.py | 15 | ||||
| -rw-r--r-- | setup.cfg | 2 |
3 files changed, 24 insertions, 9 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b5d1a1e7..7b4669ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,16 +16,20 @@ jobs: distutils: - local python: - - 3.7-dev - - 3.10-dev + - "3.7" + - "3.10" # disabled due to #3365 - # - 3.11-dev - - pypy-3.7 + # - "3.11" + # Workaround for actions/setup-python#508 + dev: + - -dev platform: - ubuntu-latest - macos-latest - windows-latest include: + - python: pypy3.9 + platform: ubuntu-latest - platform: ubuntu-latest python: "3.10" distutils: stdlib @@ -38,7 +42,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python }} + python-version: ${{ matrix.python }}${{ matrix.dev }} - uses: actions/cache@v3 id: cache with: @@ -149,7 +153,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: "3.11-dev" + python-version: 3.11-dev - name: Install tox run: | python -m pip install tox diff --git a/docs/conf.py b/docs/conf.py index 2b60bf57..ecd7aac4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,7 +1,15 @@ -extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker'] +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +extensions = [ + 'sphinx.ext.autodoc', + 'jaraco.packaging.sphinx', +] master_doc = "index" +# Link dates and other references in the changelog +extensions += ['rst.linker'] link_files = { '../CHANGES.rst': dict( using=dict( @@ -81,7 +89,7 @@ link_files = { ), } -# Be strict about any broken references: +# Be strict about any broken references nitpicky = True # Include Python intersphinx mapping to prevent failures @@ -91,6 +99,9 @@ intersphinx_mapping = { 'python': ('https://docs.python.org/3', None), } +# Preserve authored syntax for defaults +autodoc_preserve_defaults = True + intersphinx_mapping.update({ 'pip': ('https://pip.pypa.io/en/latest', None), 'build': ('https://pypa-build.readthedocs.io/en/latest', None), @@ -87,7 +87,7 @@ testing-integration = docs = # upstream - sphinx + sphinx >= 3.5 jaraco.packaging >= 9 rst.linker >= 1.9 jaraco.tidelift >= 1.4 |