Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-setuptools-git-versioning for
openSUSE:Factory checked in at 2023-12-28 23:01:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-setuptools-git-versioning (Old)
and
/work/SRC/openSUSE:Factory/.python-setuptools-git-versioning.new.28375 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-setuptools-git-versioning"
Thu Dec 28 23:01:31 2023 rev:7 rq:1135270 version:1.13.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-setuptools-git-versioning/python-setuptools-git-versioning.changes
2023-06-12 15:26:20.843015065 +0200
+++
/work/SRC/openSUSE:Factory/.python-setuptools-git-versioning.new.28375/python-setuptools-git-versioning.changes
2023-12-28 23:03:06.870063071 +0100
@@ -1,0 +2,11 @@
+Mon Dec 25 11:20:47 UTC 2023 - Ben Greiner <c...@bnavigator.de>
+
+- Update to 1.13.5
+ * [bugfix] Import setuptools before importing distutils. Thanks
+ to @tjni
+ * [bugfix] Move zip-safe option to tool.setuptools section of
+ pyproject.toml. Thanks to @cclecle
+- Accomodate upstream's usage of reruns: some tag
+ tests fail with commit hashes starting with 0.
+
+-------------------------------------------------------------------
Old:
----
setuptools-git-versioning-1.13.2.obscpio
setuptools-git-versioning-1.13.2.tar.xz
New:
----
setuptools-git-versioning-1.13.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-setuptools-git-versioning.spec ++++++
--- /var/tmp/diff_new_pack.dnXzKM/_old 2023-12-28 23:03:07.542087632 +0100
+++ /var/tmp/diff_new_pack.dnXzKM/_new 2023-12-28 23:03:07.546087777 +0100
@@ -18,12 +18,13 @@
%{?sle15_python_module_pythons}
Name: python-setuptools-git-versioning
-Version: 1.13.2
+Version: 1.13.5
Release: 0
Summary: Use git repo data for building a version number according
PEP-440
License: MIT
URL: https://setuptools-git-versioning.readthedocs.io
-# no sdist on PyPI, needs full git metadata for bootstrap, run osc service
runall to update
+# SourceDist: https://github.com/dolfinus/setuptools-git-versioning
+# the sdist on PyPI does not have the tests, we needs full git metadata for
bootstrap, run osc service runall to update
Source: setuptools-git-versioning-%{version}.tar.xz
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
@@ -31,7 +32,6 @@
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: git-core
-Requires: python-Deprecated
Requires: python-packaging
Requires: python-setuptools
Requires(post): update-alternatives
@@ -39,13 +39,13 @@
Provides: python-setuptools_git_versioning = %{version}-%{release}
BuildArch: noarch
%if 0%{python_version_nodots} < 311
-Requires: python-toml
+Requires: python-toml >= 0.10.2
%endif
# SECTION test
-BuildRequires: %{python_module Deprecated}
BuildRequires: %{python_module build}
BuildRequires: %{python_module coverage}
BuildRequires: %{python_module packaging}
+BuildRequires: %{python_module pytest-rerunfailures}
BuildRequires: %{python_module pytest-xdist}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
@@ -83,10 +83,6 @@
sed -i '/assert get_version(repo, isolated=True)/d'
tests/test_integration/test_config.py
# test tries to get a wheel wheel in isolated build env
donttest="test_substitution_env"
-# short git hash has only 7 characters on i586
-donttest="$donttest or (test_version_file_count_commits and sha)"
-# broken under Python 3.11
-donttest="$donttest or test_substitution_timestamp"
%pytest -k "not ($donttest)" -n auto
%post
++++++ setuptools-git-versioning-1.13.2.tar.xz ->
setuptools-git-versioning-1.13.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/.git/FETCH_HEAD
new/setuptools-git-versioning-1.13.5/.git/FETCH_HEAD
--- old/setuptools-git-versioning-1.13.2/.git/FETCH_HEAD 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.git/FETCH_HEAD 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-426127db8d293ee09e7bf00571b2894584da9bf7 not-for-merge branch 'master'
of https://github.com/dolfinus/setuptools-git-versioning
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/.git/HEAD
new/setuptools-git-versioning-1.13.5/.git/HEAD
--- old/setuptools-git-versioning-1.13.2/.git/HEAD 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.git/HEAD 2023-08-08
12:43:14.000000000 +0200
@@ -1 +1 @@
-aa578a78397cd8ca51bd389aaee8a274fd1b6274
+3cd11bcd38f15e2e9b25bee7485e81840f3e16dd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/.git/ORIG_HEAD
new/setuptools-git-versioning-1.13.5/.git/ORIG_HEAD
--- old/setuptools-git-versioning-1.13.2/.git/ORIG_HEAD 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.git/ORIG_HEAD 2023-08-08
12:43:14.000000000 +0200
@@ -1 +1 @@
-aa578a78397cd8ca51bd389aaee8a274fd1b6274
+3cd11bcd38f15e2e9b25bee7485e81840f3e16dd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/.git/hooks/sendemail-validate.sample
new/setuptools-git-versioning-1.13.5/.git/hooks/sendemail-validate.sample
--- old/setuptools-git-versioning-1.13.2/.git/hooks/sendemail-validate.sample
1970-01-01 01:00:00.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.git/hooks/sendemail-validate.sample
2023-08-08 12:43:14.000000000 +0200
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# An example hook script to validate a patch (and/or patch series) before
+# sending it via email.
+#
+# The hook should exit with non-zero status after issuing an appropriate
+# message if it wants to prevent the email(s) from being sent.
+#
+# To enable this hook, rename this file to "sendemail-validate".
+#
+# By default, it will only check that the patch(es) can be applied on top of
+# the default upstream branch without conflicts in a secondary worktree. After
+# validation (successful or not) of the last patch of a series, the worktree
+# will be deleted.
+#
+# The following config variables can be set to change the default remote and
+# remote ref that are used to apply the patches against:
+#
+# sendemail.validateRemote (default: origin)
+# sendemail.validateRemoteRef (default: HEAD)
+#
+# Replace the TODO placeholders with appropriate checks according to your
+# needs.
+
+validate_cover_letter () {
+ file="$1"
+ # TODO: Replace with appropriate checks (e.g. spell checking).
+ true
+}
+
+validate_patch () {
+ file="$1"
+ # Ensure that the patch applies without conflicts.
+ git am -3 "$file" || return
+ # TODO: Replace with appropriate checks for this patch
+ # (e.g. checkpatch.pl).
+ true
+}
+
+validate_series () {
+ # TODO: Replace with appropriate checks for the whole series
+ # (e.g. quick build, coding style checks, etc.).
+ true
+}
+
+# main
-------------------------------------------------------------------------
+
+if test "$GIT_SENDEMAIL_FILE_COUNTER" = 1
+then
+ remote=$(git config --default origin --get sendemail.validateRemote) &&
+ ref=$(git config --default HEAD --get sendemail.validateRemoteRef) &&
+ worktree=$(mktemp --tmpdir -d sendemail-validate.XXXXXXX) &&
+ git worktree add -fd --checkout "$worktree" "refs/remotes/$remote/$ref"
&&
+ git config --replace-all sendemail.validateWorktree "$worktree"
+else
+ worktree=$(git config --get sendemail.validateWorktree)
+fi || {
+ echo "sendemail-validate: error: failed to prepare worktree" >&2
+ exit 1
+}
+
+unset GIT_DIR GIT_WORK_TREE
+cd "$worktree" &&
+
+if grep -q "^diff --git " "$1"
+then
+ validate_patch "$1"
+else
+ validate_cover_letter "$1"
+fi &&
+
+if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL"
+then
+ git config --unset-all sendemail.validateWorktree &&
+ trap 'git worktree remove -ff "$worktree"' EXIT &&
+ validate_series
+fi
Binary files old/setuptools-git-versioning-1.13.2/.git/index and
new/setuptools-git-versioning-1.13.5/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/.git/logs/HEAD
new/setuptools-git-versioning-1.13.5/.git/logs/HEAD
--- old/setuptools-git-versioning-1.13.2/.git/logs/HEAD 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.git/logs/HEAD 2023-08-08
12:43:14.000000000 +0200
@@ -1,2 +1,2 @@
-0000000000000000000000000000000000000000
426127db8d293ee09e7bf00571b2894584da9bf7 Steve Kowalik <ste...@wedontsleep.org>
1677806985 +1100 clone: from
https://github.com/dolfinus/setuptools-git-versioning.git
-426127db8d293ee09e7bf00571b2894584da9bf7
aa578a78397cd8ca51bd389aaee8a274fd1b6274 Steve Kowalik <ste...@wedontsleep.org>
1677806987 +1100 checkout: moving from master to v1.13.2
+0000000000000000000000000000000000000000
9903bf017e52d1e466775c50cdd6c10a8d92e021 Ben Greiner <c...@bnavigator.de>
1703503198 +0100 clone: from
https://github.com/dolfinus/setuptools-git-versioning.git
+9903bf017e52d1e466775c50cdd6c10a8d92e021
3cd11bcd38f15e2e9b25bee7485e81840f3e16dd Ben Greiner <c...@bnavigator.de>
1703503200 +0100 checkout: moving from master to v1.13.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/.git/logs/refs/heads/master
new/setuptools-git-versioning-1.13.5/.git/logs/refs/heads/master
--- old/setuptools-git-versioning-1.13.2/.git/logs/refs/heads/master
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.git/logs/refs/heads/master
2023-08-08 12:43:14.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000
426127db8d293ee09e7bf00571b2894584da9bf7 Steve Kowalik <ste...@wedontsleep.org>
1677806985 +1100 clone: from
https://github.com/dolfinus/setuptools-git-versioning.git
+0000000000000000000000000000000000000000
9903bf017e52d1e466775c50cdd6c10a8d92e021 Ben Greiner <c...@bnavigator.de>
1703503198 +0100 clone: from
https://github.com/dolfinus/setuptools-git-versioning.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/.git/logs/refs/remotes/origin/HEAD
new/setuptools-git-versioning-1.13.5/.git/logs/refs/remotes/origin/HEAD
--- old/setuptools-git-versioning-1.13.2/.git/logs/refs/remotes/origin/HEAD
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.git/logs/refs/remotes/origin/HEAD
2023-08-08 12:43:14.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000
426127db8d293ee09e7bf00571b2894584da9bf7 Steve Kowalik <ste...@wedontsleep.org>
1677806985 +1100 clone: from
https://github.com/dolfinus/setuptools-git-versioning.git
+0000000000000000000000000000000000000000
9903bf017e52d1e466775c50cdd6c10a8d92e021 Ben Greiner <c...@bnavigator.de>
1703503198 +0100 clone: from
https://github.com/dolfinus/setuptools-git-versioning.git
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-1f99d45186b410752251124dbd000a369df3fdd4.idx
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-1f99d45186b410752251124dbd000a369df3fdd4.idx
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-1f99d45186b410752251124dbd000a369df3fdd4.pack
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-1f99d45186b410752251124dbd000a369df3fdd4.pack
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-1f99d45186b410752251124dbd000a369df3fdd4.rev
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-1f99d45186b410752251124dbd000a369df3fdd4.rev
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-2f84ad5fc08e1a4404f9d592ef86c8dd44919f5f.idx
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-2f84ad5fc08e1a4404f9d592ef86c8dd44919f5f.idx
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-2f84ad5fc08e1a4404f9d592ef86c8dd44919f5f.pack
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-2f84ad5fc08e1a4404f9d592ef86c8dd44919f5f.pack
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-2f84ad5fc08e1a4404f9d592ef86c8dd44919f5f.rev
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-2f84ad5fc08e1a4404f9d592ef86c8dd44919f5f.rev
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-60a4b7037b1b7388f874ffb8b118beb2e3bc9847.idx
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-60a4b7037b1b7388f874ffb8b118beb2e3bc9847.idx
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-60a4b7037b1b7388f874ffb8b118beb2e3bc9847.pack
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-60a4b7037b1b7388f874ffb8b118beb2e3bc9847.pack
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-60a4b7037b1b7388f874ffb8b118beb2e3bc9847.rev
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-60a4b7037b1b7388f874ffb8b118beb2e3bc9847.rev
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.idx
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.idx
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.pack
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.pack
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.idx
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.idx
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.pack
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.pack
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-bb988e9992ffc39879c7cf7499b67f353480232c.idx
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-bb988e9992ffc39879c7cf7499b67f353480232c.idx
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-bb988e9992ffc39879c7cf7499b67f353480232c.pack
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-bb988e9992ffc39879c7cf7499b67f353480232c.pack
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-bb988e9992ffc39879c7cf7499b67f353480232c.promisor
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-bb988e9992ffc39879c7cf7499b67f353480232c.promisor
---
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-bb988e9992ffc39879c7cf7499b67f353480232c.promisor
1970-01-01 01:00:00.000000000 +0100
+++
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-bb988e9992ffc39879c7cf7499b67f353480232c.promisor
2023-08-08 12:43:14.000000000 +0200
@@ -0,0 +1,67 @@
+9903bf017e52d1e466775c50cdd6c10a8d92e021 HEAD
+983fd6c8894f57654fa44236d14a82ba32465de7
refs/heads/dependabot/github_actions/codecov/codecov-action-4
+9903bf017e52d1e466775c50cdd6c10a8d92e021 refs/heads/master
+e9d91fd77bdc2d7e4b1829c9dce3a7e2fadf2eda refs/tags/v0.0.1
+ddc55a0a1bc5723b98722322d2ce9ff3719e77fc refs/tags/v0.0.2
+7b4b2d696eba871b4ace0adb23a0b31112b38c2f refs/tags/v0.0.3
+ad8eb0388cb79bdf942c06805285ec11fe37e7d8 refs/tags/v0.0.4
+a496cd6e47bbe2ae3ee45092395839dd66477c9b refs/tags/v1.0.0
+ad23f99e5a0b23927e51df8b8b98fc85c17eda32 refs/tags/v1.0.1
+a6692e2af73b5abfb10d4a763517cc78445698de refs/tags/v1.0.2
+f15686b5e6ce9d84e2994979a799b1287d87ffcf refs/tags/v1.0.3
+b45f5724240d2f44ce24e48c74b8c3b5791f54bf refs/tags/v1.0.4
+119f98a08610da39cfd9fb9f2e533b42856af39b refs/tags/v1.1.10
+184e9670ed01bcd3829dd1d5ddb109d741757aa4 refs/tags/v1.1.11
+b85a5e5d1fedbbf75bb17b0953021ebf0640f917 refs/tags/v1.1.12
+4d57008dc8a1e876d152d828c34c8a8fe10c3f6d refs/tags/v1.1.13
+4bce22abed9330366e2d81905812521563009746 refs/tags/v1.1.14
+98323c6c19b5c9d9e1c24e1d2abcbefd88ec50c6 refs/tags/v1.1.2
+85439b4028abaedd791d966cd602234990a6ce74 refs/tags/v1.1.3
+3c213500c42efcdcc395bf7435e79cd47bc574ce refs/tags/v1.1.4
+8d427b3128dad9d0a28118a3fcaee4984347948a refs/tags/v1.1.5
+777c1366912c17ad264b8a0f1ba675f24f91a72f refs/tags/v1.1.7
+f9dfa1e69469cd14742afe9bcfd5e71ad733ec73 refs/tags/v1.1.8
+2fde432bb5077c3dbf2914402bdaa5ac705b06c0 refs/tags/v1.1.9
+f1e03f57c32309a976373789c3ed9801397ec91e refs/tags/v1.10.0
+629952c29a594182db00a7bdf6c896f330110cd7 refs/tags/v1.10.1
+fe3547ae4c5ea0af4ed4a3e8b60aa119ed0c3136 refs/tags/v1.11.0
+b1afa6eaa05c964271ab897fba16fd8ac957a616 refs/tags/v1.12.0
+031ee08407cfb7edd073fbbbaff2060ff3a3bd37 refs/tags/v1.12.1
+663ffcc297ce75a4dce7d6b46a40b43fd3c77429 refs/tags/v1.13.0
+eea9b28acd19aad4b5d2932e6338e0d1fc23ef41 refs/tags/v1.13.1
+aa578a78397cd8ca51bd389aaee8a274fd1b6274 refs/tags/v1.13.2
+ecaddc48c20268cc903e9cce2bb5e772566d90fd refs/tags/v1.13.3
+ba4f32955aac97694d68faf4643e0b5f764241bd refs/tags/v1.13.4
+3cd11bcd38f15e2e9b25bee7485e81840f3e16dd refs/tags/v1.13.5
+5c4dd0f25bc892f0c6863c74bfbfe2b1bdcbc435 refs/tags/v1.2.0
+5a47ac43076c029aba68eb3d1218b38327a35c2b refs/tags/v1.2.1
+9684323617cf2c5828d5c58e24ff28dd78103ad2 refs/tags/v1.2.10
+1ed862d07e5d1995bd68e9c6063d5d9746587815 refs/tags/v1.2.2
+bee32404c7915f97823e621a0538bcc9b04ac487 refs/tags/v1.2.3
+07b92afc6058aea1b3bbc370b3667c0ef3f6a5ad refs/tags/v1.2.4
+07addd8750a46bf3879bce202afa1fa30a2af64b refs/tags/v1.2.5
+bc7e35002c26cca619c8fbdd2e62c6b065f744d8 refs/tags/v1.2.6
+b808b01af29f238771caf9308bb60a84c76208a2 refs/tags/v1.2.7
+89478a045f95f338b216cf21e9fb5d2b3b3b19e8 refs/tags/v1.2.8
+77580e0e717f1305686ae5e1fc60c04e68f3dc72 refs/tags/v1.2.9
+5ac7d8fd09af0a5afda12d6362c9673491888b89 refs/tags/v1.3.0
+adf997c08202a2a23bdd65c7b7b18ce722f5da75 refs/tags/v1.3.1
+c26dbcdea3952543fa1034bc833aa94fca3d0e3d refs/tags/v1.3.2
+44bd8fd51c7a9900e526db66450493a0be1e07c7 refs/tags/v1.3.3
+7cdc0d1d4e2d65ef9c9d71c88acd1ed7df82563a refs/tags/v1.3.4
+813ef149555c8ea49e85e4362a0496d2fc200fb1 refs/tags/v1.3.5
+8cf025702751930320e90d445e3a06bb2a03375c refs/tags/v1.3.6
+06b59a5f0457d81f9868912e73fe20d0d2423b58 refs/tags/v1.4.0
+b4ab047f61f9a87898e755510d0579c7016da084 refs/tags/v1.5.0
+c081fb9ca1992231111b431d331c0d5005145758 refs/tags/v1.6.0
+f59518bf6d2bb07191f3a53e23e1d79f5ad55a07 refs/tags/v1.6.1
+cad4e9262d9e0a321b35dbce60ab41dcf735e652 refs/tags/v1.7.0
+b2da6fbc037f67ceabfbfc196b250f5fe58db5b8 refs/tags/v1.7.1
+c2ed0da8313bf44ed8888f6aae348a963c7b80d5 refs/tags/v1.7.2
+a7af368f91b6bce049a416f4d0437f65c9d3b428 refs/tags/v1.7.3
+ac47f21048bfe9b62f13c4a45d63deefcbc7a089 refs/tags/v1.7.4
+df461e6b33493642ef39b96f8c5d68689f304bf7 refs/tags/v1.8.0
+d3a7e9c802f02d79c1376e8b9d799dd323c2352e refs/tags/v1.8.1
+3b6c2f214d60d62cc4940620850fdf9875859e9a refs/tags/v1.9.0
+b88025acce827cd64c14993f820815cb49499651 refs/tags/v1.9.1
+cb7610e8461f39dc137542be8ec85caebe3cd613 refs/tags/v1.9.2
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-bb988e9992ffc39879c7cf7499b67f353480232c.rev
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-bb988e9992ffc39879c7cf7499b67f353480232c.rev
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.idx
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.idx
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.pack
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.pack
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor
---
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor
2023-02-26 20:50:23.000000000 +0100
+++
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor
1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-426127db8d293ee09e7bf00571b2894584da9bf7 HEAD
-426127db8d293ee09e7bf00571b2894584da9bf7 refs/heads/master
-e9d91fd77bdc2d7e4b1829c9dce3a7e2fadf2eda refs/tags/v0.0.1
-ddc55a0a1bc5723b98722322d2ce9ff3719e77fc refs/tags/v0.0.2
-7b4b2d696eba871b4ace0adb23a0b31112b38c2f refs/tags/v0.0.3
-ad8eb0388cb79bdf942c06805285ec11fe37e7d8 refs/tags/v0.0.4
-a496cd6e47bbe2ae3ee45092395839dd66477c9b refs/tags/v1.0.0
-ad23f99e5a0b23927e51df8b8b98fc85c17eda32 refs/tags/v1.0.1
-a6692e2af73b5abfb10d4a763517cc78445698de refs/tags/v1.0.2
-f15686b5e6ce9d84e2994979a799b1287d87ffcf refs/tags/v1.0.3
-b45f5724240d2f44ce24e48c74b8c3b5791f54bf refs/tags/v1.0.4
-119f98a08610da39cfd9fb9f2e533b42856af39b refs/tags/v1.1.10
-184e9670ed01bcd3829dd1d5ddb109d741757aa4 refs/tags/v1.1.11
-b85a5e5d1fedbbf75bb17b0953021ebf0640f917 refs/tags/v1.1.12
-4d57008dc8a1e876d152d828c34c8a8fe10c3f6d refs/tags/v1.1.13
-4bce22abed9330366e2d81905812521563009746 refs/tags/v1.1.14
-98323c6c19b5c9d9e1c24e1d2abcbefd88ec50c6 refs/tags/v1.1.2
-85439b4028abaedd791d966cd602234990a6ce74 refs/tags/v1.1.3
-3c213500c42efcdcc395bf7435e79cd47bc574ce refs/tags/v1.1.4
-8d427b3128dad9d0a28118a3fcaee4984347948a refs/tags/v1.1.5
-777c1366912c17ad264b8a0f1ba675f24f91a72f refs/tags/v1.1.7
-f9dfa1e69469cd14742afe9bcfd5e71ad733ec73 refs/tags/v1.1.8
-2fde432bb5077c3dbf2914402bdaa5ac705b06c0 refs/tags/v1.1.9
-f1e03f57c32309a976373789c3ed9801397ec91e refs/tags/v1.10.0
-629952c29a594182db00a7bdf6c896f330110cd7 refs/tags/v1.10.1
-fe3547ae4c5ea0af4ed4a3e8b60aa119ed0c3136 refs/tags/v1.11.0
-b1afa6eaa05c964271ab897fba16fd8ac957a616 refs/tags/v1.12.0
-031ee08407cfb7edd073fbbbaff2060ff3a3bd37 refs/tags/v1.12.1
-663ffcc297ce75a4dce7d6b46a40b43fd3c77429 refs/tags/v1.13.0
-eea9b28acd19aad4b5d2932e6338e0d1fc23ef41 refs/tags/v1.13.1
-aa578a78397cd8ca51bd389aaee8a274fd1b6274 refs/tags/v1.13.2
-5c4dd0f25bc892f0c6863c74bfbfe2b1bdcbc435 refs/tags/v1.2.0
-5a47ac43076c029aba68eb3d1218b38327a35c2b refs/tags/v1.2.1
-9684323617cf2c5828d5c58e24ff28dd78103ad2 refs/tags/v1.2.10
-1ed862d07e5d1995bd68e9c6063d5d9746587815 refs/tags/v1.2.2
-bee32404c7915f97823e621a0538bcc9b04ac487 refs/tags/v1.2.3
-07b92afc6058aea1b3bbc370b3667c0ef3f6a5ad refs/tags/v1.2.4
-07addd8750a46bf3879bce202afa1fa30a2af64b refs/tags/v1.2.5
-bc7e35002c26cca619c8fbdd2e62c6b065f744d8 refs/tags/v1.2.6
-b808b01af29f238771caf9308bb60a84c76208a2 refs/tags/v1.2.7
-89478a045f95f338b216cf21e9fb5d2b3b3b19e8 refs/tags/v1.2.8
-77580e0e717f1305686ae5e1fc60c04e68f3dc72 refs/tags/v1.2.9
-5ac7d8fd09af0a5afda12d6362c9673491888b89 refs/tags/v1.3.0
-adf997c08202a2a23bdd65c7b7b18ce722f5da75 refs/tags/v1.3.1
-c26dbcdea3952543fa1034bc833aa94fca3d0e3d refs/tags/v1.3.2
-44bd8fd51c7a9900e526db66450493a0be1e07c7 refs/tags/v1.3.3
-7cdc0d1d4e2d65ef9c9d71c88acd1ed7df82563a refs/tags/v1.3.4
-813ef149555c8ea49e85e4362a0496d2fc200fb1 refs/tags/v1.3.5
-8cf025702751930320e90d445e3a06bb2a03375c refs/tags/v1.3.6
-06b59a5f0457d81f9868912e73fe20d0d2423b58 refs/tags/v1.4.0
-b4ab047f61f9a87898e755510d0579c7016da084 refs/tags/v1.5.0
-c081fb9ca1992231111b431d331c0d5005145758 refs/tags/v1.6.0
-f59518bf6d2bb07191f3a53e23e1d79f5ad55a07 refs/tags/v1.6.1
-cad4e9262d9e0a321b35dbce60ab41dcf735e652 refs/tags/v1.7.0
-b2da6fbc037f67ceabfbfc196b250f5fe58db5b8 refs/tags/v1.7.1
-c2ed0da8313bf44ed8888f6aae348a963c7b80d5 refs/tags/v1.7.2
-a7af368f91b6bce049a416f4d0437f65c9d3b428 refs/tags/v1.7.3
-ac47f21048bfe9b62f13c4a45d63deefcbc7a089 refs/tags/v1.7.4
-df461e6b33493642ef39b96f8c5d68689f304bf7 refs/tags/v1.8.0
-d3a7e9c802f02d79c1376e8b9d799dd323c2352e refs/tags/v1.8.1
-3b6c2f214d60d62cc4940620850fdf9875859e9a refs/tags/v1.9.0
-b88025acce827cd64c14993f820815cb49499651 refs/tags/v1.9.1
-cb7610e8461f39dc137542be8ec85caebe3cd613 refs/tags/v1.9.2
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.idx
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.idx
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.pack
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.pack
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.idx
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.idx
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.pack
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.pack
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-f3c86fa9c2da65d101cafe25679818222c49edb4.idx
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-f3c86fa9c2da65d101cafe25679818222c49edb4.idx
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-f3c86fa9c2da65d101cafe25679818222c49edb4.pack
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-f3c86fa9c2da65d101cafe25679818222c49edb4.pack
differ
Binary files
old/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-f3c86fa9c2da65d101cafe25679818222c49edb4.rev
and
new/setuptools-git-versioning-1.13.5/.git/objects/pack/pack-f3c86fa9c2da65d101cafe25679818222c49edb4.rev
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/.git/packed-refs
new/setuptools-git-versioning-1.13.5/.git/packed-refs
--- old/setuptools-git-versioning-1.13.2/.git/packed-refs 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.git/packed-refs 2023-08-08
12:43:14.000000000 +0200
@@ -1,5 +1,6 @@
# pack-refs with: peeled fully-peeled sorted
-426127db8d293ee09e7bf00571b2894584da9bf7 refs/remotes/origin/master
+983fd6c8894f57654fa44236d14a82ba32465de7
refs/remotes/origin/dependabot/github_actions/codecov/codecov-action-4
+9903bf017e52d1e466775c50cdd6c10a8d92e021 refs/remotes/origin/master
e9d91fd77bdc2d7e4b1829c9dce3a7e2fadf2eda refs/tags/v0.0.1
ddc55a0a1bc5723b98722322d2ce9ff3719e77fc refs/tags/v0.0.2
7b4b2d696eba871b4ace0adb23a0b31112b38c2f refs/tags/v0.0.3
@@ -29,6 +30,9 @@
663ffcc297ce75a4dce7d6b46a40b43fd3c77429 refs/tags/v1.13.0
eea9b28acd19aad4b5d2932e6338e0d1fc23ef41 refs/tags/v1.13.1
aa578a78397cd8ca51bd389aaee8a274fd1b6274 refs/tags/v1.13.2
+ecaddc48c20268cc903e9cce2bb5e772566d90fd refs/tags/v1.13.3
+ba4f32955aac97694d68faf4643e0b5f764241bd refs/tags/v1.13.4
+3cd11bcd38f15e2e9b25bee7485e81840f3e16dd refs/tags/v1.13.5
5c4dd0f25bc892f0c6863c74bfbfe2b1bdcbc435 refs/tags/v1.2.0
5a47ac43076c029aba68eb3d1218b38327a35c2b refs/tags/v1.2.1
9684323617cf2c5828d5c58e24ff28dd78103ad2 refs/tags/v1.2.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/.git/refs/heads/master
new/setuptools-git-versioning-1.13.5/.git/refs/heads/master
--- old/setuptools-git-versioning-1.13.2/.git/refs/heads/master 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.git/refs/heads/master 2023-08-08
12:43:14.000000000 +0200
@@ -1 +1 @@
-426127db8d293ee09e7bf00571b2894584da9bf7
+9903bf017e52d1e466775c50cdd6c10a8d92e021
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/.github/workflows/dev-release.yml
new/setuptools-git-versioning-1.13.5/.github/workflows/dev-release.yml
--- old/setuptools-git-versioning-1.13.2/.github/workflows/dev-release.yml
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.github/workflows/dev-release.yml
2023-08-08 12:43:14.000000000 +0200
@@ -7,45 +7,24 @@
- pre-commit-ci-update-config
workflow_dispatch:
-jobs:
- wait-tests:
- name: Wait for tests
- runs-on: ubuntu-latest
-
- steps:
- - uses: fountainhead/action-wait-for-check@v1.1.0
- id: wait-for-tests
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
- checkName: Tests done
- ref: ${{ github.sha }}
- timeoutSeconds: 3600
-
- - name: Fail the Build
- uses: cutenode/action-always-fail@v1
- if: steps.wait-for-tests.outputs.conclusion != 'success'
+env:
+ DEFAULT_PYTHON: '3.11'
- wait-codeql:
- name: Wait for CodeQL
- runs-on: ubuntu-latest
-
- steps:
- - uses: fountainhead/action-wait-for-check@v1.1.0
- id: wait-for-codeql
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
- checkName: Analyze
- ref: ${{ github.sha }}
- timeoutSeconds: 3600
-
- - name: Fail the Build
- uses: cutenode/action-always-fail@v1
- if: steps.wait-for-codeql.outputs.conclusion != 'success'
+concurrency:
+ group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+ cancel-in-progress: true
+jobs:
release:
name: Release package
runs-on: ubuntu-latest
- needs: [wait-tests, wait-codeql]
+ if: github.repository == 'dolfinus/setuptools-git-versioning' # prevent
running on forks
+
+ environment:
+ name: test-pypi
+ url: https://test.pypi.org/p/onetl
+ permissions:
+ id-token: write # to auth in Test PyPI
steps:
- name: Checkout code
@@ -53,19 +32,20 @@
with:
fetch-depth: 0
- - name: Set up Python 3.11
+ - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+ id: python
uses: actions/setup-python@v4
with:
- python-version: '3.11'
+ python-version: ${{ env.DEFAULT_PYTHON }}
- name: Cache pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
- key: ${{ runner.os }}-python-3.11-release-${{
hashFiles('requirements*.txt') }}
+ key: ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-release-${{
hashFiles('requirements*.txt') }}
restore-keys: |
- ${{ runner.os }}-python-3.11-release-${{
hashFiles('requirements*.txt') }}
- ${{ runner.os }}-python-3.11-release-
+ ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-release-${{
hashFiles('requirements*.txt') }}
+ ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-release-
${{ runner.os }}-python
${{ runner.os }}-
@@ -88,5 +68,4 @@
- name: Publish package
uses: pypa/gh-action-pypi-publish@release/v1
with:
- password: ${{ secrets.TEST_PYPI_API_TOKEN }}
repository_url: https://test.pypi.org/legacy/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/.github/workflows/release.yml
new/setuptools-git-versioning-1.13.5/.github/workflows/release.yml
--- old/setuptools-git-versioning-1.13.2/.github/workflows/release.yml
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.github/workflows/release.yml
2023-08-08 12:43:14.000000000 +0200
@@ -5,45 +5,21 @@
tags:
- v*
-jobs:
- wait-tests:
- name: Wait for tests
- runs-on: ubuntu-latest
-
- steps:
- - uses: fountainhead/action-wait-for-check@v1.1.0
- id: wait-for-tests
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
- checkName: Tests done
- ref: ${{ github.sha }}
- timeoutSeconds: 3600
-
- - name: Fail the Build
- uses: cutenode/action-always-fail@v1
- if: steps.wait-for-tests.outputs.conclusion != 'success'
-
- wait-codeql:
- name: Wait for CodeQL
- runs-on: ubuntu-latest
-
- steps:
- - uses: fountainhead/action-wait-for-check@v1.1.0
- id: wait-for-codeql
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
- checkName: Analyze
- ref: ${{ github.sha }}
- timeoutSeconds: 3600
-
- - name: Fail the Build
- uses: cutenode/action-always-fail@v1
- if: steps.wait-for-codeql.outputs.conclusion != 'success'
+env:
+ DEFAULT_PYTHON: '3.11'
+jobs:
release:
name: Release package
runs-on: ubuntu-latest
- needs: [wait-tests, wait-codeql]
+ if: github.repository == 'dolfinus/setuptools-git-versioning' # prevent
running on forks
+
+ environment:
+ name: pypi
+ url: https://pypi.org/p/onetl
+ permissions:
+ id-token: write # to auth in PyPI
+ contents: write # to create Github release
steps:
- name: Checkout code
@@ -51,19 +27,19 @@
with:
fetch-depth: 0
- - name: Set up Python 3.11
+ - name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/setup-python@v4
with:
- python-version: '3.11'
+ python-version: ${{ env.DEFAULT_PYTHON }}
- name: Cache pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
- key: ${{ runner.os }}-python-3.11-release-${{
hashFiles('requirements*.txt') }}
+ key: ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-release-${{
hashFiles('requirements*.txt') }}
restore-keys: |
- ${{ runner.os }}-python-3.11-release-${{
hashFiles('requirements*.txt') }}
- ${{ runner.os }}-python-3.11-release-
+ ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-release-${{
hashFiles('requirements*.txt') }}
+ ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-release-
${{ runner.os }}-python
${{ runner.os }}-
@@ -96,8 +72,6 @@
- name: Publish package
uses: pypa/gh-action-pypi-publish@release/v1
- with:
- password: ${{ secrets.PYPI_API_TOKEN }}
- name: Create Github release
id: create_release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/.github/workflows/test.yml
new/setuptools-git-versioning-1.13.5/.github/workflows/test.yml
--- old/setuptools-git-versioning-1.13.2/.github/workflows/test.yml
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.github/workflows/test.yml
2023-08-08 12:43:14.000000000 +0200
@@ -20,7 +20,7 @@
strategy:
fail-fast: false
matrix:
- python-version: ['3.7', pypy-3.7, pypy-3.9]
+ python-version: ['3.7', pypy-3.7, pypy-3.10]
os: [ubuntu-latest]
# run only limited set of tests because it takes too long
mark: [important]
@@ -75,18 +75,13 @@
run: |
mkdir reports/
pip install -e . --no-build-isolation
- coverage run -m pytest --reruns 5 -m ${{ matrix.mark }}
-
- - name: Combine coverage
- run: |
- coverage combine
- coverage xml -o reports/coverage-${{ matrix.python-version }}.xml -i
+ coverage run -m pytest -m ${{ matrix.mark }}
- name: Upload coverage results
uses: actions/upload-artifact@v3
with:
name: code-coverage-${{ matrix.python-version }}
- path: reports/coverage-${{ matrix.python-version }}.xml
+ path: reports/.coverage*
all_done:
name: Tests done
@@ -97,6 +92,28 @@
- name: Checkout code
uses: actions/checkout@v3
+ - name: Set up Python 3.11
+ uses: actions/setup-python@v4
+ with:
+ python-version: '3.11'
+
+ - name: Cache pip
+ uses: actions/cache@v3
+ with:
+ path: ~/.cache/pip
+ key: ${{ runner.os }}-python-3.11-tests-${{
hashFiles('requirements*.txt') }}
+ restore-keys: |
+ ${{ runner.os }}-python-3.11-tests-${{
hashFiles('requirements*.txt') }}
+ ${{ runner.os }}-python-3.11-tests-
+ ${{ runner.os }}-python
+ ${{ runner.os }}-
+
+ - name: Upgrade pip
+ run: python -m pip install --upgrade pip setuptools wheel
+
+ - name: Install dependencies
+ run: pip install -I -r requirements.txt -r requirements-test.txt
+
- name: Download all coverage reports
uses: actions/download-artifact@v3
with:
@@ -105,6 +122,11 @@
- name: Move coverage reports to the root folder
run: find reports -type f -exec mv '{}' reports \;
+ - name: Combine coverage
+ run: |
+ coverage combine
+ coverage xml -o reports/coverage.xml -i
+
- name: Check coverage
uses: codecov/codecov-action@v3
with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/.pre-commit-config.yaml
new/setuptools-git-versioning-1.13.5/.pre-commit-config.yaml
--- old/setuptools-git-versioning-1.13.2/.pre-commit-config.yaml
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.pre-commit-config.yaml
2023-08-08 12:43:14.000000000 +0200
@@ -20,16 +20,16 @@
- id: trailing-whitespace
- id: detect-private-key
- repo: https://github.com/Lucas-C/pre-commit-hooks
- rev: v1.4.2
+ rev: v1.5.3
hooks:
- id: remove-tabs
- repo: https://github.com/codespell-project/codespell
- rev: v2.2.2
+ rev: v2.2.5
hooks:
- id: codespell
args: [-w]
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
- rev: v2.7.0
+ rev: v2.10.0
hooks:
- id: pretty-format-yaml
args: [--autofix, --indent, '2']
@@ -45,30 +45,30 @@
- id: python-no-eval
- id: text-unicode-replacement-char
- repo: https://github.com/asottile/pyupgrade
- rev: v3.3.1
+ rev: v3.10.1
hooks:
- id: pyupgrade
args: [--py37-plus]
- repo: https://github.com/psf/black
- rev: 23.1.0
+ rev: 23.7.0
hooks:
- id: black
language_version: python3
- repo: https://github.com/asottile/blacken-docs
- rev: 1.13.0
+ rev: 1.15.0
hooks:
- id: blacken-docs
- repo: https://github.com/pre-commit/mirrors-mypy
- rev: v1.0.1
+ rev: v1.4.1
hooks:
- id: mypy
additional_dependencies: [types-six, types-toml]
- repo: https://github.com/pycqa/flake8
- rev: 6.0.0
+ rev: 6.1.0
hooks:
- id: flake8
- repo: https://github.com/PyCQA/bandit
- rev: 1.7.4
+ rev: 1.7.5
hooks:
- id: bandit
args: [-c, bandit.yaml]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/.readthedocs.yml
new/setuptools-git-versioning-1.13.5/.readthedocs.yml
--- old/setuptools-git-versioning-1.13.2/.readthedocs.yml 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/.readthedocs.yml 2023-08-08
12:43:14.000000000 +0200
@@ -1,7 +1,14 @@
version: 2
+build:
+ os: ubuntu-22.04
+ tools:
+ python: '3.11'
+ jobs:
+ post_checkout:
+ - git fetch --unshallow || true
+
python:
- version: '3'
install:
- requirements: requirements-doc.txt
- requirements: requirements.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/CHANGELOG.rst
new/setuptools-git-versioning-1.13.5/CHANGELOG.rst
--- old/setuptools-git-versioning-1.13.2/CHANGELOG.rst 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/CHANGELOG.rst 2023-08-08
12:43:14.000000000 +0200
@@ -5,11 +5,53 @@
----
.. changelog::
+ :version: 1.13.5
+
+ .. change::
+ :tags: dependency, bugfix
+ :pullreq: 84
+
+ Import ``setuptools`` before importing ``distutils``. Thanks to
:github-user:`tjni`
+
+.. changelog::
+ :version: 1.13.4
+ :released: 31.07.2023
+
+ .. change::
+ :tags: docs, feature
+ :tickets: 83
+
+ Update documentation to mention shallow clone issues.
+
+ .. change::
+ :tags: general, feature
+
+ Test PyPy 3.10 support
+
+ .. change::
+ :tags: ci, feature
+
+ Push release using ``Trusted publishers`` feature of PyPI.org
+
+.. changelog::
+ :version: 1.13.3
+ :released: 14.03.2023
+
+ .. change::
+ :tags: docs, bugfix
+ :tickets: 78
+
+ Move ``zip-safe`` option to ``tool.setuptools`` section of
``pyproject.toml``.
+
+ Thanks to :github-user:`cclecle`
+
+.. changelog::
:version: 1.13.2
+ :released: 26.02.2023
.. change::
:tags: docs, feature
- :tickets: 77, 77
+ :tickets: 77, 75
Recommend users to use file-based schema instead of tag-based due some
cases.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/docs/ci.rst
new/setuptools-git-versioning-1.13.5/docs/ci.rst
--- old/setuptools-git-versioning-1.13.2/docs/ci.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/docs/ci.rst 2023-08-08
12:43:14.000000000 +0200
@@ -0,0 +1,24 @@
+.. _ci:
+
+CI configuration
+----------------
+
+By default, CI workflows use shallow clone of the repo to speed up clone
process.
+But this leads to cloning repo without any tags, and thus generating version
number like ``0.0.1``.
+
+To avoid this, please use following settings:
+
+.. code-block:: yaml
+ :caption: Github Actions
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+.. code-block:: yaml
+ :caption: Gitlab CI
+
+ variables:
+ GIT_DEPTH: 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/docs/command.rst
new/setuptools-git-versioning-1.13.5/docs/command.rst
--- old/setuptools-git-versioning-1.13.2/docs/command.rst 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/docs/command.rst 2023-08-08
12:43:14.000000000 +0200
@@ -1,7 +1,7 @@
.. _command:
Console command
------------------------------------
+---------------
Package contains script `setuptools-git-versioning` which can be used for
calculating version number.\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/docs/differences.rst
new/setuptools-git-versioning-1.13.5/docs/differences.rst
--- old/setuptools-git-versioning-1.13.2/docs/differences.rst 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/docs/differences.rst 2023-08-08
12:43:14.000000000 +0200
@@ -21,15 +21,15 @@
+------------------------------------+-----------------+----------------+--------------------+
| Package | Latest release | License | PEP
440 compatible |
+====================================+=================+================+====================+
-| setuptools-git-versioning | 2022 | MIT |
yes |
+| setuptools-git-versioning | 2023 | MIT |
yes |
+------------------------------------+-----------------+----------------+--------------------+
| setuptools-scm | 2022 | MIT |
yes |
+------------------------------------+-----------------+----------------+--------------------+
| versioneer | 2022 | Public domain |
yes |
+------------------------------------+-----------------+----------------+--------------------+
-| miniver | 2021 | Public domain |
no |
+| versioningit | 2023 | MIT |
yes |
+------------------------------------+-----------------+----------------+--------------------+
-| versioningit | 2022 | MIT |
yes |
+| miniver | 2021 | Public domain |
no |
+------------------------------------+-----------------+----------------+--------------------+
| setuptools-git-ver | 2019 | MIT |
no |
+------------------------------------+-----------------+----------------+--------------------+
@@ -57,10 +57,10 @@
+------------------------------------+-----+-----------+-------------------------------+
| versioneer | yes | no | no
|
+------------------------------------+-----+-----------+-------------------------------+
-| miniver | yes | no | no
|
-+------------------------------------+-----+-----------+-------------------------------+
| versioningit | yes | yes | no
|
+------------------------------------+-----+-----------+-------------------------------+
+| miniver | yes | no | no
|
++------------------------------------+-----+-----------+-------------------------------+
| setuptools-git-ver | yes | no | no
|
+------------------------------------+-----+-----------+-------------------------------+
| another-setuptools-git-version | yes | no | no
|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/docs/index.rst
new/setuptools-git-versioning-1.13.5/docs/index.rst
--- old/setuptools-git-versioning-1.13.2/docs/index.rst 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/docs/index.rst 2023-08-08
12:43:14.000000000 +0200
@@ -16,6 +16,7 @@
install
command
+ ci
runtime_version
schemas/index
options/index
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/docs/runtime_version.rst
new/setuptools-git-versioning-1.13.5/docs/runtime_version.rst
--- old/setuptools-git-versioning-1.13.2/docs/runtime_version.rst
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/docs/runtime_version.rst
2023-08-08 12:43:14.000000000 +0200
@@ -47,6 +47,8 @@
[tool.setuptools.package-data]
# include VERSION file to a package
my_module = ["VERSION"]
+
+ [tool.setuptools]
# this package will read some included files in runtime, avoid
installing it as .zip
zip-safe = false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/setup.py
new/setuptools-git-versioning-1.13.5/setup.py
--- old/setuptools-git-versioning-1.13.2/setup.py 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/setup.py 2023-08-08
12:43:14.000000000 +0200
@@ -1,7 +1,9 @@
from __future__ import annotations
from pathlib import Path
-from setuptools import setup, find_packages
+
+from setuptools import find_packages, setup
+
from setuptools_git_versioning import version_from_git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/setuptools_git_versioning.py
new/setuptools-git-versioning-1.13.5/setuptools_git_versioning.py
--- old/setuptools-git-versioning-1.13.2/setuptools_git_versioning.py
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/setuptools_git_versioning.py
2023-08-08 12:43:14.000000000 +0200
@@ -15,6 +15,11 @@
from pprint import pformat
from typing import TYPE_CHECKING, Any, Callable
+# because we use distutils in this file, we need to ensure that setuptools is
+# imported first so that it can do monkey patching. this is not always already
+# done for us, for example, when running this in a test or as a module
+import setuptools # noqa: F401
+
if TYPE_CHECKING:
# avoid importing 'packaging' because setuptools-git-versioning can be
installed using sdist
# where 'packaging' is not installed yet
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/tests/conftest.py
new/setuptools-git-versioning-1.13.5/tests/conftest.py
--- old/setuptools-git-versioning-1.13.2/tests/conftest.py 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/tests/conftest.py 2023-08-08
12:43:14.000000000 +0200
@@ -1,9 +1,10 @@
import os
-import pytest
import shutil
import textwrap
-from tests.lib.util import rand_str, create_file, execute
+import pytest
+
+from tests.lib.util import create_file, execute, rand_str
root = os.path.dirname(os.path.dirname(__file__))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-git-versioning-1.13.2/tests/lib/util.py
new/setuptools-git-versioning-1.13.5/tests/lib/util.py
--- old/setuptools-git-versioning-1.13.2/tests/lib/util.py 2023-02-26
20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/tests/lib/util.py 2023-08-08
12:43:14.000000000 +0200
@@ -30,6 +30,13 @@
def execute(cwd: str | os.PathLike, cmd: str, **kwargs) -> str:
log.info(f"Executing '{cmd}' at '{cwd}'")
+
+ if "env" in kwargs:
+ kwargs["env"]["PATH"] = os.environ["PATH"]
+ pythonpath = os.getenv("PYTHONPATH", None)
+ if pythonpath:
+ kwargs["env"]["PYTHONPATH"] = pythonpath
+
return subprocess.check_output(cmd, cwd=cwd, shell=True,
universal_newlines=True, **kwargs) # nosec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/tests/test_integration/conftest.py
new/setuptools-git-versioning-1.13.5/tests/test_integration/conftest.py
--- old/setuptools-git-versioning-1.13.2/tests/test_integration/conftest.py
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/tests/test_integration/conftest.py
2023-08-08 12:43:14.000000000 +0200
@@ -1,7 +1,8 @@
from functools import partial
+
import pytest
-from tests.lib.util import create_setup_py, create_pyproject_toml, typed_config
+from tests.lib.util import create_pyproject_toml, create_setup_py, typed_config
@pytest.fixture(params=[create_setup_py, create_pyproject_toml])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_branch_formatter.py
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_branch_formatter.py
---
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_branch_formatter.py
2023-02-26 20:50:23.000000000 +0100
+++
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_branch_formatter.py
2023-08-08 12:43:14.000000000 +0200
@@ -1,10 +1,17 @@
import os
import pickle
-import pytest
import subprocess
import textwrap
-from tests.lib.util import checkout_branch, create_file, get_version,
get_version_script, get_version_module
+import pytest
+
+from tests.lib.util import (
+ checkout_branch,
+ create_file,
+ get_version,
+ get_version_module,
+ get_version_script,
+)
pytestmark = pytest.mark.all
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_config.py
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_config.py
--- old/setuptools-git-versioning-1.13.2/tests/test_integration/test_config.py
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/tests/test_integration/test_config.py
2023-08-08 12:43:14.000000000 +0200
@@ -1,19 +1,20 @@
import itertools
import os
-import pytest
import subprocess
import textwrap
+
+import pytest
import toml
from tests.lib.util import (
- create_folder,
- get_version,
- get_version_setup_py,
- get_version_script,
- get_version_module,
create_file,
+ create_folder,
create_pyproject_toml,
create_setup_py,
+ get_version,
+ get_version_module,
+ get_version_script,
+ get_version_setup_py,
)
pytestmark = [pytest.mark.all, pytest.mark.important]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_substitution.py
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_substitution.py
---
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_substitution.py
2023-02-26 20:50:23.000000000 +0100
+++
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_substitution.py
2023-08-08 12:43:14.000000000 +0200
@@ -1,9 +1,16 @@
-from datetime import datetime
-import pytest
import re
import subprocess
+from datetime import datetime
+
+import pytest
-from tests.lib.util import checkout_branch, get_version_setup_py, create_file,
create_setup_py, create_tag
+from tests.lib.util import (
+ checkout_branch,
+ create_file,
+ create_setup_py,
+ create_tag,
+ get_version_setup_py,
+)
pytestmark = pytest.mark.all
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_tag.py
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_tag.py
--- old/setuptools-git-versioning-1.13.2/tests/test_integration/test_tag.py
2023-02-26 20:50:23.000000000 +0100
+++ new/setuptools-git-versioning-1.13.5/tests/test_integration/test_tag.py
2023-08-08 12:43:14.000000000 +0200
@@ -1,16 +1,17 @@
import subprocess
+import time
from datetime import datetime, timedelta
+
import pytest
-import time
from tests.lib.util import (
+ checkout_branch,
+ create_commit,
create_file,
+ create_tag,
get_full_sha,
- get_version,
get_sha,
- create_tag,
- checkout_branch,
- create_commit,
+ get_version,
)
pytestmark = pytest.mark.all
@@ -180,6 +181,7 @@
assert get_version(repo) == "0.0.1"
+@pytest.mark.flaky(reruns=3) # sha and full_sha can start with 0 which are
removed, just try again
def test_tag_linear_history(repo, create_config):
create_tag(repo, "1.0.0")
checkout_branch(repo, "dev")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_tag_formatter.py
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_tag_formatter.py
---
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_tag_formatter.py
2023-02-26 20:50:23.000000000 +0100
+++
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_tag_formatter.py
2023-08-08 12:43:14.000000000 +0200
@@ -1,9 +1,16 @@
import os
-import pytest
import subprocess
import textwrap
-from tests.lib.util import create_file, get_version, create_tag,
get_version_script, get_version_module
+import pytest
+
+from tests.lib.util import (
+ create_file,
+ create_tag,
+ get_version,
+ get_version_module,
+ get_version_script,
+)
pytestmark = pytest.mark.all
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_version_callback.py
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_version_callback.py
---
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_version_callback.py
2023-02-26 20:50:23.000000000 +0100
+++
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_version_callback.py
2023-08-08 12:43:14.000000000 +0200
@@ -1,14 +1,15 @@
import os
import subprocess
+
import pytest
from tests.lib.util import (
create_file,
- get_version,
- get_version_setup_py,
create_tag,
- get_version_script,
+ get_version,
get_version_module,
+ get_version_script,
+ get_version_setup_py,
)
pytestmark = pytest.mark.all
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_version_file.py
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_version_file.py
---
old/setuptools-git-versioning-1.13.2/tests/test_integration/test_version_file.py
2023-02-26 20:50:23.000000000 +0100
+++
new/setuptools-git-versioning-1.13.5/tests/test_integration/test_version_file.py
2023-08-08 12:43:14.000000000 +0200
@@ -1,11 +1,20 @@
import subprocess
+
import pytest
-from tests.lib.util import create_commit, create_file, get_full_sha,
get_version, get_sha, create_tag
+from tests.lib.util import (
+ create_commit,
+ create_file,
+ create_tag,
+ get_full_sha,
+ get_sha,
+ get_version,
+)
pytestmark = pytest.mark.all
+@pytest.mark.flaky(reruns=3) # sha and full_sha can start with 0 which are
removed, just try again
@pytest.mark.important
@pytest.mark.parametrize(
"template",
@@ -167,6 +176,7 @@
get_version(repo)
+@pytest.mark.flaky(reruns=3) # sha and full_sha can start with 0 which are
removed, just try again
def test_version_file_tag_is_preferred(repo, create_config):
create_tag(repo, "1.2.3")
++++++ setuptools-git-versioning.obsinfo ++++++
--- /var/tmp/diff_new_pack.dnXzKM/_old 2023-12-28 23:03:07.742094941 +0100
+++ /var/tmp/diff_new_pack.dnXzKM/_new 2023-12-28 23:03:07.746095087 +0100
@@ -1,5 +1,5 @@
name: setuptools-git-versioning
-version: 1.13.2
-mtime: 1677441023
-commit: aa578a78397cd8ca51bd389aaee8a274fd1b6274
+version: 1.13.5
+mtime: 1691491394
+commit: 3cd11bcd38f15e2e9b25bee7485e81840f3e16dd
