Skip to content

Merge latest skeleton #4211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ disable_warnings =

[report]
show_missing = True
exclude_also =
# jaraco/skeleton#97
@overload
if TYPE_CHECKING:
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ python:

# required boilerplate readthedocs/readthedocs.org#10401
build:
os: ubuntu-22.04
os: ubuntu-lts-latest
tools:
python: "3"
python: latest
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.. image:: https://img.shields.io/readthedocs/setuptools/latest.svg
:target: https://setuptools.pypa.io

.. image:: https://img.shields.io/badge/skeleton-2023-informational
.. image:: https://img.shields.io/badge/skeleton-2024-informational
:target: https://blog.jaraco.com/skeleton

.. image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg?logo=codecov&logoColor=white
Expand Down
2 changes: 2 additions & 0 deletions ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@ exclude = [
"setuptools/_distutils",
"setuptools/config/_validate_pyproject",
]
# Enable preview, required for quote-style = "preserve"
preview = true
# https://docs.astral.sh/ruff/settings/#format-quote-style
quote-style = "preserve"
4 changes: 0 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ install_requires =

[options.packages.find]
exclude =
build*
dist*
docs*
tests*
*.tests
*.tests.*
tools*
Expand Down
1 change: 1 addition & 0 deletions setuptools/depends.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ def extract_constant(code, symbol, default=-1):

return None


def _update_globals():
"""
Patch the globals to remove the objects not available on some platforms.
Expand Down
3 changes: 3 additions & 0 deletions setuptools/py311compat.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import sys


__all__ = ['tomllib']


if sys.version_info >= (3, 11):
import tomllib
else: # pragma: no cover
Expand Down
2 changes: 1 addition & 1 deletion setuptools/tests/integration/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def run(cmd, env=None):
r = subprocess.run(
cmd,
capture_output=True,
universal_newlines=True,
text=True,
env={**os.environ, **(env or {})},
# ^-- allow overwriting instead of discarding the current env
)
Expand Down
3 changes: 1 addition & 2 deletions setuptools/tests/server.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Basic http server for tests to simulate PyPI or custom indexes
"""
"""Basic http server for tests to simulate PyPI or custom indexes"""

import os
import time
Expand Down
3 changes: 1 addition & 2 deletions setuptools/tests/test_bdist_deprecations.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""develop tests
"""
"""develop tests"""

import sys
from unittest import mock
Expand Down
3 changes: 1 addition & 2 deletions setuptools/tests/test_bdist_egg.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""develop tests
"""
"""develop tests"""

import os
import re
Expand Down
3 changes: 1 addition & 2 deletions setuptools/tests/test_develop.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""develop tests
"""
"""develop tests"""

import os
import sys
Expand Down
3 changes: 1 addition & 2 deletions setuptools/tests/test_dist_info.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Test .dist-info style distributions.
"""
"""Test .dist-info style distributions."""

import pathlib
import re
Expand Down
3 changes: 1 addition & 2 deletions setuptools/tests/test_easy_install.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Easy install Tests
"""
"""Easy install Tests"""

import sys
import os
Expand Down
3 changes: 1 addition & 2 deletions setuptools/tests/test_install_scripts.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""install_scripts tests
"""
"""install_scripts tests"""

import sys

Expand Down
1 change: 0 additions & 1 deletion setuptools/tests/test_packageindex.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import sys
import distutils.errors
import urllib.request
import urllib.error
Expand Down
3 changes: 1 addition & 2 deletions setuptools/tests/test_sandbox.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""develop tests
"""
"""develop tests"""

import os
import types
Expand Down
3 changes: 1 addition & 2 deletions setuptools/tests/test_wheel.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""wheel tests
"""
"""wheel tests"""

from distutils.sysconfig import get_config_var
from distutils.util import get_platform
Expand Down