[arch-commits] Commit in borg/repos (10 files)
Lukas Fleischer
lfleischer at archlinux.org
Sat Feb 20 09:39:43 UTC 2016
Date: Saturday, February 20, 2016 @ 10:39:43
Author: lfleischer
Revision: 162641
archrelease: copy trunk to community-i686, community-x86_64
Added:
borg/repos/community-i686/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch
(from rev 162640, borg/trunk/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch)
borg/repos/community-i686/PKGBUILD
(from rev 162640, borg/trunk/PKGBUILD)
borg/repos/community-i686/borg.coveragerc
(from rev 162640, borg/trunk/borg.coveragerc)
borg/repos/community-x86_64/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch
(from rev 162640, borg/trunk/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch)
borg/repos/community-x86_64/PKGBUILD
(from rev 162640, borg/trunk/PKGBUILD)
borg/repos/community-x86_64/borg.coveragerc
(from rev 162640, borg/trunk/borg.coveragerc)
Deleted:
borg/repos/community-i686/PKGBUILD
borg/repos/community-i686/borg.coveragerc
borg/repos/community-x86_64/PKGBUILD
borg/repos/community-x86_64/borg.coveragerc
----------------------------------------------------------------------------------+
/PKGBUILD | 102 ++++++++++
/borg.coveragerc | 36 +++
community-i686/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch | 28 ++
community-i686/PKGBUILD | 44 ----
community-i686/borg.coveragerc | 18 -
community-x86_64/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch | 28 ++
community-x86_64/PKGBUILD | 44 ----
community-x86_64/borg.coveragerc | 18 -
8 files changed, 194 insertions(+), 124 deletions(-)
Copied: borg/repos/community-i686/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch (from rev 162640, borg/trunk/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch)
===================================================================
--- community-i686/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch (rev 0)
+++ community-i686/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch 2016-02-20 09:39:43 UTC (rev 162641)
@@ -0,0 +1,28 @@
+From 7165e1d571ab82bb80c6b03a413e2667aa567049 Mon Sep 17 00:00:00 2001
+From: Lukas Fleischer <lfleischer at archlinux.org>
+Date: Sat, 20 Feb 2016 10:17:37 +0100
+Subject: [PATCH] Revert "require msgpack==0.4.6 - no python 3.2 support in
+ 0.4.7+"
+
+This reverts commit a9f2f65154d64cf711c864977a6f8aadeae47d18.
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 60b9f65..08e5179 100644
+--- a/setup.py
++++ b/setup.py
+@@ -19,8 +19,7 @@ on_rtd = os.environ.get('READTHEDOCS')
+
+ # msgpack pure python data corruption was fixed in 0.4.6.
+ # Also, we might use some rather recent API features.
+-# Note: 0.4.7 is also OK, but has no Python 3.2 support any more.
+-install_requires=['msgpack-python==0.4.6', ]
++install_requires=['msgpack-python>=0.4.6', ]
+
+ extras_require = {
+ # llfuse 0.40 (tested, proven, ok), needs FUSE version >= 2.8.0
+--
+2.7.1
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-02-20 09:39:28 UTC (rev 162640)
+++ community-i686/PKGBUILD 2016-02-20 09:39:43 UTC (rev 162641)
@@ -1,44 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Vlad M. <vlad at archlinux.net>
-
-pkgname=borg
-_pkgname=borgbackup
-pkgver=0.30.1
-pkgrel=1
-pkgdesc='Deduplicating backup program with compression and authenticated encryption'
-url='https://borgbackup.github.io/'
-license=('BSD')
-arch=('i686' 'x86_64')
-depends=('acl' 'lz4' 'openssl' 'python-msgpack' 'python-setuptools' 'xz')
-optdepends=('openssh: repositories on remote hosts'
- 'python-llfuse: mounting backups as a FUSE file system')
-makedepends=('cython' 'python-sphinx')
-checkdepends=('python-pytest' 'python-pytest-cov' 'python-pytest-benchmark' 'python-mock')
-provides=('borgbackup')
-replaces=('borgbackup')
-source=("https://pypi.python.org/packages/source/b/$_pkgname/$_pkgname-$pkgver.tar.gz"
- borg.coveragerc)
-sha256sums=('775a2a4b5441fa239e6c3c87e7f08f830449046d045ed938a9bce2edfa5a2184'
- '024bf101b25f9d35b83f86ce794c85f404d7acb212e047b4fca68b108dff21a7')
-
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
- python setup.py build
-
- cd docs
- make man
-}
-
-check() {
- cd "$srcdir/$_pkgname-$pkgver/build/lib.linux-$CARCH-3.5/"
- LANG=en_US.UTF-8 PYTHONPATH="$PWD:$PYTHONPATH" py.test --cov=borg \
- --cov-config="$srcdir/borg.coveragerc" --benchmark-skip --pyargs borg.testsuite -v \
- -k 'not test_non_ascii_acl'
-}
-
-package() {
- cd "$srcdir/$_pkgname-$pkgver"
- install -Dm644 "docs/_build/man/borg.1" "$pkgdir/usr/share/man/man1/borg.1"
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- python setup.py -q install --root="$pkgdir" --optimize=1
-}
Copied: borg/repos/community-i686/PKGBUILD (from rev 162640, borg/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-02-20 09:39:43 UTC (rev 162641)
@@ -0,0 +1,51 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Vlad M. <vlad at archlinux.net>
+
+pkgname=borg
+_pkgname=borgbackup
+pkgver=0.30.1
+pkgrel=2
+pkgdesc='Deduplicating backup program with compression and authenticated encryption'
+url='https://borgbackup.github.io/'
+license=('BSD')
+arch=('i686' 'x86_64')
+depends=('acl' 'lz4' 'openssl' 'python-msgpack' 'python-setuptools' 'xz')
+optdepends=('openssh: repositories on remote hosts'
+ 'python-llfuse: mounting backups as a FUSE file system')
+makedepends=('cython' 'python-sphinx')
+checkdepends=('python-pytest' 'python-pytest-cov' 'python-pytest-benchmark' 'python-mock')
+provides=('borgbackup')
+replaces=('borgbackup')
+source=("https://pypi.python.org/packages/source/b/$_pkgname/$_pkgname-$pkgver.tar.gz"
+ '0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch'
+ borg.coveragerc)
+sha256sums=('775a2a4b5441fa239e6c3c87e7f08f830449046d045ed938a9bce2edfa5a2184'
+ '891a79963857e62fdd0acff7f939947d25bb8aa66421ce41dd0808bbbf304cb7'
+ '024bf101b25f9d35b83f86ce794c85f404d7acb212e047b4fca68b108dff21a7')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ patch -p1 -i ../0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch
+}
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ python setup.py build
+
+ cd docs
+ make man
+}
+
+check() {
+ cd "$srcdir/$_pkgname-$pkgver/build/lib.linux-$CARCH-3.5/"
+ LANG=en_US.UTF-8 PYTHONPATH="$PWD:$PYTHONPATH" py.test --cov=borg \
+ --cov-config="$srcdir/borg.coveragerc" --benchmark-skip --pyargs borg.testsuite -v \
+ -k 'not test_non_ascii_acl'
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ install -Dm644 "docs/_build/man/borg.1" "$pkgdir/usr/share/man/man1/borg.1"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ python setup.py -q install --root="$pkgdir" --optimize=1
+}
Deleted: community-i686/borg.coveragerc
===================================================================
--- community-i686/borg.coveragerc 2016-02-20 09:39:28 UTC (rev 162640)
+++ community-i686/borg.coveragerc 2016-02-20 09:39:43 UTC (rev 162641)
@@ -1,18 +0,0 @@
-[run]
-branch = True
-source = borg
-omit =
- borg/__init__.py
- borg/__main__.py
- borg/_version.py
- borg/support/*.py
-
-[report]
-exclude_lines =
- pragma: no cover
- def __repr__
- raise AssertionError
- raise NotImplementedError
- if 0:
- if __name__ == .__main__.:
-ignore_errors = True
Copied: borg/repos/community-i686/borg.coveragerc (from rev 162640, borg/trunk/borg.coveragerc)
===================================================================
--- community-i686/borg.coveragerc (rev 0)
+++ community-i686/borg.coveragerc 2016-02-20 09:39:43 UTC (rev 162641)
@@ -0,0 +1,18 @@
+[run]
+branch = True
+source = borg
+omit =
+ borg/__init__.py
+ borg/__main__.py
+ borg/_version.py
+ borg/support/*.py
+
+[report]
+exclude_lines =
+ pragma: no cover
+ def __repr__
+ raise AssertionError
+ raise NotImplementedError
+ if 0:
+ if __name__ == .__main__.:
+ignore_errors = True
Copied: borg/repos/community-x86_64/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch (from rev 162640, borg/trunk/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch)
===================================================================
--- community-x86_64/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch (rev 0)
+++ community-x86_64/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch 2016-02-20 09:39:43 UTC (rev 162641)
@@ -0,0 +1,28 @@
+From 7165e1d571ab82bb80c6b03a413e2667aa567049 Mon Sep 17 00:00:00 2001
+From: Lukas Fleischer <lfleischer at archlinux.org>
+Date: Sat, 20 Feb 2016 10:17:37 +0100
+Subject: [PATCH] Revert "require msgpack==0.4.6 - no python 3.2 support in
+ 0.4.7+"
+
+This reverts commit a9f2f65154d64cf711c864977a6f8aadeae47d18.
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 60b9f65..08e5179 100644
+--- a/setup.py
++++ b/setup.py
+@@ -19,8 +19,7 @@ on_rtd = os.environ.get('READTHEDOCS')
+
+ # msgpack pure python data corruption was fixed in 0.4.6.
+ # Also, we might use some rather recent API features.
+-# Note: 0.4.7 is also OK, but has no Python 3.2 support any more.
+-install_requires=['msgpack-python==0.4.6', ]
++install_requires=['msgpack-python>=0.4.6', ]
+
+ extras_require = {
+ # llfuse 0.40 (tested, proven, ok), needs FUSE version >= 2.8.0
+--
+2.7.1
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-02-20 09:39:28 UTC (rev 162640)
+++ community-x86_64/PKGBUILD 2016-02-20 09:39:43 UTC (rev 162641)
@@ -1,44 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Vlad M. <vlad at archlinux.net>
-
-pkgname=borg
-_pkgname=borgbackup
-pkgver=0.30.1
-pkgrel=1
-pkgdesc='Deduplicating backup program with compression and authenticated encryption'
-url='https://borgbackup.github.io/'
-license=('BSD')
-arch=('i686' 'x86_64')
-depends=('acl' 'lz4' 'openssl' 'python-msgpack' 'python-setuptools' 'xz')
-optdepends=('openssh: repositories on remote hosts'
- 'python-llfuse: mounting backups as a FUSE file system')
-makedepends=('cython' 'python-sphinx')
-checkdepends=('python-pytest' 'python-pytest-cov' 'python-pytest-benchmark' 'python-mock')
-provides=('borgbackup')
-replaces=('borgbackup')
-source=("https://pypi.python.org/packages/source/b/$_pkgname/$_pkgname-$pkgver.tar.gz"
- borg.coveragerc)
-sha256sums=('775a2a4b5441fa239e6c3c87e7f08f830449046d045ed938a9bce2edfa5a2184'
- '024bf101b25f9d35b83f86ce794c85f404d7acb212e047b4fca68b108dff21a7')
-
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
- python setup.py build
-
- cd docs
- make man
-}
-
-check() {
- cd "$srcdir/$_pkgname-$pkgver/build/lib.linux-$CARCH-3.5/"
- LANG=en_US.UTF-8 PYTHONPATH="$PWD:$PYTHONPATH" py.test --cov=borg \
- --cov-config="$srcdir/borg.coveragerc" --benchmark-skip --pyargs borg.testsuite -v \
- -k 'not test_non_ascii_acl'
-}
-
-package() {
- cd "$srcdir/$_pkgname-$pkgver"
- install -Dm644 "docs/_build/man/borg.1" "$pkgdir/usr/share/man/man1/borg.1"
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- python setup.py -q install --root="$pkgdir" --optimize=1
-}
Copied: borg/repos/community-x86_64/PKGBUILD (from rev 162640, borg/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-02-20 09:39:43 UTC (rev 162641)
@@ -0,0 +1,51 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Vlad M. <vlad at archlinux.net>
+
+pkgname=borg
+_pkgname=borgbackup
+pkgver=0.30.1
+pkgrel=2
+pkgdesc='Deduplicating backup program with compression and authenticated encryption'
+url='https://borgbackup.github.io/'
+license=('BSD')
+arch=('i686' 'x86_64')
+depends=('acl' 'lz4' 'openssl' 'python-msgpack' 'python-setuptools' 'xz')
+optdepends=('openssh: repositories on remote hosts'
+ 'python-llfuse: mounting backups as a FUSE file system')
+makedepends=('cython' 'python-sphinx')
+checkdepends=('python-pytest' 'python-pytest-cov' 'python-pytest-benchmark' 'python-mock')
+provides=('borgbackup')
+replaces=('borgbackup')
+source=("https://pypi.python.org/packages/source/b/$_pkgname/$_pkgname-$pkgver.tar.gz"
+ '0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch'
+ borg.coveragerc)
+sha256sums=('775a2a4b5441fa239e6c3c87e7f08f830449046d045ed938a9bce2edfa5a2184'
+ '891a79963857e62fdd0acff7f939947d25bb8aa66421ce41dd0808bbbf304cb7'
+ '024bf101b25f9d35b83f86ce794c85f404d7acb212e047b4fca68b108dff21a7')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ patch -p1 -i ../0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch
+}
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ python setup.py build
+
+ cd docs
+ make man
+}
+
+check() {
+ cd "$srcdir/$_pkgname-$pkgver/build/lib.linux-$CARCH-3.5/"
+ LANG=en_US.UTF-8 PYTHONPATH="$PWD:$PYTHONPATH" py.test --cov=borg \
+ --cov-config="$srcdir/borg.coveragerc" --benchmark-skip --pyargs borg.testsuite -v \
+ -k 'not test_non_ascii_acl'
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ install -Dm644 "docs/_build/man/borg.1" "$pkgdir/usr/share/man/man1/borg.1"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ python setup.py -q install --root="$pkgdir" --optimize=1
+}
Deleted: community-x86_64/borg.coveragerc
===================================================================
--- community-x86_64/borg.coveragerc 2016-02-20 09:39:28 UTC (rev 162640)
+++ community-x86_64/borg.coveragerc 2016-02-20 09:39:43 UTC (rev 162641)
@@ -1,18 +0,0 @@
-[run]
-branch = True
-source = borg
-omit =
- borg/__init__.py
- borg/__main__.py
- borg/_version.py
- borg/support/*.py
-
-[report]
-exclude_lines =
- pragma: no cover
- def __repr__
- raise AssertionError
- raise NotImplementedError
- if 0:
- if __name__ == .__main__.:
-ignore_errors = True
Copied: borg/repos/community-x86_64/borg.coveragerc (from rev 162640, borg/trunk/borg.coveragerc)
===================================================================
--- community-x86_64/borg.coveragerc (rev 0)
+++ community-x86_64/borg.coveragerc 2016-02-20 09:39:43 UTC (rev 162641)
@@ -0,0 +1,18 @@
+[run]
+branch = True
+source = borg
+omit =
+ borg/__init__.py
+ borg/__main__.py
+ borg/_version.py
+ borg/support/*.py
+
+[report]
+exclude_lines =
+ pragma: no cover
+ def __repr__
+ raise AssertionError
+ raise NotImplementedError
+ if 0:
+ if __name__ == .__main__.:
+ignore_errors = True
More information about the arch-commits
mailing list