From 2b4889e086975bf95d21ee2d38a67f4e98d2001c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 26 Mar 2018 13:01:12 -0300 Subject: [PATCH] python-envdir: update to 1.0.1. Closes: #12929 [via git-merge-pr] --- .../patches/Remove-broken-tests.patch | 108 ------------------ srcpkgs/python-envdir/template | 38 ++++-- srcpkgs/python3-envdir | 1 + 3 files changed, 28 insertions(+), 119 deletions(-) delete mode 100644 srcpkgs/python-envdir/patches/Remove-broken-tests.patch create mode 120000 srcpkgs/python3-envdir diff --git a/srcpkgs/python-envdir/patches/Remove-broken-tests.patch b/srcpkgs/python-envdir/patches/Remove-broken-tests.patch deleted file mode 100644 index f35b483d29c..00000000000 --- a/srcpkgs/python-envdir/patches/Remove-broken-tests.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- envdir/test_envdir.py -+++ envdir/test_envdir.py -@@ -253,39 +253,39 @@ def test_read(tmpenvdir): - assert 'READ' in applied - - --def test_read_magic_dir(capfd, tmpdir): -- "Python usage with magic envdir" -- tmp = tmpdir.mkdir('envdir') -- tmp.join('READ_MAGIC').write('test') -- magic_scripts = tmpdir.join('test_magic.py') -- magic_scripts.write(""" --import envdir, os, sys --envdir.read() --if 'READ_MAGIC' in os.environ: -- sys.exit(42) --""") -- status = subprocess.call(['python', str(magic_scripts)]) -- assert status == 42 -- -- # this should raise a Response with an error because envdir.run() -- # can't have all arguments -- with py.test.raises(SystemExit) as response: -- envdir.run('envdir', str(tmp)) -- out, err = capfd.readouterr() -- -- if py.std.sys.version_info[:2] == (2, 6): -- assert response.value == 2 -- else: -- assert response.value.code == 2 -- assert "incorrect number of arguments" in err -- -- with py.test.raises(SystemExit) as response: -- envdir.run() -- out, err = capfd.readouterr() -- if py.std.sys.version_info[:2] == (2, 6): -- assert response.value == 2 -- else: -- assert response.value.code == 2 -+#def test_read_magic_dir(capfd, tmpdir): -+# "Python usage with magic envdir" -+# tmp = tmpdir.mkdir('envdir') -+# tmp.join('READ_MAGIC').write('test') -+# magic_scripts = tmpdir.join('test_magic.py') -+# magic_scripts.write(""" -+#import envdir, os, sys -+#envdir.read() -+#if 'READ_MAGIC' in os.environ: -+# sys.exit(42) -+#""") -+# status = subprocess.call(['python', str(magic_scripts)]) -+# assert status == 42 -+# -+# # this should raise a Response with an error because envdir.run() -+# # can't have all arguments -+# with py.test.raises(SystemExit) as response: -+# envdir.run('envdir', str(tmp)) -+# out, err = capfd.readouterr() -+# -+# if py.std.sys.version_info[:2] == (2, 6): -+# assert response.value == 2 -+# else: -+# assert response.value.code == 2 -+# assert "incorrect number of arguments" in err -+# -+# with py.test.raises(SystemExit) as response: -+# envdir.run() -+# out, err = capfd.readouterr() -+# if py.std.sys.version_info[:2] == (2, 6): -+# assert response.value == 2 -+# else: -+# assert response.value.code == 2 - - - def test_read_existing_var(tmpenvdir): -@@ -303,20 +303,18 @@ def test_write(tmpenvdir): - envdir.read(str(tmpenvdir)) - assert os.environ['WRITE'] == 'test' - -- --def test_write_magic(tmpdir): -- tmp = tmpdir.mkdir('envdir') -- magic_scripts = tmpdir.join('test_magic_write.py') -- magic_scripts.write(""" --import envdir, os, sys --env = envdir.open() --env['WRITE_MAGIC'] = 'test' --""") -- subprocess.call(['python', str(magic_scripts)]) -- assert tmp.join('WRITE_MAGIC').read() == 'test' -- envdir.read(str(tmp)) -- assert os.environ['WRITE_MAGIC'] == 'test' -- -+#def test_write_magic(tmpdir): -+# tmp = tmpdir.mkdir('envdir') -+# magic_scripts = tmpdir.join('test_magic_write.py') -+# magic_scripts.write(""" -+#import envdir, os, sys -+#env = envdir.open() -+#env['WRITE_MAGIC'] = 'test' -+#""") -+# subprocess.call(['python', str(magic_scripts)]) -+# assert tmp.join('WRITE_MAGIC').read() == 'test' -+# envdir.read(str(tmp)) -+# assert os.environ['WRITE_MAGIC'] == 'test' - - def test_context_manager(tmpenvdir): - tmpenvdir.join('CONTEXT_MANAGER').write('test') diff --git a/srcpkgs/python-envdir/template b/srcpkgs/python-envdir/template index 73e18c5d4cf..304dfba31e7 100644 --- a/srcpkgs/python-envdir/template +++ b/srcpkgs/python-envdir/template @@ -1,24 +1,40 @@ # Template file for 'python-envdir' pkgname=python-envdir -version=0.7 +version=1.0.1 revision=1 wrksrc="${pkgname/python-//}-${version}" -build_style=python2-module -hostmakedepends="python-setuptools" -checkdepends="python-pytest" +build_style=python-module +pycompile_module="envdir" +hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools" short_desc="A Python2 port of daemontools' envdir" maintainer="maxice8 " license="MIT" homepage="https://github.com/jezdez/envdir" -distfiles="${PYPI_SITE}/e/envdir/envdir-${version}.tar.gz" -checksum=296ea3b651c429a31465684f03fef52cd580427acba5d0351009180740924009 +distfiles="https://github.com/jezdez/envdir/archive/${version}.tar.gz" +checksum=779a308a07a673f391db87ef639d4b0f9921238bba02dd3e98c3281520faee95 noarch=yes - -do_check() { - pytest2 -} +alternatives=" + python-envdir:envdir:/usr/bin/envdir2 + python-envdir:envshell:/usr/bin/envshell2 +" post_install() { - vlicense "${FILESDIR}"/LICENSE + vlicense LICENSE +} + +python3-envdir_package() { + alternatives=" + python-envdir:envdir:/usr/bin/envdir3 + python-envdir:envshell:/usr/bin/envshell3 + " + noarch=yes + pycompile_module="envdir" + depends="python3-setuptools" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/bin/*3 + vmove usr/lib/python3* + vlicense LICENSE + } } diff --git a/srcpkgs/python3-envdir b/srcpkgs/python3-envdir new file mode 120000 index 00000000000..c07d3a24f31 --- /dev/null +++ b/srcpkgs/python3-envdir @@ -0,0 +1 @@ +python-envdir \ No newline at end of file