[arch-commits] Commit in docker-compose/trunk (2 files)

[Felix Yan]

    Date: Wednesday, May 4, 2016 @ 06:53:20
  Author: fyan
Revision: 173651

upgpkg: docker-compose 1.7.0-1

Modified:
  docker-compose/trunk/PKGBUILD
Deleted:
  docker-compose/trunk/remove-requires-upper-bound.patch

-----------------------------------+
 PKGBUILD                          |   32 +++++++++++++++++++++-----------
 remove-requires-upper-bound.patch |   29 -----------------------------
 2 files changed, 21 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-04 04:38:04 UTC (rev 173650)
+++ PKGBUILD	2016-05-04 04:53:20 UTC (rev 173651)
@@ -5,7 +5,7 @@
 # Contributor: Josh VanderLinden <arch at cloudlery.com>
 
 pkgname=docker-compose
-pkgver=1.6.2
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="Fast, isolated development environments using Docker"
 arch=('i686' 'x86_64')
@@ -13,29 +13,39 @@
 depends=('python-docopt' 'python-yaml' 'python-requests' 'python-six' 'python-texttable'
          'python-websocket-client' 'python-docker-py' 'python-dockerpty' 'python-setuptools'
          'python-jsonschema' 'python-cached-property')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/docker/compose/archive/$pkgver.tar.gz"
-        "remove-requires-upper-bound.patch")
+depends_x86_64+=('docker')
+makedepends=('git')
+checkdepends=('python-pytest-runner' 'python-mock')
+source=("git+https://github.com/docker/compose.git#tag=$pkgver")
 license=("BSD")
-sha256sums=('1c318cdf12bdc97e079224fb0cab45ed0f6ec2d1ce87599eff549b1aafa27837'
-            '2c36ce2f440f31bd0d2c560f97557b3b57036aa377c3423e87df6647b31faebe')
+sha256sums=('SKIP')
 
-[[ "$CARCH" == "x86_64" ]] && depends+=('docker')
-
 prepare() {
-  cd "$srcdir/compose-$pkgver"
+  cd compose
 
   # Remove upper bound on requires
-  patch -p1 -i "$srcdir/remove-requires-upper-bound.patch"
   sed -i 's/==/>=/g' requirements.txt
+  sed -i "s/, < .*',$/',/" setup.py
 }
 
 build() {
-  cd "$srcdir/compose-$pkgver"
+  cd compose
+
+  ./script/build/write-git-sha
   python setup.py build
 }
 
+check() {
+  # Hack entry points by installing it
+  # TODO: need a running docker daemon to test
+
+  cd compose
+  python setup.py install --root="$PWD/tmp_install" --optimize=1
+  # PATH="$PWD/tmp_install/usr/bin:$PATH" PYTHONPATH="$PWD/tmp_install/usr/lib/python3.5/site-packages:$PYTHONPATH" python setup.py ptr
+}
+
 package() {
-  cd "$srcdir/compose-$pkgver"
+  cd compose
 
   python setup.py install -O1 --root="$pkgdir"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"

Deleted: remove-requires-upper-bound.patch
===================================================================
--- remove-requires-upper-bound.patch	2016-05-04 04:38:04 UTC (rev 173650)
+++ remove-requires-upper-bound.patch	2016-05-04 04:53:20 UTC (rev 173651)
@@ -1,29 +0,0 @@
---- compose-1.3.0/setup.py.orig	2015-06-18 20:25:10.000000000 +0200
-+++ compose-1.3.0/setup.py	2015-06-21 17:27:42.319085182 +0200
-@@ -25,15 +25,15 @@
- 
- 
- install_requires = [
--    'cached-property >= 1.2.0, < 2',
--    'docopt >= 0.6.1, < 0.7',
--    'PyYAML >= 3.10, < 4',
--    'requests >= 2.6.1, < 2.8',
--    'texttable >= 0.8.1, < 0.9',
--    'websocket-client >= 0.32.0, < 1.0',
--    'docker-py >= 1.7.0, < 2',
--    'dockerpty >= 0.4.1, < 0.5',
--    'six >= 1.3.0, < 2',
--    'jsonschema >= 2.5.1, < 3',
-+    'cached-property >= 1.2.0',
-+    'docopt >= 0.6.1',
-+    'PyYAML >= 3.10',
-+    'requests >= 2.6.1',
-+    'texttable >= 0.8.1',
-+    'websocket-client >= 0.32.0',
-+    'docker-py >= 1.7.0',
-+    'dockerpty >= 0.4.1',
-+    'six >= 1.3.0',
-+    'jsonschema >= 2.5.1',
- ]
- 
-