Update to py-setuptools_scm 1.15.5

This commit is contained in:
shadchin 2017-04-22 17:48:14 +00:00
parent d5bbc50d82
commit 609da4aa7d
3 changed files with 5 additions and 40 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.6 2017/01/03 19:19:49 landry Exp $ # $OpenBSD: Makefile,v 1.7 2017/04/22 17:48:14 shadchin Exp $
COMMENT = plugin to manage your versions by scm tags COMMENT = plugin to manage your versions by scm tags
MODPY_EGG_VERSION = 1.15.0 MODPY_EGG_VERSION = 1.15.5
DISTNAME = setuptools_scm-${MODPY_EGG_VERSION} DISTNAME = setuptools_scm-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME} PKGNAME = py-${DISTNAME}
CATEGORIES = devel CATEGORIES = devel
REVISION = 0
MAINTAINER = Alexandr Shadchin <shadchin@openbsd.org> MAINTAINER = Alexandr Shadchin <shadchin@openbsd.org>
@ -17,6 +16,7 @@ MODULES = lang/python
TEST_DEPENDS = devel/git \ TEST_DEPENDS = devel/git \
devel/mercurial \ devel/mercurial \
devel/py-pip${MODPY_FLAVOR} \
devel/py-test${MODPY_FLAVOR} devel/py-test${MODPY_FLAVOR}
MODPY_PI = Yes MODPY_PI = Yes
@ -25,9 +25,6 @@ MODPY_SETUPTOOLS = Yes
FLAVORS = python3 FLAVORS = python3
FLAVOR ?= FLAVOR ?=
pre-configure:
${SUBST_CMD} ${WRKSRC}/testing/test_regressions.py
do-test: do-test:
cd ${WRKSRC} && ${MODPY_BIN} -m pytest cd ${WRKSRC} && ${MODPY_BIN} -m pytest

View File

@ -1,2 +1,2 @@
SHA256 (setuptools_scm-1.15.0.tar.gz) = 2vEtBaohVaRqo1dFN1f/3EfYf4OeYhFPBCvOrGphni8= SHA256 (setuptools_scm-1.15.5.tar.gz) = FFsqimCeD9ZhCKkqBv5i0PsynA65RPLVx648okIi8p4=
SIZE (setuptools_scm-1.15.0.tar.gz) = 23677 SIZE (setuptools_scm-1.15.5.tar.gz) = 25752

View File

@ -1,32 +0,0 @@
$OpenBSD: patch-testing_test_regressions_py,v 1.3 2016/06/13 09:00:25 shadchin Exp $
--- testing/test_regressions.py.orig Mon Jun 13 02:09:53 2016
+++ testing/test_regressions.py Mon Jun 13 13:54:13 2016
@@ -16,16 +16,16 @@ def test_pkginfo_noscmroot(tmpdir, monkeypatch):
'from setuptools import setup;'
'setup(use_scm_version={"root": ".."})')
- _, stderr, ret = do_ex('python setup.py --version', p)
+ _, stderr, ret = do_ex('${MODPY_BIN} setup.py --version', p)
assert 'setuptools-scm was unable to detect version for' in stderr
assert ret == 1
p.join("PKG-INFO").write('Version: 1.0')
- res = do('python setup.py --version', p)
+ res = do('${MODPY_BIN} setup.py --version', p)
assert res == '1.0'
do('git init', p.dirpath())
- res = do('python setup.py --version', p)
+ res = do('${MODPY_BIN} setup.py --version', p)
assert res == '1.0'
@@ -45,7 +45,7 @@ setup(use_scm_version=vcfg)
''')
p.join("PKG-INFO").write('Version: 1.0')
- res = do('python setup.py --version', p)
+ res = do('${MODPY_BIN} setup.py --version', p)
assert res == '1.0'