diff options
| -rw-r--r-- | .coveragerc | 3 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 36 | ||||
| -rw-r--r-- | docs/conf.py | 24 |
3 files changed, 42 insertions, 21 deletions
diff --git a/.coveragerc b/.coveragerc index 3153808d..aaecd683 100644 --- a/.coveragerc +++ b/.coveragerc @@ -2,6 +2,9 @@ omit = # leading `*/` for pytest-dev/pytest-cov#456 */.tox/* + */pep517-build-env-* + + # local */_validate_pyproject/* # generated code, tested in `validate-pyproject` [report] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 092c0dcc..41349800 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,11 +16,12 @@ jobs: distutils: - local python: + # Build on pre-releases until stable, then stable releases. + # actions/setup-python#213 + - ~3.7.0-0 + - ~3.10.0-0 + - ~3.11.0-0 - pypy-3.7 - - 3.7 - - 3.8 - - 3.9 - - "3.10" platform: - ubuntu-latest - macos-latest @@ -34,9 +35,9 @@ jobs: SETUPTOOLS_USE_DISTUTILS: ${{ matrix.distutils }} timeout-minutes: 75 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python }} - uses: actions/cache@v3 @@ -66,6 +67,20 @@ jobs: ${{ runner.os }}, ${{ matrix.python }} + check: # This job does nothing and is only used for the branch protection + if: always() + + needs: + - test + + runs-on: ubuntu-latest + + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@release/v1 + with: + jobs: ${{ toJSON(needs) }} + test_cygwin: strategy: matrix: @@ -121,14 +136,17 @@ jobs: run: tox -e integration release: - needs: [test, test_cygwin, integration-test] + needs: + - check + - test_cygwin + - integration-test if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') runs-on: ubuntu-latest timeout-minutes: 75 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: "3.10" - name: Install tox diff --git a/docs/conf.py b/docs/conf.py index 90286916..08f5fabf 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -10,12 +10,20 @@ link_files = { ), replace=[ dict( - pattern=r'(?<!\w)PR #(?P<pull>\d+)', - url='{package_url}/pull/{pull}', + pattern=r'(Issue #|\B#)(?P<issue>\d+)', + url='{package_url}/issues/{issue}', ), dict( - pattern=r'(?<!\w)(Issue )?#(?P<issue>\d+)', - url='{package_url}/issues/{issue}', + pattern=r'(?m:^((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n)', + with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n', + ), + dict( + pattern=r'PEP[- ](?P<pep_number>\d+)', + url='https://peps.python.org/pep-{pep_number:0>4}/', + ), + dict( + pattern=r'(?<!\w)PR #(?P<pull>\d+)', + url='{package_url}/pull/{pull}', ), dict( pattern=r'BB Pull Request ?#(?P<bb_pull_request>\d+)', @@ -58,10 +66,6 @@ link_files = { url='{GH}/pypa/packaging/blob/{packaging_ver}/CHANGELOG.rst', ), dict( - pattern=r'(?<![`/\w])PEP[- ](?P<pep_number>\d+)', - url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/', - ), - dict( pattern=r'setuptools_svn #(?P<setuptools_svn>\d+)', url='{GH}/jaraco/setuptools_svn/issues/{setuptools_svn}', ), @@ -73,10 +77,6 @@ link_files = { pattern=r'pypa/(?P<commit_repo>[\-\.\w]+)@(?P<commit_number>[\da-f]+)', url='{GH}/pypa/{commit_repo}/commit/{commit_number}', ), - dict( - pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n', - with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n', - ), ], ), } |