[arch-commits] Commit in borg/repos (10 files)
Lukas Fleischer
lfleischer at archlinux.org
Tue Nov 15 17:00:12 UTC 2016
Date: Tuesday, November 15, 2016 @ 17:00:11
Author: lfleischer
Revision: 195980
archrelease: copy trunk to community-i686, community-x86_64
Added:
borg/repos/community-i686/PKGBUILD
(from rev 195979, borg/trunk/PKGBUILD)
borg/repos/community-i686/borg-1.0.8-fix-testsuite.patch
(from rev 195979, borg/trunk/borg-1.0.8-fix-testsuite.patch)
borg/repos/community-i686/borg.coveragerc
(from rev 195979, borg/trunk/borg.coveragerc)
borg/repos/community-x86_64/PKGBUILD
(from rev 195979, borg/trunk/PKGBUILD)
borg/repos/community-x86_64/borg-1.0.8-fix-testsuite.patch
(from rev 195979, borg/trunk/borg-1.0.8-fix-testsuite.patch)
borg/repos/community-x86_64/borg.coveragerc
(from rev 195979, 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 | 46 +++++++++
community-i686/PKGBUILD | 44 ---------
community-i686/borg-1.0.8-fix-testsuite.patch | 40 ++++++++
community-i686/borg.coveragerc | 18 ---
community-x86_64/PKGBUILD | 44 ---------
community-x86_64/borg-1.0.8-fix-testsuite.patch | 40 ++++++++
community-x86_64/borg.coveragerc | 18 ---
8 files changed, 228 insertions(+), 124 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-11-15 17:00:03 UTC (rev 195979)
+++ community-i686/PKGBUILD 2016-11-15 17:00:11 UTC (rev 195980)
@@ -1,44 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Vlad M. <vlad at archlinux.net>
-
-pkgname=borg
-_pkgname=borgbackup
-pkgver=1.0.7
-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://github.com/$_pkgname/$pkgname/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"
- borg.coveragerc)
-sha256sums=('203353a299b6ea0c092a1f23b6bb5414a0b795712c213c68f7a1f4c24be131d1'
- '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 195979, borg/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-11-15 17:00:11 UTC (rev 195980)
@@ -0,0 +1,51 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Vlad M. <vlad at archlinux.net>
+
+pkgname=borg
+_pkgname=borgbackup
+pkgver=1.0.8
+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://github.com/$_pkgname/$pkgname/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"
+ borg-1.0.8-fix-testsuite.patch
+ borg.coveragerc)
+sha256sums=('6902563c447c4f378ff1a13167f83d15eb60a02316a06368a539b7ff3d88aeb9'
+ '6e283d6a166c4823ea5af5b68cfc46c38e55124434a4f9f552bfb7f963b1401a'
+ '183814ae70fce7bbcf04dbbf3866eaf76867896a4327f8a3b553e095d1ff360f')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ patch -p1 -i ../borg-1.0.8-fix-testsuite.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
+}
Copied: borg/repos/community-i686/borg-1.0.8-fix-testsuite.patch (from rev 195979, borg/trunk/borg-1.0.8-fix-testsuite.patch)
===================================================================
--- community-i686/borg-1.0.8-fix-testsuite.patch (rev 0)
+++ community-i686/borg-1.0.8-fix-testsuite.patch 2016-11-15 17:00:11 UTC (rev 195980)
@@ -0,0 +1,40 @@
+From 960c42193acdab214217dd8a472f7f28d7ca5153 Mon Sep 17 00:00:00 2001
+From: Marian Beermann <public at enkore.de>
+Date: Sun, 13 Nov 2016 11:19:58 +0100
+Subject: [PATCH] fix tox build for environment-python != containing-python in
+ yet-another instance
+
+this instance: the repository worktree is *not* named borg.
+
+Cherry pick of 4f1157c into 1.0-maint due to f3efcdb
+
+TODO removed since we already did that after 1.0-maint, but 1.0-maint
+will never receive the change.
+---
+ conftest.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/conftest.py b/conftest.py
+index d80aed4..d542366 100644
+--- a/conftest.py
++++ b/conftest.py
+@@ -1,4 +1,5 @@
+ import os
++import os.path
+ import sys
+
+ import pytest
+@@ -10,12 +11,10 @@
+ # The workaround is to remove entries pointing there from the path and check whether "borg"
+ # is still importable. If it is not, then it has not been installed in the environment
+ # and the entries are put back.
+-#
+-# TODO: After moving the package to src/: remove this.
+
+ original_path = list(sys.path)
+ for entry in original_path:
+- if entry == '' or entry.endswith('/borg'):
++ if entry == '' or entry == os.path.dirname(__file__):
+ sys.path.remove(entry)
+
+ try:
Deleted: community-i686/borg.coveragerc
===================================================================
--- community-i686/borg.coveragerc 2016-11-15 17:00:03 UTC (rev 195979)
+++ community-i686/borg.coveragerc 2016-11-15 17:00:11 UTC (rev 195980)
@@ -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 195979, borg/trunk/borg.coveragerc)
===================================================================
--- community-i686/borg.coveragerc (rev 0)
+++ community-i686/borg.coveragerc 2016-11-15 17:00:11 UTC (rev 195980)
@@ -0,0 +1,23 @@
+[run]
+branch = True
+source = src/borg
+omit =
+ */borg/__init__.py
+ */borg/__main__.py
+ */borg/_version.py
+ */borg/fuse.py
+ */borg/support/*
+ */borg/testsuite/*
+ */borg/hash_sizes.py
+
+[report]
+exclude_lines =
+ pragma: no cover
+ pragma: freebsd only
+ pragma: unknown platform only
+ def __repr__
+ raise AssertionError
+ raise NotImplementedError
+ if 0:
+ if __name__ == .__main__.:
+ignore_errors = True
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-11-15 17:00:03 UTC (rev 195979)
+++ community-x86_64/PKGBUILD 2016-11-15 17:00:11 UTC (rev 195980)
@@ -1,44 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Vlad M. <vlad at archlinux.net>
-
-pkgname=borg
-_pkgname=borgbackup
-pkgver=1.0.7
-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://github.com/$_pkgname/$pkgname/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"
- borg.coveragerc)
-sha256sums=('203353a299b6ea0c092a1f23b6bb5414a0b795712c213c68f7a1f4c24be131d1'
- '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 195979, borg/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-11-15 17:00:11 UTC (rev 195980)
@@ -0,0 +1,51 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Vlad M. <vlad at archlinux.net>
+
+pkgname=borg
+_pkgname=borgbackup
+pkgver=1.0.8
+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://github.com/$_pkgname/$pkgname/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"
+ borg-1.0.8-fix-testsuite.patch
+ borg.coveragerc)
+sha256sums=('6902563c447c4f378ff1a13167f83d15eb60a02316a06368a539b7ff3d88aeb9'
+ '6e283d6a166c4823ea5af5b68cfc46c38e55124434a4f9f552bfb7f963b1401a'
+ '183814ae70fce7bbcf04dbbf3866eaf76867896a4327f8a3b553e095d1ff360f')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ patch -p1 -i ../borg-1.0.8-fix-testsuite.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
+}
Copied: borg/repos/community-x86_64/borg-1.0.8-fix-testsuite.patch (from rev 195979, borg/trunk/borg-1.0.8-fix-testsuite.patch)
===================================================================
--- community-x86_64/borg-1.0.8-fix-testsuite.patch (rev 0)
+++ community-x86_64/borg-1.0.8-fix-testsuite.patch 2016-11-15 17:00:11 UTC (rev 195980)
@@ -0,0 +1,40 @@
+From 960c42193acdab214217dd8a472f7f28d7ca5153 Mon Sep 17 00:00:00 2001
+From: Marian Beermann <public at enkore.de>
+Date: Sun, 13 Nov 2016 11:19:58 +0100
+Subject: [PATCH] fix tox build for environment-python != containing-python in
+ yet-another instance
+
+this instance: the repository worktree is *not* named borg.
+
+Cherry pick of 4f1157c into 1.0-maint due to f3efcdb
+
+TODO removed since we already did that after 1.0-maint, but 1.0-maint
+will never receive the change.
+---
+ conftest.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/conftest.py b/conftest.py
+index d80aed4..d542366 100644
+--- a/conftest.py
++++ b/conftest.py
+@@ -1,4 +1,5 @@
+ import os
++import os.path
+ import sys
+
+ import pytest
+@@ -10,12 +11,10 @@
+ # The workaround is to remove entries pointing there from the path and check whether "borg"
+ # is still importable. If it is not, then it has not been installed in the environment
+ # and the entries are put back.
+-#
+-# TODO: After moving the package to src/: remove this.
+
+ original_path = list(sys.path)
+ for entry in original_path:
+- if entry == '' or entry.endswith('/borg'):
++ if entry == '' or entry == os.path.dirname(__file__):
+ sys.path.remove(entry)
+
+ try:
Deleted: community-x86_64/borg.coveragerc
===================================================================
--- community-x86_64/borg.coveragerc 2016-11-15 17:00:03 UTC (rev 195979)
+++ community-x86_64/borg.coveragerc 2016-11-15 17:00:11 UTC (rev 195980)
@@ -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 195979, borg/trunk/borg.coveragerc)
===================================================================
--- community-x86_64/borg.coveragerc (rev 0)
+++ community-x86_64/borg.coveragerc 2016-11-15 17:00:11 UTC (rev 195980)
@@ -0,0 +1,23 @@
+[run]
+branch = True
+source = src/borg
+omit =
+ */borg/__init__.py
+ */borg/__main__.py
+ */borg/_version.py
+ */borg/fuse.py
+ */borg/support/*
+ */borg/testsuite/*
+ */borg/hash_sizes.py
+
+[report]
+exclude_lines =
+ pragma: no cover
+ pragma: freebsd only
+ pragma: unknown platform only
+ def __repr__
+ raise AssertionError
+ raise NotImplementedError
+ if 0:
+ if __name__ == .__main__.:
+ignore_errors = True
More information about the arch-commits
mailing list