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-03-03 22:28:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-setuptools-git-versioning (Old) and /work/SRC/openSUSE:Factory/.python-setuptools-git-versioning.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-setuptools-git-versioning" Fri Mar 3 22:28:13 2023 rev:4 rq:1069050 version:1.13.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-setuptools-git-versioning/python-setuptools-git-versioning.changes 2023-02-23 16:53:26.537148341 +0100 +++ /work/SRC/openSUSE:Factory/.python-setuptools-git-versioning.new.31432/python-setuptools-git-versioning.changes 2023-03-03 22:31:13.727985597 +0100 @@ -1,0 +2,7 @@ +Fri Mar 3 04:03:58 UTC 2023 - Steve Kowalik <steven.kowa...@suse.com> + +- Update to 1.13.2: + * Documentation changes only. +- Skip broken test. + +------------------------------------------------------------------- Old: ---- setuptools-git-versioning-1.13.1.obscpio setuptools-git-versioning-1.13.1.tar.xz New: ---- setuptools-git-versioning-1.13.2.obscpio setuptools-git-versioning-1.13.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-setuptools-git-versioning.spec ++++++ --- /var/tmp/diff_new_pack.rb0Abw/_old 2023-03-03 22:31:14.355988274 +0100 +++ /var/tmp/diff_new_pack.rb0Abw/_new 2023-03-03 22:31:14.359988291 +0100 @@ -17,7 +17,7 @@ Name: python-setuptools-git-versioning -Version: 1.13.1 +Version: 1.13.2 Release: 0 Summary: Use git repo data for building a version number according PEP-440 License: MIT @@ -83,6 +83,8 @@ 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)" %post ++++++ setuptools-git-versioning-1.13.1.obscpio -> setuptools-git-versioning-1.13.2.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/FETCH_HEAD new/setuptools-git-versioning-1.13.2/.git/FETCH_HEAD --- old/setuptools-git-versioning-1.13.1/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/FETCH_HEAD 2023-02-26 20:50:23.000000000 +0100 @@ -0,0 +1 @@ +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.1/.git/HEAD new/setuptools-git-versioning-1.13.2/.git/HEAD --- old/setuptools-git-versioning-1.13.1/.git/HEAD 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/HEAD 2023-02-26 20:50:23.000000000 +0100 @@ -1 +1 @@ -eea9b28acd19aad4b5d2932e6338e0d1fc23ef41 +aa578a78397cd8ca51bd389aaee8a274fd1b6274 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/ORIG_HEAD new/setuptools-git-versioning-1.13.2/.git/ORIG_HEAD --- old/setuptools-git-versioning-1.13.1/.git/ORIG_HEAD 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/ORIG_HEAD 2023-02-26 20:50:23.000000000 +0100 @@ -1 +1 @@ -eea9b28acd19aad4b5d2932e6338e0d1fc23ef41 +aa578a78397cd8ca51bd389aaee8a274fd1b6274 Binary files old/setuptools-git-versioning-1.13.1/.git/index and new/setuptools-git-versioning-1.13.2/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/logs/HEAD new/setuptools-git-versioning-1.13.2/.git/logs/HEAD --- old/setuptools-git-versioning-1.13.1/.git/logs/HEAD 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/logs/HEAD 2023-02-26 20:50:23.000000000 +0100 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 df64d4c0a50203a0301d379392dc82da63a3ecb9 Daniel Garcia Moreno <daniel.gar...@suse.com> 1676891386 +0100 clone: from https://github.com/dolfinus/setuptools-git-versioning.git -df64d4c0a50203a0301d379392dc82da63a3ecb9 eea9b28acd19aad4b5d2932e6338e0d1fc23ef41 Daniel Garcia Moreno <daniel.gar...@suse.com> 1676891388 +0100 checkout: moving from master to v1.13.1 +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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/logs/refs/heads/master new/setuptools-git-versioning-1.13.2/.git/logs/refs/heads/master --- old/setuptools-git-versioning-1.13.1/.git/logs/refs/heads/master 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/logs/refs/heads/master 2023-02-26 20:50:23.000000000 +0100 @@ -1 +1 @@ -0000000000000000000000000000000000000000 df64d4c0a50203a0301d379392dc82da63a3ecb9 Daniel Garcia Moreno <daniel.gar...@suse.com> 1676891386 +0100 clone: from https://github.com/dolfinus/setuptools-git-versioning.git +0000000000000000000000000000000000000000 426127db8d293ee09e7bf00571b2894584da9bf7 Steve Kowalik <ste...@wedontsleep.org> 1677806985 +1100 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.1/.git/logs/refs/remotes/origin/HEAD new/setuptools-git-versioning-1.13.2/.git/logs/refs/remotes/origin/HEAD --- old/setuptools-git-versioning-1.13.1/.git/logs/refs/remotes/origin/HEAD 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/logs/refs/remotes/origin/HEAD 2023-02-26 20:50:23.000000000 +0100 @@ -1 +1 @@ -0000000000000000000000000000000000000000 df64d4c0a50203a0301d379392dc82da63a3ecb9 Daniel Garcia Moreno <daniel.gar...@suse.com> 1676891386 +0100 clone: from https://github.com/dolfinus/setuptools-git-versioning.git +0000000000000000000000000000000000000000 426127db8d293ee09e7bf00571b2894584da9bf7 Steve Kowalik <ste...@wedontsleep.org> 1677806985 +1100 clone: from https://github.com/dolfinus/setuptools-git-versioning.git Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-0ad73e2616dd5c419f7f5a70ba7b295ad2c6c5bb.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-0ad73e2616dd5c419f7f5a70ba7b295ad2c6c5bb.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-0ad73e2616dd5c419f7f5a70ba7b295ad2c6c5bb.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-0ad73e2616dd5c419f7f5a70ba7b295ad2c6c5bb.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.promisor new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.promisor --- old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.promisor 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.promisor 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -df64d4c0a50203a0301d379392dc82da63a3ecb9 HEAD -df64d4c0a50203a0301d379392dc82da63a3ecb9 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 -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.1/.git/objects/pack/pack-59b0a08c1029b226dd1d86ea08ffa9d677c1a0a8.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-59b0a08c1029b226dd1d86ea08ffa9d677c1a0a8.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-59b0a08c1029b226dd1d86ea08ffa9d677c1a0a8.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-59b0a08c1029b226dd1d86ea08ffa9d677c1a0a8.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-c0d853978987f7f1d3bab9ff3b6d769364f5bcdc.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-c0d853978987f7f1d3bab9ff3b6d769364f5bcdc.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-c0d853978987f7f1d3bab9ff3b6d769364f5bcdc.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-c0d853978987f7f1d3bab9ff3b6d769364f5bcdc.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-cdbf5b44dde4b4c4ad922ae98fba065ba8da743e.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-cdbf5b44dde4b4c4ad922ae98fba065ba8da743e.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-cdbf5b44dde4b4c4ad922ae98fba065ba8da743e.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-cdbf5b44dde4b4c4ad922ae98fba065ba8da743e.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor --- old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor 2023-02-26 20:50:23.000000000 +0100 @@ -0,0 +1,63 @@ +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.1/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/packed-refs new/setuptools-git-versioning-1.13.2/.git/packed-refs --- old/setuptools-git-versioning-1.13.1/.git/packed-refs 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/packed-refs 2023-02-26 20:50:23.000000000 +0100 @@ -1,5 +1,5 @@ # pack-refs with: peeled fully-peeled sorted -df64d4c0a50203a0301d379392dc82da63a3ecb9 refs/remotes/origin/master +426127db8d293ee09e7bf00571b2894584da9bf7 refs/remotes/origin/master e9d91fd77bdc2d7e4b1829c9dce3a7e2fadf2eda refs/tags/v0.0.1 ddc55a0a1bc5723b98722322d2ce9ff3719e77fc refs/tags/v0.0.2 7b4b2d696eba871b4ace0adb23a0b31112b38c2f refs/tags/v0.0.3 @@ -28,6 +28,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/refs/heads/master new/setuptools-git-versioning-1.13.2/.git/refs/heads/master --- old/setuptools-git-versioning-1.13.1/.git/refs/heads/master 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/refs/heads/master 2023-02-26 20:50:23.000000000 +0100 @@ -1 +1 @@ -df64d4c0a50203a0301d379392dc82da63a3ecb9 +426127db8d293ee09e7bf00571b2894584da9bf7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.github/workflows/automerge.yml new/setuptools-git-versioning-1.13.2/.github/workflows/automerge.yml --- old/setuptools-git-versioning-1.13.1/.github/workflows/automerge.yml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.github/workflows/automerge.yml 2023-02-26 20:50:23.000000000 +0100 @@ -22,6 +22,6 @@ if: github.event.pull_request.user.login == 'pre-commit-ci[bot]' || github.event.pull_request.user.login == 'dependabot[bot]' steps: - - uses: hmarr/auto-approve-action@v2 + - uses: hmarr/auto-approve-action@v3 with: github-token: ${{ secrets.PERSONAL_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.github/workflows/codeql-analysis.yml new/setuptools-git-versioning-1.13.2/.github/workflows/codeql-analysis.yml --- old/setuptools-git-versioning-1.13.1/.github/workflows/codeql-analysis.yml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.github/workflows/codeql-analysis.yml 2023-02-26 20:50:23.000000000 +0100 @@ -30,7 +30,7 @@ - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.11' - name: Cache pip uses: actions/cache@v3 @@ -39,11 +39,7 @@ key: ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }} restore-keys: | ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-${{ matrix.python-version }}-release-${{ hashFiles('requirements*.txt') }} ${{ runner.os }}-python-${{ matrix.python-version }}-codeql- - ${{ runner.os }}-python-${{ matrix.python-version }}-tests- - ${{ runner.os }}-python-${{ matrix.python-version }}-release- ${{ runner.os }}-python ${{ runner.os }}- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.github/workflows/dev-release.yml new/setuptools-git-versioning-1.13.2/.github/workflows/dev-release.yml --- old/setuptools-git-versioning-1.13.1/.github/workflows/dev-release.yml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.github/workflows/dev-release.yml 2023-02-26 20:50:23.000000000 +0100 @@ -53,23 +53,19 @@ with: fetch-depth: 0 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.11' - name: Cache pip uses: actions/cache@v3 with: path: ~/.cache/pip - key: ${{ runner.os }}-python-3.10-release-${{ hashFiles('requirements*.txt') }} + key: ${{ runner.os }}-python-3.11-release-${{ hashFiles('requirements*.txt') }} restore-keys: | - ${{ runner.os }}-python-3.10-release-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-tests-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-codeql-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-release- - ${{ runner.os }}-python-3.10-tests- - ${{ runner.os }}-python-3.10-codeql- + ${{ runner.os }}-python-3.11-release-${{ hashFiles('requirements*.txt') }} + ${{ runner.os }}-python-3.11-release- ${{ runner.os }}-python ${{ runner.os }}- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.github/workflows/release.yml new/setuptools-git-versioning-1.13.2/.github/workflows/release.yml --- old/setuptools-git-versioning-1.13.1/.github/workflows/release.yml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.github/workflows/release.yml 2023-02-26 20:50:23.000000000 +0100 @@ -51,23 +51,19 @@ with: fetch-depth: 0 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.11' - name: Cache pip uses: actions/cache@v3 with: path: ~/.cache/pip - key: ${{ runner.os }}-python-3.10-release-${{ hashFiles('requirements*.txt') }} + key: ${{ runner.os }}-python-3.11-release-${{ hashFiles('requirements*.txt') }} restore-keys: | - ${{ runner.os }}-python-3.10-release-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-tests-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-codeql-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-release- - ${{ runner.os }}-python-3.10-tests- - ${{ runner.os }}-python-3.10-codeql- + ${{ runner.os }}-python-3.11-release-${{ hashFiles('requirements*.txt') }} + ${{ runner.os }}-python-3.11-release- ${{ runner.os }}-python ${{ runner.os }}- @@ -94,6 +90,7 @@ run: | mkdir reports/ pip install -e . + version=$(echo $GITHUB_REF_SLUG | sed -E "s/v(.*)/\1/") # lines 1 and 3 are empty, line 2 contains version number, line 4 contains release date changelog generate-md -c ./docs/conf.py CHANGELOG.rst -v $version | sed "1,4d" > reports/release.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.github/workflows/test.yml new/setuptools-git-versioning-1.13.2/.github/workflows/test.yml --- old/setuptools-git-versioning-1.13.1/.github/workflows/test.yml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.github/workflows/test.yml 2023-02-26 20:50:23.000000000 +0100 @@ -20,21 +20,21 @@ strategy: fail-fast: false matrix: - python-version: ['3.7', '3.11', pypy-3.7, pypy-3.9] + python-version: ['3.7', pypy-3.7, pypy-3.9] os: [ubuntu-latest] # run only limited set of tests because it takes too long mark: [important] include: - os: macos-latest mark: important - python-version: '3.10' + python-version: '3.11' - os: windows-latest mark: important - python-version: '3.10' + python-version: '3.11' # run all the tests only on latest python version - os: ubuntu-latest mark: all - python-version: '3.10' + python-version: '3.11' steps: - name: Checkout code @@ -54,11 +54,7 @@ key: ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }} restore-keys: | ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-${{ matrix.python-version }}-release-${{ hashFiles('requirements*.txt') }} ${{ runner.os }}-python-${{ matrix.python-version }}-tests- - ${{ runner.os }}-python-${{ matrix.python-version }}-codeql- - ${{ runner.os }}-python-${{ matrix.python-version }}-release- ${{ runner.os }}-python ${{ runner.os }}- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.pre-commit-config.yaml new/setuptools-git-versioning-1.13.2/.pre-commit-config.yaml --- old/setuptools-git-versioning-1.13.1/.pre-commit-config.yaml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.pre-commit-config.yaml 2023-02-26 20:50:23.000000000 +0100 @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-ast - id: check-case-conflict @@ -20,7 +20,7 @@ - id: trailing-whitespace - id: detect-private-key - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.3.1 + rev: v1.4.2 hooks: - id: remove-tabs - repo: https://github.com/codespell-project/codespell @@ -29,42 +29,42 @@ - id: codespell args: [-w] - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks - rev: v2.4.0 + rev: v2.7.0 hooks: - id: pretty-format-yaml args: [--autofix, --indent, '2'] - repo: https://github.com/pycqa/isort - rev: 5.10.1 + rev: 5.12.0 hooks: - id: isort files: setuptools_git_versioning.py - repo: https://github.com/pre-commit/pygrep-hooks - rev: v1.9.0 + rev: v1.10.0 hooks: - id: python-no-log-warn - id: python-no-eval - id: text-unicode-replacement-char - repo: https://github.com/asottile/pyupgrade - rev: v3.2.2 + rev: v3.3.1 hooks: - id: pyupgrade args: [--py37-plus] - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 23.1.0 hooks: - id: black language_version: python3 - repo: https://github.com/asottile/blacken-docs - rev: v1.12.1 + rev: 1.13.0 hooks: - id: blacken-docs - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.990 + rev: v1.0.1 hooks: - id: mypy additional_dependencies: [types-six, types-toml] - repo: https://github.com/pycqa/flake8 - rev: 5.0.4 + rev: 6.0.0 hooks: - id: flake8 - repo: https://github.com/PyCQA/bandit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/CHANGELOG.rst new/setuptools-git-versioning-1.13.2/CHANGELOG.rst --- old/setuptools-git-versioning-1.13.1/CHANGELOG.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/CHANGELOG.rst 2023-02-26 20:50:23.000000000 +0100 @@ -5,6 +5,27 @@ ---- .. changelog:: + :version: 1.13.2 + + .. change:: + :tags: docs, feature + :tickets: 77, 77 + + Recommend users to use file-based schema instead of tag-based due some cases. + + .. change:: + :tags: docs, feature + :tickets: 17 + + Add small example of ``.gitignore`` file to common issues section. Thanks to :github-user:`aram-eskandari` + + .. change:: + :tags: docs, feature + :tickets: 55 + + Improve examples of fetching package version in runtime. + +.. changelog:: :version: 1.13.1 :released: 13.11.2022 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/README.rst new/setuptools-git-versioning-1.13.2/README.rst --- old/setuptools-git-versioning-1.13.1/README.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/README.rst 2023-02-26 20:50:23.000000000 +0100 @@ -75,7 +75,8 @@ ~~~~~~~~~~~~~~~~~~ Just add ``setuptools-git-versioning`` to ``build-sytem`` section of your ``pyproject.toml``, -and a section ``tool.setuptools-git-versioning`` with config options: +add a section ``tool.setuptools-git-versioning`` with config options, and mark the project +``version`` as dynamic. .. code:: toml @@ -86,6 +87,9 @@ [tool.setuptools-git-versioning] enabled = true + [project] + dynamic = ["version"] + And check the package version generated (see `command help <https://setuptools-git-versioning.readthedocs.io/en/stable/command.html>`__): .. code:: bash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/command.rst new/setuptools-git-versioning-1.13.2/docs/command.rst --- old/setuptools-git-versioning-1.13.1/docs/command.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/command.rst 2023-02-26 20:50:23.000000000 +0100 @@ -73,7 +73,7 @@ DE8UG: Executing 'git rev-list -n 1 "1.0.0"' at '/path/to/mypackage' INF0: Tag SHA-256: '8dc9881eacd373cb34c5d3f99a6ad9e2349a79c4' INF0: Parsing tag_formatter 'util:tag_formatter' of type 'str' - DE8UG: Executing 'from mypkg.util import tag_formatter' + DE8UG: Executing 'from my_module.util import tag_formatter' DE8UG: Tag after formatting: '1.0.0' DE8UG: Executing 'git status --short' at '/path/to/mypackage' INF0: Is dirty: False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/common_issues/all_dirty.rst new/setuptools-git-versioning-1.13.2/docs/common_issues/all_dirty.rst --- old/setuptools-git-versioning-1.13.1/docs/common_issues/all_dirty.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/common_issues/all_dirty.rst 2023-02-26 20:50:23.000000000 +0100 @@ -13,3 +13,10 @@ You should such files to the ``.gitignore`` file. See `current repo .gitignore <https://github.com/dolfinus/setuptools-git-versioning/blob/master/.gitignore>`__ as an example. + +In most the cases adding these lines solves the issue: + +.. code:: gitignore + + eggs/ + *.egg* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/conf.py new/setuptools-git-versioning-1.13.2/docs/conf.py --- old/setuptools-git-versioning-1.13.1/docs/conf.py 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/conf.py 2023-02-26 20:50:23.000000000 +0100 @@ -17,7 +17,6 @@ from packaging.version import Version try: - from setuptools_git_versioning import version_from_git ver = Version(version_from_git()) @@ -80,7 +79,11 @@ # html_static_path = ['_static'] -extlinks = {"github-user": ("https://github.com/%s", "@%s")} +extlinks = { + "github-user": ("https://github.com/%s", "@%s"), + "issue": ("https://github.com/dolfinus/setuptools-git-versioning/issues/%s", "#%s"), + "pr": ("https://github.com/dolfinus/setuptools-git-versioning/pull/%s", "#%s"), +} changelog_sections = [ "general", @@ -96,7 +99,7 @@ changelog_caption_class = "" changelog_inner_tag_sort = ["breaking", "deprecated", "feature", "bug", "refactor"] -changelog_hive_secgions_from_tags = True +changelog_hide_sections_from_tags = True changelog_render_ticket = "https://github.com/dolfinus/setuptools-git-versioning/issues/%s" changelog_render_pullreq = {"default": "https://github.com/dolfinus/setuptools-git-versioning/pull/%s"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/options/branch_formatter.rst new/setuptools-git-versioning-1.13.2/docs/options/branch_formatter.rst --- old/setuptools-git-versioning-1.13.1/docs/options/branch_formatter.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/options/branch_formatter.rst 2023-02-26 20:50:23.000000000 +0100 @@ -40,7 +40,7 @@ To fix that you can define a callback which will receive current branch name and return a properly formatted one: -- ``mypkg/util.py`` file: +- ``my_module/util.py`` file: .. code:: python @@ -67,7 +67,7 @@ .. code:: python - from mypkg.util import format_branch_name + from my_module.util import format_branch_name setuptools.setup( ..., @@ -92,7 +92,7 @@ enabled = true dev_template = "{branch}.dev{ccount}" dirty_template = "{branch}.dev{ccount}" - branch_formatter = "mypkg.util:format_branch_name" + branch_formatter = "my_module.util:format_branch_name" .. note:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/options/starting_version.rst new/setuptools-git-versioning-1.13.2/docs/options/starting_version.rst --- old/setuptools-git-versioning-1.13.1/docs/options/starting_version.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/options/starting_version.rst 2023-02-26 20:50:23.000000000 +0100 @@ -25,7 +25,7 @@ ) - ``pyproject.toml`` file: -- + .. code:: toml [tool.setuptools-git-versioning] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/options/tag_formatter.rst new/setuptools-git-versioning-1.13.2/docs/options/tag_formatter.rst --- old/setuptools-git-versioning-1.13.1/docs/options/tag_formatter.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/options/tag_formatter.rst 2023-02-26 20:50:23.000000000 +0100 @@ -42,7 +42,7 @@ To fix that you can define a callback which will receive current tag name and return a properly formatted one: -- ``mypkg/util.py`` file: +- ``my_module/util.py`` file: .. code:: python @@ -68,7 +68,7 @@ .. code:: python - from mypkg.util import format_tag_name + from my_module.util import format_tag_name setuptools.setup( ..., @@ -93,7 +93,7 @@ enabled = true dev_template = "{tag}.dev{ccount}" dirty_template = "{tag}.dev{ccount}" - tag_formatter = "mypkg.util:format_tag_name" + tag_formatter = "my_module.util:format_tag_name" .. note:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/runtime_version.rst new/setuptools-git-versioning-1.13.2/docs/runtime_version.rst --- old/setuptools-git-versioning-1.13.1/docs/runtime_version.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/runtime_version.rst 2023-02-26 20:50:23.000000000 +0100 @@ -3,20 +3,83 @@ Retrieving package version at runtime ------------------------------------- -Using ``version_file`` or ``version_callback`` options -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Using ``version_file`` option (recommended) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The preferred way to set version number inside a package is -to simply store it in some file or variable/function, and -then use it in ``setup.py`` / ``pyproject.toml`` as version source. +In case of using :ref:`version_file <version-file>` option you can directly read the ``VERSION`` file content, +and use at as version number. -It this case you can get current version without any access to ``.git`` folder -(which is required by ``setuptools-git-versioning``). +To resolve version number in runtime, you should move ``VERSION`` file to your module subfolder: -See: +- ``setup.py``: + + Create ``MANIFEST.in`` file in the project root: + + .. code:: + + include my_module/VERSION + + Then make few changes in ``setup.py``: + + .. code:: python + + ... + + # change VERSION file path + version_file = root_path / "my_module" / "VERSION" + + setuptools.setup( + ..., + setuptools_git_versioning={ + "enabled": True, + "version_file": version_file, + }, + # read MANIFEST.in and include files mentioned here to the package + include_package_data=True, + # this package will read some included files in runtime, avoid installing it as .zip + zip_safe=False, + ) + +- ``pyproject.toml``: + + .. code:: toml + + [tool.setuptools.package-data] + # include VERSION file to a package + my_module = ["VERSION"] + # this package will read some included files in runtime, avoid installing it as .zip + zip-safe = false + + [tool.setuptools-git-versioning] + enabled = true + # change the file path + version_file = "my_module/VERSION" + +And then read this file: + +.. code:: python + + # content of my_module/__init__.py + + from pathlib import Path + + # you can use os.path and open() as well + __version__ = Path(__file__).parent.joinpath("VERSION").read_text() + + +Using ``version_callback`` option +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +In case of using :ref:`version_callback <version-callback>` option you can directly call this callback inside a module: + +.. code:: python + + # content of my_module/__init__.py + + from my_module.version import get_version + + __version__ = get_version() -* :ref:`version-file` -* :ref:`version-callback` Using ``importlib`` ~~~~~~~~~~~~~~~~~~~ @@ -66,19 +129,19 @@ .. warning:: - This way is STRONGLY DISCOURAGED. Functions in the module - are not a part of public API, and could be changed in the future without - maintaining backward compatibility. + This way is STRONGLY DISCOURAGED. Functions in the module + are not a part of public API, and could be changed in the future without + maintaining backward compatibility. .. warning:: - Use this ONLY in CI/CD tools. + Use this ONLY in CI/CD tools. - NEVER use ``setuptools_git_versioning`` inside your package, because ``.git`` - folder is not being included into it, and target OS can lack of ``git`` executable. + NEVER use ``setuptools_git_versioning`` inside your package, because ``.git`` + folder is not being included into it, and target OS can lack of ``git`` executable. - ``.git`` folder and ``git`` executable presence is crucial - for ``setuptools-git-versioning`` to work properly. + ``.git`` folder and ``git`` executable presence is crucial + for ``setuptools-git-versioning`` to work properly. .. code:: python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/callback/index.rst new/setuptools-git-versioning-1.13.2/docs/schemas/callback/index.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/callback/index.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/callback/index.rst 2023-02-26 20:50:23.000000000 +0100 @@ -1,7 +1,7 @@ .. _callback-based-release: -Callback-based release -~~~~~~~~~~~~~~~~~~~~~~~ +Callback-based release (advanced) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. toctree:: :maxdepth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/callback/version_callback.rst new/setuptools-git-versioning-1.13.2/docs/schemas/callback/version_callback.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/callback/version_callback.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/callback/version_callback.rst 2023-02-26 20:50:23.000000000 +0100 @@ -25,7 +25,7 @@ If you want to get synchronized version numbers in both ``master`` and ``dev`` branches, you can create a function in some file (for example, in the -``mypkg/version.py`` file): +``my_module/version.py`` file): .. code:: python @@ -36,7 +36,7 @@ .. code:: python - from mypkg.version import get_version + from my_module.version import get_version setuptools.setup( ..., @@ -55,7 +55,7 @@ [tool.setuptools-git-versioning] enabled = true - version_callback = "mypkg.version:get_version" + version_callback = "my_module.version:get_version" When you'll try to get current version in **any** branch, the result of executing this function will be returned instead of latest tag @@ -63,7 +63,7 @@ If a value of this option is not a function but just str, it also could be used: -- ``mypkg/__init__.py`` file: +- ``my_module/__init__.py`` file: .. code:: python @@ -73,13 +73,13 @@ .. code:: python - import mypkg + import my_module setuptools.setup( ..., setuptools_git_versioning={ "enabled": True, - "version_callback": mypkg.__version__, + "version_callback": my_module.__version__, }, ) @@ -92,7 +92,7 @@ [tool.setuptools-git-versioning] enabled = true - version_callback = "mypkg:__version__" + version_callback = "my_module:__version__" **Please take into account that any tag in the branch is completely ignored if version_callback is set**. @@ -105,3 +105,4 @@ See also """""""" - :ref:`version-callback-option` option +- :ref:`runtime-version` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/file/index.rst new/setuptools-git-versioning-1.13.2/docs/schemas/file/index.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/file/index.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/file/index.rst 2023-02-26 20:50:23.000000000 +0100 @@ -1,7 +1,23 @@ .. _file-based-release: -File-based release -~~~~~~~~~~~~~~~~~~~~~~~ +File-based release (recommended) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +By default, ``setuptools-git-versioning`` can be used only within: + +* git repo, which means a ``.git`` subfolder should exist in the repo root folder +* branch with at least one tag + +Otherwise it will be impossible to get project version based on the git repo commits, +and ``setuptools-git-versioning`` will return version number ``0.0.1`` (or other value set up by :ref:`starting-version-option`). + +But one or all of these requirements cannot be satisfied in the following cases: + +* Downloading source tarball without ``.git`` folder (:issue:`77`). +* Shallow repo clone without tags (:issue:`75`). +* Getting version number from a branch which does not contain any tags (`Git-flow <https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow>`__ and its derivatives) + +To avoid getting meaningless version number prefer using versioning schema described below. .. toctree:: :maxdepth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/file/version_file.rst new/setuptools-git-versioning-1.13.2/docs/schemas/file/version_file.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/file/version_file.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/file/version_file.rst 2023-02-26 20:50:23.000000000 +0100 @@ -1,7 +1,7 @@ .. _version-file: Read some file content as current version -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ For example, current repo state is: @@ -39,16 +39,17 @@ .. code:: python - import os + # you can use os.path instead of pathlib + from pathlib import Path - HERE = os.path.dirname(__file__) - VERSION_FILE = os.path.join(HERE, "VERSION") + root_path = Path(__file__).parent + version_file = root_path / "VERSION" setuptools.setup( ..., setuptools_git_versioning={ "enabled": True, - "version_file": VERSION_FILE, + "version_file": version_file, }, ) @@ -63,10 +64,11 @@ When you'll try to get current version in non-master branch, the content of this file (``1.0.0``) will be returned instead default version number. -**Please take into account that version_file is ignored if tag -is present** +**Please take into account that version_file is ignored if any tag +is present in the current branch.** See also """"""""" - :ref:`version-callback` - :ref:`version-file-option` option +- :ref:`runtime-version` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/tag/index.rst new/setuptools-git-versioning-1.13.2/docs/schemas/tag/index.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/tag/index.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/tag/index.rst 2023-02-26 20:50:23.000000000 +0100 @@ -1,7 +1,11 @@ .. _tag-based-release: -Tag-based release -~~~~~~~~~~~~~~~~~ +Tag-based release (not recommended) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. note:: + + This schema has several drawbacks. Use :ref:`file-based schema <file-based-release>` instead. .. toctree:: :maxdepth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/tag/tag_release.rst new/setuptools-git-versioning-1.13.2/docs/schemas/tag/tag_release.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/tag/tag_release.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/tag/tag_release.rst 2023-02-26 20:50:23.000000000 +0100 @@ -1,7 +1,7 @@ .. _tag-release: Release is a git tag -^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^ For example, current repo state is: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/setup.py new/setuptools-git-versioning-1.13.2/setup.py --- old/setuptools-git-versioning-1.13.1/setup.py 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/setup.py 2023-02-26 20:50:23.000000000 +0100 @@ -1,26 +1,24 @@ -import os +from __future__ import annotations + +from pathlib import Path from setuptools import setup, find_packages from setuptools_git_versioning import version_from_git -HERE = os.path.dirname(os.path.abspath(__file__)) - - -def parse_requirements(file_content): - lines = file_content.splitlines() - return [line.strip() for line in lines if line and not line.startswith("#")] +def parse_requirements(file: Path) -> list[str]: + lines = file.read_text().splitlines() + return [line.rstrip() for line in lines if line and not line.startswith("#")] -with open(os.path.join(HERE, "README.rst")) as f: - long_description = f.read() -with open(os.path.join(HERE, "requirements.txt")) as f: - requirements = parse_requirements(f.read()) +here = Path(__file__).parent.resolve() +requirements = parse_requirements(here / "requirements.txt") +long_description = here.joinpath("README.rst").read_text() setup( name="setuptools-git-versioning", # +local version is not allowed in PyPI # https://github.com/pypa/pypi-legacy/issues/731#issuecomment-345461596 - version=version_from_git(root=HERE, dev_template="{tag}.post{ccount}"), + version=version_from_git(root=here, dev_template="{tag}.post{ccount}"), author="dolfinus", author_email="martinov.m....@gmail.com", description="Use git repo data for building a version number according PEP-440", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/setuptools_git_versioning.py new/setuptools-git-versioning-1.13.2/setuptools_git_versioning.py --- old/setuptools-git-versioning-1.13.1/setuptools_git_versioning.py 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/setuptools_git_versioning.py 2023-02-26 20:50:23.000000000 +0100 @@ -466,7 +466,6 @@ log.log(DEBUG, "Value is callable with signature %s", inspect.Signature.from_callable(version_callback)) result = version_callback() else: - log.log(INFO, "Is not callable, trying to import ...") result = version_callback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/tests/lib/util.py new/setuptools-git-versioning-1.13.2/tests/lib/util.py --- old/setuptools-git-versioning-1.13.1/tests/lib/util.py 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/tests/lib/util.py 2023-02-26 20:50:23.000000000 +0100 @@ -219,7 +219,6 @@ option: str = "setuptools_git_versioning", **kwargs, ) -> str | None: - if config is None: config = {"enabled": True} ++++++ setuptools-git-versioning-1.13.1.tar.xz -> setuptools-git-versioning-1.13.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/FETCH_HEAD new/setuptools-git-versioning-1.13.2/.git/FETCH_HEAD --- old/setuptools-git-versioning-1.13.1/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/FETCH_HEAD 2023-02-26 20:50:23.000000000 +0100 @@ -0,0 +1 @@ +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.1/.git/HEAD new/setuptools-git-versioning-1.13.2/.git/HEAD --- old/setuptools-git-versioning-1.13.1/.git/HEAD 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/HEAD 2023-02-26 20:50:23.000000000 +0100 @@ -1 +1 @@ -eea9b28acd19aad4b5d2932e6338e0d1fc23ef41 +aa578a78397cd8ca51bd389aaee8a274fd1b6274 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/ORIG_HEAD new/setuptools-git-versioning-1.13.2/.git/ORIG_HEAD --- old/setuptools-git-versioning-1.13.1/.git/ORIG_HEAD 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/ORIG_HEAD 2023-02-26 20:50:23.000000000 +0100 @@ -1 +1 @@ -eea9b28acd19aad4b5d2932e6338e0d1fc23ef41 +aa578a78397cd8ca51bd389aaee8a274fd1b6274 Binary files old/setuptools-git-versioning-1.13.1/.git/index and new/setuptools-git-versioning-1.13.2/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/logs/HEAD new/setuptools-git-versioning-1.13.2/.git/logs/HEAD --- old/setuptools-git-versioning-1.13.1/.git/logs/HEAD 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/logs/HEAD 2023-02-26 20:50:23.000000000 +0100 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 df64d4c0a50203a0301d379392dc82da63a3ecb9 Daniel Garcia Moreno <daniel.gar...@suse.com> 1676891386 +0100 clone: from https://github.com/dolfinus/setuptools-git-versioning.git -df64d4c0a50203a0301d379392dc82da63a3ecb9 eea9b28acd19aad4b5d2932e6338e0d1fc23ef41 Daniel Garcia Moreno <daniel.gar...@suse.com> 1676891388 +0100 checkout: moving from master to v1.13.1 +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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/logs/refs/heads/master new/setuptools-git-versioning-1.13.2/.git/logs/refs/heads/master --- old/setuptools-git-versioning-1.13.1/.git/logs/refs/heads/master 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/logs/refs/heads/master 2023-02-26 20:50:23.000000000 +0100 @@ -1 +1 @@ -0000000000000000000000000000000000000000 df64d4c0a50203a0301d379392dc82da63a3ecb9 Daniel Garcia Moreno <daniel.gar...@suse.com> 1676891386 +0100 clone: from https://github.com/dolfinus/setuptools-git-versioning.git +0000000000000000000000000000000000000000 426127db8d293ee09e7bf00571b2894584da9bf7 Steve Kowalik <ste...@wedontsleep.org> 1677806985 +1100 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.1/.git/logs/refs/remotes/origin/HEAD new/setuptools-git-versioning-1.13.2/.git/logs/refs/remotes/origin/HEAD --- old/setuptools-git-versioning-1.13.1/.git/logs/refs/remotes/origin/HEAD 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/logs/refs/remotes/origin/HEAD 2023-02-26 20:50:23.000000000 +0100 @@ -1 +1 @@ -0000000000000000000000000000000000000000 df64d4c0a50203a0301d379392dc82da63a3ecb9 Daniel Garcia Moreno <daniel.gar...@suse.com> 1676891386 +0100 clone: from https://github.com/dolfinus/setuptools-git-versioning.git +0000000000000000000000000000000000000000 426127db8d293ee09e7bf00571b2894584da9bf7 Steve Kowalik <ste...@wedontsleep.org> 1677806985 +1100 clone: from https://github.com/dolfinus/setuptools-git-versioning.git Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-0ad73e2616dd5c419f7f5a70ba7b295ad2c6c5bb.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-0ad73e2616dd5c419f7f5a70ba7b295ad2c6c5bb.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-0ad73e2616dd5c419f7f5a70ba7b295ad2c6c5bb.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-0ad73e2616dd5c419f7f5a70ba7b295ad2c6c5bb.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.promisor new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.promisor --- old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.promisor 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-42f741bb167ef6fe521aea19e0c019340a8d2bdd.promisor 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -df64d4c0a50203a0301d379392dc82da63a3ecb9 HEAD -df64d4c0a50203a0301d379392dc82da63a3ecb9 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 -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.1/.git/objects/pack/pack-59b0a08c1029b226dd1d86ea08ffa9d677c1a0a8.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-59b0a08c1029b226dd1d86ea08ffa9d677c1a0a8.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-59b0a08c1029b226dd1d86ea08ffa9d677c1a0a8.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-59b0a08c1029b226dd1d86ea08ffa9d677c1a0a8.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-868e41a90e790bc3ab8d539025820592e6c1c9be.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-8ff2f3b023f45447476cbed4db802e0c17a2c293.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-c0d853978987f7f1d3bab9ff3b6d769364f5bcdc.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-c0d853978987f7f1d3bab9ff3b6d769364f5bcdc.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-c0d853978987f7f1d3bab9ff3b6d769364f5bcdc.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-c0d853978987f7f1d3bab9ff3b6d769364f5bcdc.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-cdbf5b44dde4b4c4ad922ae98fba065ba8da743e.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-cdbf5b44dde4b4c4ad922ae98fba065ba8da743e.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-cdbf5b44dde4b4c4ad922ae98fba065ba8da743e.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-cdbf5b44dde4b4c4ad922ae98fba065ba8da743e.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor --- old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-dda3791271d03f455b9e93ca1ec4970f9c5a4ada.promisor 2023-02-26 20:50:23.000000000 +0100 @@ -0,0 +1,63 @@ +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.1/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e35ede83ca6a048bc3036766dfbe5796d206922a.pack differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.idx and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.idx differ Binary files old/setuptools-git-versioning-1.13.1/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.pack and new/setuptools-git-versioning-1.13.2/.git/objects/pack/pack-e5b80f63ec9f124d9c764fdbdc4957401874ae5a.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/packed-refs new/setuptools-git-versioning-1.13.2/.git/packed-refs --- old/setuptools-git-versioning-1.13.1/.git/packed-refs 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/packed-refs 2023-02-26 20:50:23.000000000 +0100 @@ -1,5 +1,5 @@ # pack-refs with: peeled fully-peeled sorted -df64d4c0a50203a0301d379392dc82da63a3ecb9 refs/remotes/origin/master +426127db8d293ee09e7bf00571b2894584da9bf7 refs/remotes/origin/master e9d91fd77bdc2d7e4b1829c9dce3a7e2fadf2eda refs/tags/v0.0.1 ddc55a0a1bc5723b98722322d2ce9ff3719e77fc refs/tags/v0.0.2 7b4b2d696eba871b4ace0adb23a0b31112b38c2f refs/tags/v0.0.3 @@ -28,6 +28,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.git/refs/heads/master new/setuptools-git-versioning-1.13.2/.git/refs/heads/master --- old/setuptools-git-versioning-1.13.1/.git/refs/heads/master 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.git/refs/heads/master 2023-02-26 20:50:23.000000000 +0100 @@ -1 +1 @@ -df64d4c0a50203a0301d379392dc82da63a3ecb9 +426127db8d293ee09e7bf00571b2894584da9bf7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.github/workflows/automerge.yml new/setuptools-git-versioning-1.13.2/.github/workflows/automerge.yml --- old/setuptools-git-versioning-1.13.1/.github/workflows/automerge.yml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.github/workflows/automerge.yml 2023-02-26 20:50:23.000000000 +0100 @@ -22,6 +22,6 @@ if: github.event.pull_request.user.login == 'pre-commit-ci[bot]' || github.event.pull_request.user.login == 'dependabot[bot]' steps: - - uses: hmarr/auto-approve-action@v2 + - uses: hmarr/auto-approve-action@v3 with: github-token: ${{ secrets.PERSONAL_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.github/workflows/codeql-analysis.yml new/setuptools-git-versioning-1.13.2/.github/workflows/codeql-analysis.yml --- old/setuptools-git-versioning-1.13.1/.github/workflows/codeql-analysis.yml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.github/workflows/codeql-analysis.yml 2023-02-26 20:50:23.000000000 +0100 @@ -30,7 +30,7 @@ - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.11' - name: Cache pip uses: actions/cache@v3 @@ -39,11 +39,7 @@ key: ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }} restore-keys: | ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-${{ matrix.python-version }}-release-${{ hashFiles('requirements*.txt') }} ${{ runner.os }}-python-${{ matrix.python-version }}-codeql- - ${{ runner.os }}-python-${{ matrix.python-version }}-tests- - ${{ runner.os }}-python-${{ matrix.python-version }}-release- ${{ runner.os }}-python ${{ runner.os }}- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.github/workflows/dev-release.yml new/setuptools-git-versioning-1.13.2/.github/workflows/dev-release.yml --- old/setuptools-git-versioning-1.13.1/.github/workflows/dev-release.yml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.github/workflows/dev-release.yml 2023-02-26 20:50:23.000000000 +0100 @@ -53,23 +53,19 @@ with: fetch-depth: 0 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.11' - name: Cache pip uses: actions/cache@v3 with: path: ~/.cache/pip - key: ${{ runner.os }}-python-3.10-release-${{ hashFiles('requirements*.txt') }} + key: ${{ runner.os }}-python-3.11-release-${{ hashFiles('requirements*.txt') }} restore-keys: | - ${{ runner.os }}-python-3.10-release-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-tests-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-codeql-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-release- - ${{ runner.os }}-python-3.10-tests- - ${{ runner.os }}-python-3.10-codeql- + ${{ runner.os }}-python-3.11-release-${{ hashFiles('requirements*.txt') }} + ${{ runner.os }}-python-3.11-release- ${{ runner.os }}-python ${{ runner.os }}- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.github/workflows/release.yml new/setuptools-git-versioning-1.13.2/.github/workflows/release.yml --- old/setuptools-git-versioning-1.13.1/.github/workflows/release.yml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.github/workflows/release.yml 2023-02-26 20:50:23.000000000 +0100 @@ -51,23 +51,19 @@ with: fetch-depth: 0 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.11' - name: Cache pip uses: actions/cache@v3 with: path: ~/.cache/pip - key: ${{ runner.os }}-python-3.10-release-${{ hashFiles('requirements*.txt') }} + key: ${{ runner.os }}-python-3.11-release-${{ hashFiles('requirements*.txt') }} restore-keys: | - ${{ runner.os }}-python-3.10-release-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-tests-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-codeql-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-3.10-release- - ${{ runner.os }}-python-3.10-tests- - ${{ runner.os }}-python-3.10-codeql- + ${{ runner.os }}-python-3.11-release-${{ hashFiles('requirements*.txt') }} + ${{ runner.os }}-python-3.11-release- ${{ runner.os }}-python ${{ runner.os }}- @@ -94,6 +90,7 @@ run: | mkdir reports/ pip install -e . + version=$(echo $GITHUB_REF_SLUG | sed -E "s/v(.*)/\1/") # lines 1 and 3 are empty, line 2 contains version number, line 4 contains release date changelog generate-md -c ./docs/conf.py CHANGELOG.rst -v $version | sed "1,4d" > reports/release.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.github/workflows/test.yml new/setuptools-git-versioning-1.13.2/.github/workflows/test.yml --- old/setuptools-git-versioning-1.13.1/.github/workflows/test.yml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.github/workflows/test.yml 2023-02-26 20:50:23.000000000 +0100 @@ -20,21 +20,21 @@ strategy: fail-fast: false matrix: - python-version: ['3.7', '3.11', pypy-3.7, pypy-3.9] + python-version: ['3.7', pypy-3.7, pypy-3.9] os: [ubuntu-latest] # run only limited set of tests because it takes too long mark: [important] include: - os: macos-latest mark: important - python-version: '3.10' + python-version: '3.11' - os: windows-latest mark: important - python-version: '3.10' + python-version: '3.11' # run all the tests only on latest python version - os: ubuntu-latest mark: all - python-version: '3.10' + python-version: '3.11' steps: - name: Checkout code @@ -54,11 +54,7 @@ key: ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }} restore-keys: | ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }} - ${{ runner.os }}-python-${{ matrix.python-version }}-release-${{ hashFiles('requirements*.txt') }} ${{ runner.os }}-python-${{ matrix.python-version }}-tests- - ${{ runner.os }}-python-${{ matrix.python-version }}-codeql- - ${{ runner.os }}-python-${{ matrix.python-version }}-release- ${{ runner.os }}-python ${{ runner.os }}- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/.pre-commit-config.yaml new/setuptools-git-versioning-1.13.2/.pre-commit-config.yaml --- old/setuptools-git-versioning-1.13.1/.pre-commit-config.yaml 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/.pre-commit-config.yaml 2023-02-26 20:50:23.000000000 +0100 @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-ast - id: check-case-conflict @@ -20,7 +20,7 @@ - id: trailing-whitespace - id: detect-private-key - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.3.1 + rev: v1.4.2 hooks: - id: remove-tabs - repo: https://github.com/codespell-project/codespell @@ -29,42 +29,42 @@ - id: codespell args: [-w] - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks - rev: v2.4.0 + rev: v2.7.0 hooks: - id: pretty-format-yaml args: [--autofix, --indent, '2'] - repo: https://github.com/pycqa/isort - rev: 5.10.1 + rev: 5.12.0 hooks: - id: isort files: setuptools_git_versioning.py - repo: https://github.com/pre-commit/pygrep-hooks - rev: v1.9.0 + rev: v1.10.0 hooks: - id: python-no-log-warn - id: python-no-eval - id: text-unicode-replacement-char - repo: https://github.com/asottile/pyupgrade - rev: v3.2.2 + rev: v3.3.1 hooks: - id: pyupgrade args: [--py37-plus] - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 23.1.0 hooks: - id: black language_version: python3 - repo: https://github.com/asottile/blacken-docs - rev: v1.12.1 + rev: 1.13.0 hooks: - id: blacken-docs - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.990 + rev: v1.0.1 hooks: - id: mypy additional_dependencies: [types-six, types-toml] - repo: https://github.com/pycqa/flake8 - rev: 5.0.4 + rev: 6.0.0 hooks: - id: flake8 - repo: https://github.com/PyCQA/bandit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/CHANGELOG.rst new/setuptools-git-versioning-1.13.2/CHANGELOG.rst --- old/setuptools-git-versioning-1.13.1/CHANGELOG.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/CHANGELOG.rst 2023-02-26 20:50:23.000000000 +0100 @@ -5,6 +5,27 @@ ---- .. changelog:: + :version: 1.13.2 + + .. change:: + :tags: docs, feature + :tickets: 77, 77 + + Recommend users to use file-based schema instead of tag-based due some cases. + + .. change:: + :tags: docs, feature + :tickets: 17 + + Add small example of ``.gitignore`` file to common issues section. Thanks to :github-user:`aram-eskandari` + + .. change:: + :tags: docs, feature + :tickets: 55 + + Improve examples of fetching package version in runtime. + +.. changelog:: :version: 1.13.1 :released: 13.11.2022 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/README.rst new/setuptools-git-versioning-1.13.2/README.rst --- old/setuptools-git-versioning-1.13.1/README.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/README.rst 2023-02-26 20:50:23.000000000 +0100 @@ -75,7 +75,8 @@ ~~~~~~~~~~~~~~~~~~ Just add ``setuptools-git-versioning`` to ``build-sytem`` section of your ``pyproject.toml``, -and a section ``tool.setuptools-git-versioning`` with config options: +add a section ``tool.setuptools-git-versioning`` with config options, and mark the project +``version`` as dynamic. .. code:: toml @@ -86,6 +87,9 @@ [tool.setuptools-git-versioning] enabled = true + [project] + dynamic = ["version"] + And check the package version generated (see `command help <https://setuptools-git-versioning.readthedocs.io/en/stable/command.html>`__): .. code:: bash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/command.rst new/setuptools-git-versioning-1.13.2/docs/command.rst --- old/setuptools-git-versioning-1.13.1/docs/command.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/command.rst 2023-02-26 20:50:23.000000000 +0100 @@ -73,7 +73,7 @@ DE8UG: Executing 'git rev-list -n 1 "1.0.0"' at '/path/to/mypackage' INF0: Tag SHA-256: '8dc9881eacd373cb34c5d3f99a6ad9e2349a79c4' INF0: Parsing tag_formatter 'util:tag_formatter' of type 'str' - DE8UG: Executing 'from mypkg.util import tag_formatter' + DE8UG: Executing 'from my_module.util import tag_formatter' DE8UG: Tag after formatting: '1.0.0' DE8UG: Executing 'git status --short' at '/path/to/mypackage' INF0: Is dirty: False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/common_issues/all_dirty.rst new/setuptools-git-versioning-1.13.2/docs/common_issues/all_dirty.rst --- old/setuptools-git-versioning-1.13.1/docs/common_issues/all_dirty.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/common_issues/all_dirty.rst 2023-02-26 20:50:23.000000000 +0100 @@ -13,3 +13,10 @@ You should such files to the ``.gitignore`` file. See `current repo .gitignore <https://github.com/dolfinus/setuptools-git-versioning/blob/master/.gitignore>`__ as an example. + +In most the cases adding these lines solves the issue: + +.. code:: gitignore + + eggs/ + *.egg* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/conf.py new/setuptools-git-versioning-1.13.2/docs/conf.py --- old/setuptools-git-versioning-1.13.1/docs/conf.py 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/conf.py 2023-02-26 20:50:23.000000000 +0100 @@ -17,7 +17,6 @@ from packaging.version import Version try: - from setuptools_git_versioning import version_from_git ver = Version(version_from_git()) @@ -80,7 +79,11 @@ # html_static_path = ['_static'] -extlinks = {"github-user": ("https://github.com/%s", "@%s")} +extlinks = { + "github-user": ("https://github.com/%s", "@%s"), + "issue": ("https://github.com/dolfinus/setuptools-git-versioning/issues/%s", "#%s"), + "pr": ("https://github.com/dolfinus/setuptools-git-versioning/pull/%s", "#%s"), +} changelog_sections = [ "general", @@ -96,7 +99,7 @@ changelog_caption_class = "" changelog_inner_tag_sort = ["breaking", "deprecated", "feature", "bug", "refactor"] -changelog_hive_secgions_from_tags = True +changelog_hide_sections_from_tags = True changelog_render_ticket = "https://github.com/dolfinus/setuptools-git-versioning/issues/%s" changelog_render_pullreq = {"default": "https://github.com/dolfinus/setuptools-git-versioning/pull/%s"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/options/branch_formatter.rst new/setuptools-git-versioning-1.13.2/docs/options/branch_formatter.rst --- old/setuptools-git-versioning-1.13.1/docs/options/branch_formatter.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/options/branch_formatter.rst 2023-02-26 20:50:23.000000000 +0100 @@ -40,7 +40,7 @@ To fix that you can define a callback which will receive current branch name and return a properly formatted one: -- ``mypkg/util.py`` file: +- ``my_module/util.py`` file: .. code:: python @@ -67,7 +67,7 @@ .. code:: python - from mypkg.util import format_branch_name + from my_module.util import format_branch_name setuptools.setup( ..., @@ -92,7 +92,7 @@ enabled = true dev_template = "{branch}.dev{ccount}" dirty_template = "{branch}.dev{ccount}" - branch_formatter = "mypkg.util:format_branch_name" + branch_formatter = "my_module.util:format_branch_name" .. note:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/options/starting_version.rst new/setuptools-git-versioning-1.13.2/docs/options/starting_version.rst --- old/setuptools-git-versioning-1.13.1/docs/options/starting_version.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/options/starting_version.rst 2023-02-26 20:50:23.000000000 +0100 @@ -25,7 +25,7 @@ ) - ``pyproject.toml`` file: -- + .. code:: toml [tool.setuptools-git-versioning] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/options/tag_formatter.rst new/setuptools-git-versioning-1.13.2/docs/options/tag_formatter.rst --- old/setuptools-git-versioning-1.13.1/docs/options/tag_formatter.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/options/tag_formatter.rst 2023-02-26 20:50:23.000000000 +0100 @@ -42,7 +42,7 @@ To fix that you can define a callback which will receive current tag name and return a properly formatted one: -- ``mypkg/util.py`` file: +- ``my_module/util.py`` file: .. code:: python @@ -68,7 +68,7 @@ .. code:: python - from mypkg.util import format_tag_name + from my_module.util import format_tag_name setuptools.setup( ..., @@ -93,7 +93,7 @@ enabled = true dev_template = "{tag}.dev{ccount}" dirty_template = "{tag}.dev{ccount}" - tag_formatter = "mypkg.util:format_tag_name" + tag_formatter = "my_module.util:format_tag_name" .. note:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/runtime_version.rst new/setuptools-git-versioning-1.13.2/docs/runtime_version.rst --- old/setuptools-git-versioning-1.13.1/docs/runtime_version.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/runtime_version.rst 2023-02-26 20:50:23.000000000 +0100 @@ -3,20 +3,83 @@ Retrieving package version at runtime ------------------------------------- -Using ``version_file`` or ``version_callback`` options -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Using ``version_file`` option (recommended) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The preferred way to set version number inside a package is -to simply store it in some file or variable/function, and -then use it in ``setup.py`` / ``pyproject.toml`` as version source. +In case of using :ref:`version_file <version-file>` option you can directly read the ``VERSION`` file content, +and use at as version number. -It this case you can get current version without any access to ``.git`` folder -(which is required by ``setuptools-git-versioning``). +To resolve version number in runtime, you should move ``VERSION`` file to your module subfolder: -See: +- ``setup.py``: + + Create ``MANIFEST.in`` file in the project root: + + .. code:: + + include my_module/VERSION + + Then make few changes in ``setup.py``: + + .. code:: python + + ... + + # change VERSION file path + version_file = root_path / "my_module" / "VERSION" + + setuptools.setup( + ..., + setuptools_git_versioning={ + "enabled": True, + "version_file": version_file, + }, + # read MANIFEST.in and include files mentioned here to the package + include_package_data=True, + # this package will read some included files in runtime, avoid installing it as .zip + zip_safe=False, + ) + +- ``pyproject.toml``: + + .. code:: toml + + [tool.setuptools.package-data] + # include VERSION file to a package + my_module = ["VERSION"] + # this package will read some included files in runtime, avoid installing it as .zip + zip-safe = false + + [tool.setuptools-git-versioning] + enabled = true + # change the file path + version_file = "my_module/VERSION" + +And then read this file: + +.. code:: python + + # content of my_module/__init__.py + + from pathlib import Path + + # you can use os.path and open() as well + __version__ = Path(__file__).parent.joinpath("VERSION").read_text() + + +Using ``version_callback`` option +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +In case of using :ref:`version_callback <version-callback>` option you can directly call this callback inside a module: + +.. code:: python + + # content of my_module/__init__.py + + from my_module.version import get_version + + __version__ = get_version() -* :ref:`version-file` -* :ref:`version-callback` Using ``importlib`` ~~~~~~~~~~~~~~~~~~~ @@ -66,19 +129,19 @@ .. warning:: - This way is STRONGLY DISCOURAGED. Functions in the module - are not a part of public API, and could be changed in the future without - maintaining backward compatibility. + This way is STRONGLY DISCOURAGED. Functions in the module + are not a part of public API, and could be changed in the future without + maintaining backward compatibility. .. warning:: - Use this ONLY in CI/CD tools. + Use this ONLY in CI/CD tools. - NEVER use ``setuptools_git_versioning`` inside your package, because ``.git`` - folder is not being included into it, and target OS can lack of ``git`` executable. + NEVER use ``setuptools_git_versioning`` inside your package, because ``.git`` + folder is not being included into it, and target OS can lack of ``git`` executable. - ``.git`` folder and ``git`` executable presence is crucial - for ``setuptools-git-versioning`` to work properly. + ``.git`` folder and ``git`` executable presence is crucial + for ``setuptools-git-versioning`` to work properly. .. code:: python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/callback/index.rst new/setuptools-git-versioning-1.13.2/docs/schemas/callback/index.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/callback/index.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/callback/index.rst 2023-02-26 20:50:23.000000000 +0100 @@ -1,7 +1,7 @@ .. _callback-based-release: -Callback-based release -~~~~~~~~~~~~~~~~~~~~~~~ +Callback-based release (advanced) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. toctree:: :maxdepth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/callback/version_callback.rst new/setuptools-git-versioning-1.13.2/docs/schemas/callback/version_callback.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/callback/version_callback.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/callback/version_callback.rst 2023-02-26 20:50:23.000000000 +0100 @@ -25,7 +25,7 @@ If you want to get synchronized version numbers in both ``master`` and ``dev`` branches, you can create a function in some file (for example, in the -``mypkg/version.py`` file): +``my_module/version.py`` file): .. code:: python @@ -36,7 +36,7 @@ .. code:: python - from mypkg.version import get_version + from my_module.version import get_version setuptools.setup( ..., @@ -55,7 +55,7 @@ [tool.setuptools-git-versioning] enabled = true - version_callback = "mypkg.version:get_version" + version_callback = "my_module.version:get_version" When you'll try to get current version in **any** branch, the result of executing this function will be returned instead of latest tag @@ -63,7 +63,7 @@ If a value of this option is not a function but just str, it also could be used: -- ``mypkg/__init__.py`` file: +- ``my_module/__init__.py`` file: .. code:: python @@ -73,13 +73,13 @@ .. code:: python - import mypkg + import my_module setuptools.setup( ..., setuptools_git_versioning={ "enabled": True, - "version_callback": mypkg.__version__, + "version_callback": my_module.__version__, }, ) @@ -92,7 +92,7 @@ [tool.setuptools-git-versioning] enabled = true - version_callback = "mypkg:__version__" + version_callback = "my_module:__version__" **Please take into account that any tag in the branch is completely ignored if version_callback is set**. @@ -105,3 +105,4 @@ See also """""""" - :ref:`version-callback-option` option +- :ref:`runtime-version` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/file/index.rst new/setuptools-git-versioning-1.13.2/docs/schemas/file/index.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/file/index.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/file/index.rst 2023-02-26 20:50:23.000000000 +0100 @@ -1,7 +1,23 @@ .. _file-based-release: -File-based release -~~~~~~~~~~~~~~~~~~~~~~~ +File-based release (recommended) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +By default, ``setuptools-git-versioning`` can be used only within: + +* git repo, which means a ``.git`` subfolder should exist in the repo root folder +* branch with at least one tag + +Otherwise it will be impossible to get project version based on the git repo commits, +and ``setuptools-git-versioning`` will return version number ``0.0.1`` (or other value set up by :ref:`starting-version-option`). + +But one or all of these requirements cannot be satisfied in the following cases: + +* Downloading source tarball without ``.git`` folder (:issue:`77`). +* Shallow repo clone without tags (:issue:`75`). +* Getting version number from a branch which does not contain any tags (`Git-flow <https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow>`__ and its derivatives) + +To avoid getting meaningless version number prefer using versioning schema described below. .. toctree:: :maxdepth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/file/version_file.rst new/setuptools-git-versioning-1.13.2/docs/schemas/file/version_file.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/file/version_file.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/file/version_file.rst 2023-02-26 20:50:23.000000000 +0100 @@ -1,7 +1,7 @@ .. _version-file: Read some file content as current version -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ For example, current repo state is: @@ -39,16 +39,17 @@ .. code:: python - import os + # you can use os.path instead of pathlib + from pathlib import Path - HERE = os.path.dirname(__file__) - VERSION_FILE = os.path.join(HERE, "VERSION") + root_path = Path(__file__).parent + version_file = root_path / "VERSION" setuptools.setup( ..., setuptools_git_versioning={ "enabled": True, - "version_file": VERSION_FILE, + "version_file": version_file, }, ) @@ -63,10 +64,11 @@ When you'll try to get current version in non-master branch, the content of this file (``1.0.0``) will be returned instead default version number. -**Please take into account that version_file is ignored if tag -is present** +**Please take into account that version_file is ignored if any tag +is present in the current branch.** See also """"""""" - :ref:`version-callback` - :ref:`version-file-option` option +- :ref:`runtime-version` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/tag/index.rst new/setuptools-git-versioning-1.13.2/docs/schemas/tag/index.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/tag/index.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/tag/index.rst 2023-02-26 20:50:23.000000000 +0100 @@ -1,7 +1,11 @@ .. _tag-based-release: -Tag-based release -~~~~~~~~~~~~~~~~~ +Tag-based release (not recommended) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. note:: + + This schema has several drawbacks. Use :ref:`file-based schema <file-based-release>` instead. .. toctree:: :maxdepth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/docs/schemas/tag/tag_release.rst new/setuptools-git-versioning-1.13.2/docs/schemas/tag/tag_release.rst --- old/setuptools-git-versioning-1.13.1/docs/schemas/tag/tag_release.rst 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/docs/schemas/tag/tag_release.rst 2023-02-26 20:50:23.000000000 +0100 @@ -1,7 +1,7 @@ .. _tag-release: Release is a git tag -^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^ For example, current repo state is: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/setup.py new/setuptools-git-versioning-1.13.2/setup.py --- old/setuptools-git-versioning-1.13.1/setup.py 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/setup.py 2023-02-26 20:50:23.000000000 +0100 @@ -1,26 +1,24 @@ -import os +from __future__ import annotations + +from pathlib import Path from setuptools import setup, find_packages from setuptools_git_versioning import version_from_git -HERE = os.path.dirname(os.path.abspath(__file__)) - - -def parse_requirements(file_content): - lines = file_content.splitlines() - return [line.strip() for line in lines if line and not line.startswith("#")] +def parse_requirements(file: Path) -> list[str]: + lines = file.read_text().splitlines() + return [line.rstrip() for line in lines if line and not line.startswith("#")] -with open(os.path.join(HERE, "README.rst")) as f: - long_description = f.read() -with open(os.path.join(HERE, "requirements.txt")) as f: - requirements = parse_requirements(f.read()) +here = Path(__file__).parent.resolve() +requirements = parse_requirements(here / "requirements.txt") +long_description = here.joinpath("README.rst").read_text() setup( name="setuptools-git-versioning", # +local version is not allowed in PyPI # https://github.com/pypa/pypi-legacy/issues/731#issuecomment-345461596 - version=version_from_git(root=HERE, dev_template="{tag}.post{ccount}"), + version=version_from_git(root=here, dev_template="{tag}.post{ccount}"), author="dolfinus", author_email="martinov.m....@gmail.com", description="Use git repo data for building a version number according PEP-440", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/setuptools_git_versioning.py new/setuptools-git-versioning-1.13.2/setuptools_git_versioning.py --- old/setuptools-git-versioning-1.13.1/setuptools_git_versioning.py 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/setuptools_git_versioning.py 2023-02-26 20:50:23.000000000 +0100 @@ -466,7 +466,6 @@ log.log(DEBUG, "Value is callable with signature %s", inspect.Signature.from_callable(version_callback)) result = version_callback() else: - log.log(INFO, "Is not callable, trying to import ...") result = version_callback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-git-versioning-1.13.1/tests/lib/util.py new/setuptools-git-versioning-1.13.2/tests/lib/util.py --- old/setuptools-git-versioning-1.13.1/tests/lib/util.py 2022-11-13 14:52:47.000000000 +0100 +++ new/setuptools-git-versioning-1.13.2/tests/lib/util.py 2023-02-26 20:50:23.000000000 +0100 @@ -219,7 +219,6 @@ option: str = "setuptools_git_versioning", **kwargs, ) -> str | None: - if config is None: config = {"enabled": True} ++++++ setuptools-git-versioning.obsinfo ++++++ --- /var/tmp/diff_new_pack.rb0Abw/_old 2023-03-03 22:31:14.819990253 +0100 +++ /var/tmp/diff_new_pack.rb0Abw/_new 2023-03-03 22:31:14.823990270 +0100 @@ -1,5 +1,5 @@ name: setuptools-git-versioning -version: 1.13.1 -mtime: 1668347567 -commit: eea9b28acd19aad4b5d2932e6338e0d1fc23ef41 +version: 1.13.2 +mtime: 1677441023 +commit: aa578a78397cd8ca51bd389aaee8a274fd1b6274