diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /dev-python/setuptools_scm | |
parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) |
gentoo resync : 12.01.2019
Diffstat (limited to 'dev-python/setuptools_scm')
-rw-r--r-- | dev-python/setuptools_scm/Manifest | 3 | ||||
-rw-r--r-- | dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch | 105 | ||||
-rw-r--r-- | dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild | 43 |
3 files changed, 151 insertions, 0 deletions
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest index a9080359f893..dd011e587162 100644 --- a/dev-python/setuptools_scm/Manifest +++ b/dev-python/setuptools_scm/Manifest @@ -1,9 +1,12 @@ +AUX setuptools_scm-3.1.0-test-failures.patch 4040 BLAKE2B c256db00c9e98623d5274a1815cc86abef6c42fd501bf58675a1982ded7305500777595ff8df3099d5ac1608f987d3a415a3aa964178a6946b11ead720f4ddf8 SHA512 e8901a796dd54ae51d11dfb47f389d098d68adc6551789bb893034c6e264d91c9fc8af1f9f2b394d229051f2fda25f79e81b95734d93b7083dc2c6914c218d65 DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b964130f370f42a5cd3c634cc1bf9a506ca8547783087a0b9589ed4038168d034dddbe435540cd25a846536dc5a5c116f4168f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816 DIST setuptools_scm-1.15.7.tar.gz 15426 BLAKE2B 6c23f2bd74f51ec8633a814ce22e63e5afb9953244659833a61e810c9029227e1cc25a067a59cec5666add76863070ae5b7dc2600953a45def886e52378a3399 SHA512 0aa6056c03fe100cdaa7b11c9d2073431bb5c3904a80a994a8263c0ccac81f7a2c0b6c7e6dfd09ad605c5ff0e86981b894b42920cb69d1ef1d43ea08b2ddd4a0 DIST setuptools_scm-1.16.1.tar.gz 28956 BLAKE2B 6721830e9ef171768afb94e6d6aacb829665658599409880e87c58e1bf2c6366d04a666ff60ed5d689bf376c258eda93367a4c52fe28ec694a3a93ac109db1fb SHA512 fd5017648c4a8af696e8528eab37061776e8495e2de3640f726e5e4347836eca5a13cbe54fc0c2223c3ae80ede1a81a6f3d9c0910a417545b9f9f206e5177a13 DIST setuptools_scm-2.1.0.tar.gz 32776 BLAKE2B 7a141f3fa826a82931b6c33afd19d3185f98b735451c03651b875051e514eab287b20ee382a9576841b6f1283b9d1bf3dcbd0aabc41d2f1143cf960b856c8492 SHA512 69ce171aa4d3b576883efffb350c59f38bfe8b35bd8e4e8fa1128d9f8a3e6cfaab832633e91fada36126f8e7e2c18663fad621d62c9834be1b5d36c58ae1d1c8 +DIST setuptools_scm-3.1.0.tar.gz 35585 BLAKE2B 7ecbdf325467cb3e5217150c548b99603e1bb851a3bc8c694acf3aeb0da798ec853d13b29ad0537bdf5c1010834576786e0dde3965d61991554a12cf206ba7e0 SHA512 bd84bb02900ddc7de2f02dd7cb62bafdea7040ebdc2506b72d05f2c6a6d16be903321e576f63a04f2aa13d8c75b1834dec7d9ea8444e8330281f8e586a3d6426 EBUILD setuptools_scm-1.15.6-r1.ebuild 1359 BLAKE2B 17342f793101a84d1b931b31a7e3e0a24f55efd7f19cfbe1a2eee899ee6771a729ad38f1b5c5b2c90548bd2fc9680bbc12c783553a9df629da158b41785bb937 SHA512 d68a939338f4a84bfd4638f3d48e93ec0462e996c473637e125911b512f2710f73850d69141f6c59431cbab77d51fcb6f61dc0952df81e6b08d60d21d3af4fd0 EBUILD setuptools_scm-1.15.7.ebuild 1483 BLAKE2B f64003059ecd5ef861c7f8cec1429b877771f294daacda979cbaf42b5370a07a3453a9d59337c4656f319ee73ae090eed1bb6eafdb817d6ed0a53d7af97dff11 SHA512 8ba4dd34a36d82ebbb3ab3cbc62e35e6fbe6a7129723335d14d28aa0132101e715b4c9d07ec7f5093bfd8b8e3878e75b775ed24e963485b78b2b3011c418b69e EBUILD setuptools_scm-1.16.1.ebuild 1372 BLAKE2B f5503bb6c971ba9790136baa90cf49830be228a37a018f170ff92e464a65f135c76f15eeaeebe09c055b63166c2eb27bd87653de67939dd2d6a11fc487dafad1 SHA512 0943416aea652899892f6aef88ffc2db6828d41f2c647a3251960fe60126689e26f5b9b829ba50dc7a4829acb3eb929885d705fae19ac88ba8e083e7300151dc EBUILD setuptools_scm-2.1.0.ebuild 1073 BLAKE2B d7809dff4fbfed38ea8802e06ba5b262e41fdde30f3880c64374a40336b5efa4e6073814e5e66629c507bf8b07f0865b133c1244eac8ecba3121f66cfa5ed83c SHA512 e3bf8a2e849e49806405fe5c1688403581db804b51ba0ffac15b27bd4bcb5aa47577094a8c023b8238e643b0511c089d319107a0aa0396eab12a55e01075d421 +EBUILD setuptools_scm-3.1.0.ebuild 1175 BLAKE2B 94c27c4da2a127ff35ec649e80afea8150fc8621ded4db38e750954c4d3473e51f92d27ed16b062ec88700d3405eccbd8374845906078e2de615724f196b01d7 SHA512 eb0c03ec77fd44f0b00286e691ce82e723951e4b4c3a738b894c1fd2aed290f1391cf247028adde5336bee23b46f09c0f1da823f9fe30ae5965ff200ef59cc91 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31 diff --git a/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch b/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch new file mode 100644 index 000000000000..420bd6828b42 --- /dev/null +++ b/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch @@ -0,0 +1,105 @@ +diff --git a/src/setuptools_scm/hg.py b/src/setuptools_scm/hg.py +index 972f493..8fedd68 100644 +--- a/src/setuptools_scm/hg.py ++++ b/src/setuptools_scm/hg.py +@@ -13,7 +13,7 @@ def _hg_tagdist_normalize_tagcommit(config, tag, dist, node, branch): + "(branch(.)" # look for revisions in this branch only + " and tag({tag!r})::." # after the last tag + # ignore commits that only modify .hgtags and nothing else: +- " and (merge() or file('re:^(?!\.hgtags).*$'))" ++ " and (merge() or file('re:^(?!\\.hgtags).*$'))" + " and not tag({tag!r}))" # ignore the tagged commit itself + ).format( + tag=tag +@@ -70,7 +70,9 @@ def parse(root, config=None): + + def get_latest_normalizable_tag(root): + # Gets all tags containing a '.' (see #229) from oldest to newest +- cmd = ["hg", "log", "-r", "ancestors(.) and tag('re:\.')", "--template", "{tags}\n"] ++ cmd = [ ++ "hg", "log", "-r", "ancestors(.) and tag('re:\\.')", "--template", "{tags}\n" ++ ] + outlines = do(cmd, root).split() + if not outlines: + return "null" +diff --git a/testing/test_functions.py b/testing/test_functions.py +index 14d8961..c3d78b6 100644 +--- a/testing/test_functions.py ++++ b/testing/test_functions.py +@@ -8,6 +8,8 @@ from setuptools_scm.version import ( + format_version, + tag_to_version, + ) ++ ++from setuptools_scm.config import Configuration + from setuptools_scm.utils import has_command + + PY3 = sys.version_info > (2,) +@@ -33,12 +35,14 @@ def test_next_tag(tag, expected): + assert guess_next_version(version) == expected + + ++c = Configuration() ++ + VERSIONS = { +- "exact": meta("1.1", distance=None, dirty=False), +- "zerodistance": meta("1.1", distance=0, dirty=False), +- "dirty": meta("1.1", distance=None, dirty=True), +- "distance": meta("1.1", distance=3, dirty=False), +- "distancedirty": meta("1.1", distance=3, dirty=True), ++ "exact": meta("1.1", distance=None, dirty=False, config=c), ++ "zerodistance": meta("1.1", distance=0, dirty=False, config=c), ++ "dirty": meta("1.1", distance=None, dirty=True, config=c), ++ "distance": meta("1.1", distance=3, dirty=False, config=c), ++ "distancedirty": meta("1.1", distance=3, dirty=True, config=c), + } + + +diff --git a/testing/test_version.py b/testing/test_version.py +index be940ef..a287a0d 100644 +--- a/testing/test_version.py ++++ b/testing/test_version.py +@@ -3,33 +3,36 @@ from setuptools_scm.config import Configuration + from setuptools_scm.version import meta, simplified_semver_version, tags_to_versions + + ++c = Configuration() ++ ++ + @pytest.mark.parametrize( + "version, expected_next", + [ +- pytest.param(meta("1.0.0"), "1.0.0", id="exact"), +- pytest.param(meta("1.0"), "1.0.0", id="short_tag"), ++ pytest.param(meta("1.0.0", config=c), "1.0.0", id="exact"), ++ pytest.param(meta("1.0", config=c), "1.0.0", id="short_tag"), + pytest.param( +- meta("1.0.0", distance=2, branch="default"), ++ meta("1.0.0", distance=2, branch="default", config=c), + "1.0.1.dev2", + id="normal_branch", + ), + pytest.param( +- meta("1.0", distance=2, branch="default"), ++ meta("1.0", distance=2, branch="default", config=c), + "1.0.1.dev2", + id="normal_branch_short_tag", + ), + pytest.param( +- meta("1.0.0", distance=2, branch="feature"), ++ meta("1.0.0", distance=2, branch="feature", config=c), + "1.1.0.dev2", + id="feature_branch", + ), + pytest.param( +- meta("1.0", distance=2, branch="feature"), ++ meta("1.0", distance=2, branch="feature", config=c), + "1.1.0.dev2", + id="feature_branch_short_tag", + ), + pytest.param( +- meta("1.0.0", distance=2, branch="features/test"), ++ meta("1.0.0", distance=2, branch="features/test", config=c), + "1.1.0.dev2", + id="feature_in_branch", + ), diff --git a/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild new file mode 100644 index 000000000000..6756febef567 --- /dev/null +++ b/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="package to manage versions by scm tags via setuptools" +HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-vcs/git + dev-vcs/mercurial )" + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}"/setuptools_scm-3.1.0-test-failures.patch + ) + + # network access + sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die + # all fetch specific setuptools versions + rm testing/test_setuptools_support.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + distutils_install_for_testing + py.test -v -v -x || die "Tests fail with ${EPYTHON}" +} |