diff options
| -rw-r--r-- | .pre-commit-config.yaml | 10 | ||||
| -rw-r--r-- | CHANGELOG.rst | 29 | ||||
| -rw-r--r-- | src/setuptools_scm/_overrides.py | 2 | ||||
| -rw-r--r-- | src/setuptools_scm/hg_git.py | 2 | ||||
| -rw-r--r-- | testing/test_mercurial.py | 6 | ||||
| -rw-r--r-- | testing/test_setuptools_support.py | 20 | ||||
| -rw-r--r-- | tox.ini | 2 |
7 files changed, 44 insertions, 27 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6f40899..d6a2932 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: 21.9b0 + rev: 21.12b0 hooks: - id: black args: [--safe, --quiet] @@ -10,7 +10,7 @@ repos: - id: reorder-python-imports args: [ "--application-directories=.:src" , --py3-plus] - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v4.1.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -21,16 +21,16 @@ repos: hooks: - id: flake8 - repo: https://github.com/asottile/pyupgrade - rev: v2.29.0 + rev: v2.29.1 hooks: - id: pyupgrade args: [--py36-plus] - repo: https://github.com/asottile/setup-cfg-fmt - rev: v1.18.0 + rev: v1.20.0 hooks: - id: setup-cfg-fmt - repo: https://github.com/pre-commit/mirrors-mypy - rev: 'v0.910-1' + rev: 'v0.930' hooks: - id: mypy additional_dependencies: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f4dd514..9704a01 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,8 @@ +6.3.4 +====== + +* compatibility adjustments for setuptools >58 + 6.3.3 ====== @@ -277,8 +282,8 @@ v3.0.0 * require parse results to be ScmVersion or None (breaking change) * fix #266 by requiring the prefix word to be a word again (breaking change as the bug allowed arbitrary prefixes while the original feature only allowed words") -* introduce a internal config object to allow the configruation fo tag parsing and prefixes - (thanks to @punkadiddle for introducing it and passing it trough) +* introduce an internal config object to allow the configuration for tag parsing and prefixes + (thanks to @punkadiddle for introducing it and passing it through) v2.1.0 ====== @@ -295,7 +300,7 @@ v2.0.0 * fix #237 - correct imports in code examples * improve mercurial commit detection (thanks Aaron) * breaking change: remove support for setuptools before parsed versions -* reintroduce manifest as the travis deploy cant use the file finder +* reintroduce manifest as the travis deploy can't use the file finder * reconfigure flake8 for future compatibility with black * introduce support for branch name in version metadata and support a opt-in simplified semver version scheme @@ -325,8 +330,8 @@ v1.16.0 ======= * drop support for eol python versions -* #214 - fix missuse in surogate-escape api -* add the node-and-timestamp local version sheme +* #214 - fix misuse in surogate-escape api +* add the node-and-timestamp local version scheme * respect git export ignores * avoid shlex.split on windows * fix #218 - better handling of mercurial edge-cases with tag commits @@ -355,7 +360,7 @@ v1.15.5 v1.15.4 ======= -* fix issue #164: iterate all found entry points to avoid erros when pip remakes egg-info +* fix issue #164: iterate all found entry points to avoid errors when pip remakes egg-info * enhance self-use to enable pip install from github again v1.15.3 @@ -386,7 +391,7 @@ v1.15.0 when considering distance in commits (thanks Petre Mierlutiu) * fix issue #114: stop trying to be smart for the sdist - and ensure its always correctly usign itself + and ensure its always correctly using itself * update trove classifiers * fix issue #84: document using the installed package metadata for sphinx * fix issue #81: fail more gracious when git/hg are missing @@ -401,7 +406,7 @@ v1.14.1 don't consider untracked file (this was a regression due to #86 in v1.13.1) * consider the distance 0 when the git node is unknown - (happens when you haven't commited anything) + (happens when you haven't committed anything) v1.14.0 ======= @@ -419,7 +424,7 @@ v1.13.0 * fix regression caused by the fix of #101 * assert types for version dumping - * strictly pass all versions trough parsed version metadata + * strictly pass all versions through parsed version metadata v1.12.0 ======= @@ -457,7 +462,7 @@ v1.10.0 * add support for overriding the version number via the environment variable SETUPTOOLS_SCM_PRETEND_VERSION -* fix isssue #63 by adding the --match parameter to the git describe call +* fix issue #63 by adding the --match parameter to the git describe call and prepare the possibility of passing more options to scm backends * fix issue #70 and #71 by introducing the parse keyword @@ -501,7 +506,7 @@ v1.6.0 before we would let the setup stay at version 0.0, now there is a ValueError -* propperly raise errors on write_to missuse (thanks Te-jé Rodgers) +* properly raise errors on write_to misuse (thanks Te-jé Rodgers) v1.5.5 ====== @@ -538,7 +543,7 @@ v1.5.0 v1.4.0 ====== -* propper handling for sdist +* proper handling for sdist * fix file-finder failure from windows * resuffle docs diff --git a/src/setuptools_scm/_overrides.py b/src/setuptools_scm/_overrides.py index 292936c..644e87d 100644 --- a/src/setuptools_scm/_overrides.py +++ b/src/setuptools_scm/_overrides.py @@ -12,7 +12,7 @@ PRETEND_KEY_NAMED = PRETEND_KEY + "_FOR_{name}" def _read_pretended_version_for(config: Configuration) -> Optional[ScmVersion]: - """read a a overriden version from the environment + """read a a overridden version from the environment tries ``SETUPTOOLS_SCM_PRETEND_VERSION`` and ``SETUPTOOLS_SCM_PRETEND_VERSION_FOR_$UPPERCASE_DIST_NAME`` diff --git a/src/setuptools_scm/hg_git.py b/src/setuptools_scm/hg_git.py index b871a39..323cdcb 100644 --- a/src/setuptools_scm/hg_git.py +++ b/src/setuptools_scm/hg_git.py @@ -73,7 +73,7 @@ class GitWorkdirHgClient(GitWorkdir, HgWorkdir): trace("Cannot get git node so we use hg node", hg_node) if hg_node == "0" * len(hg_node): - # mimick Git behavior + # mimic Git behavior return None return hg_node diff --git a/testing/test_mercurial.py b/testing/test_mercurial.py index 2352bf9..3276802 100644 --- a/testing/test_mercurial.py +++ b/testing/test_mercurial.py @@ -82,7 +82,7 @@ def test_version_from_hg_id(wd): wd("hg up v0.1") assert wd.version == "0.1" - # commit originating from the taged revision + # commit originating from the tagged revision # that is not a actual tag wd.commit_testfile() assert wd.version.startswith("0.2.dev1+") @@ -96,7 +96,7 @@ def test_version_from_hg_id(wd): def test_version_from_archival(wd): # entrypoints are unordered, - # cleaning the wd ensure this test wont break randomly + # cleaning the wd ensure this test won't break randomly wd.cwd.joinpath(".hg").rename(wd.cwd / ".nothg") wd.write(".hg_archival.txt", "node: 000000000000\n" "tag: 0.1\n") assert wd.version == "0.1" @@ -172,7 +172,7 @@ def test_version_bump_from_commit_including_hgtag_mods(wd): @pytest.mark.usefixtures("version_1_0") def test_latest_tag_detection(wd): """Tests that tags not containing a "." are ignored, the same as for git. - Note that will be superceded by the fix for pypa/setuptools_scm/issues/235 + Note that will be superseded by the fix for pypa/setuptools_scm/issues/235 """ wd('hg tag some-random-tag -u test -d "0 0"') assert wd.version == "1.0.0" diff --git a/testing/test_setuptools_support.py b/testing/test_setuptools_support.py index d6243db..b0c7230 100644 --- a/testing/test_setuptools_support.py +++ b/testing/test_setuptools_support.py @@ -7,9 +7,21 @@ import subprocess import sys import pytest -from virtualenv.run import cli_run -pytestmark = pytest.mark.filterwarnings(r"ignore:.*tool\.setuptools_scm.*") + +def cli_run(*k, **kw): + """this defers the virtualenv import + it helps to avoid warnings from the furthermore imported setuptools + """ + global cli_run + from virtualenv.run import cli_run + + return cli_run(*k, **kw) + + +pytestmark = pytest.mark.filterwarnings( + r"ignore:.*tool\.setuptools_scm.*", r"always:.*setup.py install is deprecated.*" +) ROOT = pathlib.Path(__file__).parent.parent @@ -88,7 +100,7 @@ def check(venv, expected_version, **env): @pytest.mark.skipif( - sys.version_info[:2] >= (3, 10), reason="old setuptools wont work on python 3.10" + sys.version_info[:2] >= (3, 10), reason="old setuptools won't work on python 3.10" ) def test_distlib_setuptools_works(venv_maker): venv = venv_maker.get_venv(setuptools="45.0.0", pip="9.0", python="3.6") @@ -137,7 +149,7 @@ def prepare_setup_py_config(pkg: pathlib.Path): @pytest.mark.skipif( - sys.version_info[:2] >= (3, 10), reason="old setuptools wont work on python 3.10" + sys.version_info[:2] >= (3, 10), reason="old setuptools won't work on python 3.10" ) @pytest.mark.parametrize("setuptools", [f"{v}.0" for v in range(31, 45)]) @pytest.mark.parametrize( @@ -8,7 +8,7 @@ filterwarnings= ignore:.*tool\.setuptools_scm.* markers= issue(id): reference to github issue - skip_commit: allows to skip commiting in the helpers + skip_commit: allows to skip committing in the helpers # disable unraisable until investigated addopts = -p no:unraisableexception |