[arch-commits] Commit in python-gilt/repos/community-any (4 files)
David Runge
dvzrv at archlinux.org
Wed Mar 18 22:04:31 UTC 2020
Date: Wednesday, March 18, 2020 @ 22:04:30
Author: dvzrv
Revision: 600703
archrelease: copy trunk to community-any
Added:
python-gilt/repos/community-any/PKGBUILD
(from rev 600702, python-gilt/trunk/PKGBUILD)
python-gilt/repos/community-any/python-gilt-1.2.1-ls_path.patch
(from rev 600702, python-gilt/trunk/python-gilt-1.2.1-ls_path.patch)
Deleted:
python-gilt/repos/community-any/PKGBUILD
python-gilt/repos/community-any/python-gilt-1.2.1-ls_path.patch
---------------------------------+
PKGBUILD | 101 ++++++++++++++++++--------------------
python-gilt-1.2.1-ls_path.patch | 55 ++++++++++++--------
2 files changed, 80 insertions(+), 76 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-18 22:03:47 UTC (rev 600702)
+++ PKGBUILD 2020-03-18 22:04:30 UTC (rev 600703)
@@ -1,53 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-pkgname=python-gilt
-pkgver=1.2.1
-pkgrel=3
-pkgdesc="A GIT layering tool"
-arch=('any')
-url="https://github.com/retr0h/gilt"
-license=('MIT')
-depends=('python-click' 'python-colorama' 'python-fasteners'
-'python-git-url-parse' 'python-pbr' 'python-yaml' 'python-sh')
-makedepends=('python-setuptools')
-checkdepends=('git' 'python-pytest' 'python-pytest-cov'
-'python-pytest-helpers-namespace' 'python-pytest-mock' 'python-requests'
-'yapf')
-source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- "${pkgname}-1.2.1-ls_path.patch"
- "${pkgname}-1.2.1-unittests.patch::https://github.com/retr0h/gilt/pull/67.patch")
-sha512sums=('d5278365428623b7c172d981a437c6a6e318bf4e84844e7978d7821480c93edaa1e8a1dd6920bc5b7d33d26b5475ad5dcb8f37baea5586fe53c5397d320b2e69'
- '9d9698086ec27b23b9db2b7ba424d64c5b2d52e407b7fe9de8aa9a29671b51b90340b34c33b246b1fe7c1d054c4a1f88ab0740abf4e8eb1ddfc5d1bd0e37b1d9'
- '5ad0d9149961b870146f7aa8e1ca2ce00d1dd65b80f93d2458265d106f5d2a6bb8249ace55191977946eeb8d789777f21f1be6b02c19471ee62fb1a7fce54866')
-
-prepare() {
- cd "$pkgname-$pkgver"
- # applying unreleased fix for problems with unit tests:
- # https://github.com/retr0h/gilt/issues/66
- patch -Np1 -i "../${pkgname}-1.2.1-unittests.patch"
- # fixing issues with hardcoded paths
- # https://github.com/retr0h/gilt/issues/76
- patch -Np1 -i "../${pkgname}-1.2.1-ls_path.patch"
-}
-
-build() {
- cd "$pkgname-$pkgver"
- python setup.py build
-}
-
-check() {
- cd "$pkgname-$pkgver"
- export PYTHONPATH="build:${PYTHONPATH}"
- pytest -v
-}
-
-package() {
- cd "$pkgname-$pkgver"
- python setup.py install --skip-build \
- --optimize=1 \
- --prefix=/usr \
- --root="${pkgdir}"
- install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
- install -vDm 644 {AUTHORS,CHANGELOG,CONTRIBUTING,README}.rst -t \
- "${pkgdir}/usr/share/doc/${pkgname}"
-}
Copied: python-gilt/repos/community-any/PKGBUILD (from rev 600702, python-gilt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-18 22:04:30 UTC (rev 600703)
@@ -0,0 +1,48 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=python-gilt
+pkgver=1.2.2
+pkgrel=1
+pkgdesc="A GIT layering tool"
+arch=('any')
+url="https://github.com/retr0h/gilt"
+license=('MIT')
+depends=('python-click' 'python-colorama' 'python-fasteners'
+'python-git-url-parse' 'python-pbr' 'python-yaml' 'python-sh')
+makedepends=('python-setuptools')
+checkdepends=('git' 'python-pytest' 'python-pytest-cov'
+'python-pytest-helpers-namespace' 'python-pytest-mock' 'python-requests'
+'yapf')
+source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ "${pkgname}-1.2.1-ls_path.patch")
+sha512sums=('34ac5d5ef5a8bc052fa41ac464b7dd4efa15f323ea5c95a6c280ab39a99ac0335707ef98449436122715cc2b44682100989dd31253e96395a087d5d1db3a7c7b'
+ '8b0090f7374499b603bf383ea48f313f5baa7a8215f504c87350432873da557af07204c7f948aab4c05033c11ce10f2137f1912be6db5d6887b3d8a7c3f0dcbb')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ # fixing issues with hardcoded paths
+ # https://github.com/retr0h/gilt/issues/76
+ patch -Np1 -i "../${pkgname}-1.2.1-ls_path.patch"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ python setup.py build
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+ export PYTHONPATH="build:${PYTHONPATH}"
+ pytest -v
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ python setup.py install --skip-build \
+ --optimize=1 \
+ --prefix=/usr \
+ --root="${pkgdir}"
+ install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -vDm 644 {AUTHORS,CHANGELOG,CONTRIBUTING,README}.rst -t \
+ "${pkgdir}/usr/share/doc/${pkgname}"
+}
Deleted: python-gilt-1.2.1-ls_path.patch
===================================================================
--- python-gilt-1.2.1-ls_path.patch 2020-03-18 22:03:47 UTC (rev 600702)
+++ python-gilt-1.2.1-ls_path.patch 2020-03-18 22:04:30 UTC (rev 600703)
@@ -1,23 +0,0 @@
-diff -ruN a/test/test_util.py b/test/test_util.py
---- a/test/test_util.py 2017-05-23 00:29:23.000000000 +0200
-+++ b/test/test_util.py 2020-03-14 17:57:20.716681417 +0100
-@@ -107,16 +107,16 @@
-
- def test_build_sh_cmd_simple_command():
- cmd = util.build_sh_cmd('ls')
-- assert b'/bin/ls' == cmd._path
-+ assert b'/bin/ls' in cmd._path
-
-
- def test_build_sh_cmd_command_with_args():
- cmd = util.build_sh_cmd('ls /tmp')
-- assert b'/bin/ls' == cmd._path
-+ assert b'/bin/ls' in cmd._path
- assert [b'/tmp'] == cmd._partial_baked_args
-
-
- def test_build_sh_cmd_command_with_cwd(temp_dir):
- cmd = util.build_sh_cmd('ls', cwd=temp_dir)
-- assert b'/bin/ls' == cmd._path
-+ assert b'/bin/ls' in cmd._path
- assert temp_dir == cmd._partial_call_args['cwd']
Copied: python-gilt/repos/community-any/python-gilt-1.2.1-ls_path.patch (from rev 600702, python-gilt/trunk/python-gilt-1.2.1-ls_path.patch)
===================================================================
--- python-gilt-1.2.1-ls_path.patch (rev 0)
+++ python-gilt-1.2.1-ls_path.patch 2020-03-18 22:04:30 UTC (rev 600703)
@@ -0,0 +1,32 @@
+diff -ruN a/test/test_util.py b/test/test_util.py
+--- a/test/test_util.py 2020-02-22 22:17:38.000000000 +0100
++++ b/test/test_util.py 2020-03-18 23:01:37.713174667 +0100
+@@ -106,17 +106,20 @@
+
+
+ def test_build_sh_cmd_simple_command():
+- cmd = util.build_sh_cmd('ls')
+- assert b'/bin/ls' == cmd._path
++ ls = sh.ls.bake()
++ cmd = util.build_sh_cmd("ls")
++ assert ls == cmd._path.decode()
+
+
+ def test_build_sh_cmd_command_with_args():
+- cmd = util.build_sh_cmd('ls /tmp')
+- assert b'/bin/ls' == cmd._path
+- assert [b'/tmp'] == cmd._partial_baked_args
++ ls = sh.ls.bake()
++ cmd = util.build_sh_cmd("ls /tmp")
++ assert ls == cmd._path.decode()
++ assert [b"/tmp"] == cmd._partial_baked_args
+
+
+ def test_build_sh_cmd_command_with_cwd(temp_dir):
+- cmd = util.build_sh_cmd('ls', cwd=temp_dir)
+- assert b'/bin/ls' == cmd._path
+- assert temp_dir == cmd._partial_call_args['cwd']
++ ls = sh.ls.bake()
++ cmd = util.build_sh_cmd("ls", cwd=temp_dir)
++ assert ls == cmd._path.decode()
++ assert temp_dir == cmd._partial_call_args["cwd"]
More information about the arch-commits
mailing list