diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2021-10-31 19:17:21 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2021-10-31 19:17:21 -0400 |
| commit | 1473924e53680ac37ae0aa66d863ff39cbc63f3a (patch) | |
| tree | 96dc9acbb68f9241ab8e140c79fbc347e03f0065 | |
| parent | 930ab79e2fdba0f5f8e54627dbe2b591695fd07f (diff) | |
| parent | aae281a9ff6c9a1fa9daad82c79457e8770a1c7e (diff) | |
| download | python-setuptools-git-1473924e53680ac37ae0aa66d863ff39cbc63f3a.tar.gz | |
Merge https://github.com/jaraco/skeleton
| -rw-r--r-- | .editorconfig | 1 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 9 | ||||
| -rw-r--r-- | docs/conf.py | 11 | ||||
| -rw-r--r-- | pyproject.toml | 4 | ||||
| -rw-r--r-- | pytest.ini | 2 | ||||
| -rw-r--r-- | setup.cfg | 2 |
6 files changed, 18 insertions, 11 deletions
diff --git a/.editorconfig b/.editorconfig index 6385b573..b8aeea17 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,7 @@ end_of_line = lf [*.py] indent_style = space +max_line_length = 88 [*.{yml,yaml}] indent_style = space diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b348056b..a82b6fd2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,8 +10,11 @@ jobs: - pypy3 - 3.6 - 3.9 - - 3.10.0-alpha - 3.10.99 - platform: [ubuntu-latest, macos-latest, windows-latest] + - "3.10" + platform: + - ubuntu-latest + - macos-latest + - windows-latest runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v2 @@ -42,7 +45,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: "3.10" - name: Install tox run: | python -m pip install tox diff --git a/docs/conf.py b/docs/conf.py index 8f1e1f4c..ba541423 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -76,17 +76,24 @@ link_files = { # Be strict about any broken references: nitpicky = True +# Include Python intersphinx mapping to prevent failures +# jaraco/skeleton#51 +extensions += ['sphinx.ext.intersphinx'] intersphinx_mapping = { - 'pypa-build': ('https://pypa-build.readthedocs.io/en/latest/', None) + 'python': ('https://docs.python.org/3', None), } +intersphinx_mapping.update({ + 'pypa-build': ('https://pypa-build.readthedocs.io/en/latest/', None) +}) + # Add support for linking usernames github_url = 'https://github.com' github_sponsors_url = f'{github_url}/sponsors' extlinks = { 'user': (f'{github_sponsors_url}/%s', '@'), # noqa: WPS323 } -extensions += ['sphinx.ext.extlinks', 'sphinx.ext.intersphinx'] +extensions += ['sphinx.ext.extlinks'] # Ref: https://github.com/python-attrs/attrs/pull/571/files\ # #diff-85987f48f1258d9ee486e3191495582dR82 diff --git a/pyproject.toml b/pyproject.toml index 70e3473d..03c40125 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,5 @@ [build-system] -requires = [ - "wheel", -] +requires = [] build-backend = "setuptools.build_meta" backend-path = ["."] @@ -5,8 +5,6 @@ addopts= --doctest-glob=pkg_resources/api_tests.txt -r sxX doctest_optionflags=ALLOW_UNICODE ELLIPSIS -# workaround for warning pytest-dev/pytest#6178 -junit_family=xunit2 filterwarnings= # Fail on warnings error @@ -39,7 +39,7 @@ exclude = [options.extras_require] testing = # upstream - pytest >= 4.6 + pytest >= 6 pytest-checkdocs >= 2.4 pytest-flake8 pytest-black >= 0.3.7; \ |