From 2ff4559b49b325252ef921be254f2ee800d212ac Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 14 Dec 2016 11:27:11 +0100
Subject: gnu: python-hacking: Disable tests.

* gnu/packages/openstack.scm (python-hacking, python2-hacking)[arguments]:
Set #:tests? #f.
---
 gnu/packages/openstack.scm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index e2672668d8..e4610c150b 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -113,6 +113,9 @@ manner.")
         (base32
          "1a310k3dv04jg7zvmk37h2ql7y9kf4hvdxb74bjlwdxgmy6h4wap"))))
     (build-system python-build-system)
+    (arguments
+     ;; TODO: Requires unpackaged 'eventlet'.
+     '(#:tests? #f))
     (propagated-inputs
       `(("python-flake8-2.2.4" ,python-flake8-2.2.4)
         ("python-mccabe-0.2.1" ,python-mccabe-0.2.1)
-- 
cgit 1.4.1


From ea8907c5d5df89b26d67a7b067cb8c341714ed9b Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 14 Dec 2016 12:02:45 +0100
Subject: gnu: python-mox3: Disable tests.

* gnu/packages/openstack.scm (python-mox3, python2-mox3)[arguments]: Disable
  tests.
  [native-inputs]: Add python-oslosphinx and python-sphinx.
---
 gnu/packages/openstack.scm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index e4610c150b..a91759faa0 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -149,9 +149,14 @@ guidelines}.")
           (base32
            "0njmh40i1lg5mzn9hc2ax83adj6dli455j6xifilrw27c4wlkjzx"))))
     (build-system python-build-system)
+    (arguments
+     ;; TODO: Requires newer version of testtools (>=1.4.0).
+     '(#:tests? #f))
     (native-inputs
       `(("python-fixtures" ,python-fixtures)
+        ("python-oslosphinx" ,python-oslosphinx)
         ("python-pbr" ,python-pbr)
+        ("python-sphinx" ,python-sphinx)
         ("python-testtools" ,python-testtools)))
     (home-page "http://www.openstack.org/")
     (synopsis "Mock object framework for Python")
-- 
cgit 1.4.1


From 767c7e0ed1d9f8bec64fa5254570a1f2d75ce847 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Dec 2016 13:23:56 +0100
Subject: gnu: python-debtcollector: Disable tests.

* gnu/packages/openstack.scm (python-debtcollector,
  python2-debtcollector)[arguments]: Set #:tests? #f.
---
 gnu/packages/openstack.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index a91759faa0..7ffd9a2325 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -81,6 +81,8 @@ all the files it generates a report.")
           (base32
            "0g4dfskaiy47rhsh4gh66l5vmdsrgq0qk68pl3ix1cj3ffvfndzv"))))
     (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ;FIXME: Requires packaging python-doc8.
     (propagated-inputs
      `(("python-six" ,python-six)
        ("python-wrapt" ,python-wrapt)))
-- 
cgit 1.4.1


From f30e53369bd64b572c1195a53a28d294da160336 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Dec 2016 13:31:31 +0100
Subject: gnu: python-oslo.context: Disable tests.

* gnu/packages/openstack.scm (python-oslo.context,
  python2-oslo.context)[arguments]: Set #:tests? #f.
  [native-inputs]: Add python-coverage, python-hacking, python-mock,
  python-os-client-config, python-oslosphinx and python-sphinx.
---
 gnu/packages/openstack.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 7ffd9a2325..ad0c028af8 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -405,11 +405,19 @@ common features used in Tempest.")
         (base32
          "0kvha0rs9295njyl2z6n6zm5dapi5mrl5zwjm0m6ldqrvccyf8c3"))))
     (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; FIXME: Requires python-mock >= 1.2.
     (native-inputs
       `(("python-babel" ,python-babel)
         ("python-pbr" ,python-pbr)
         ;; Tests.
-        ("python-oslotest" ,python-oslotest)))
+        ("python-coverage" ,python-coverage)
+        ("python-hacking" ,python-hacking)
+        ("python-mock" ,python-mock)
+        ("python-os-client-config" ,python-os-client-config)
+        ("python-oslotest" ,python-oslotest)
+        ("python-oslosphinx" ,python-oslosphinx)
+        ("python-sphinx" ,python-sphinx)))
     (home-page "http://launchpad.net/oslo")
     (synopsis "Oslo context library")
     (description
-- 
cgit 1.4.1


From bb56d9a18ce0f91131b202351a0496ad39103483 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Dec 2016 13:35:57 +0100
Subject: gnu: python-oslo.i18n: Disable tests.

* gnu/packages/openstack.scm (python-oslo.i18n, python2-oslo.i18n)[arguments]:
  Set #:tests? #f.
---
 gnu/packages/openstack.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index ad0c028af8..4bd44d005a 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -441,6 +441,8 @@ pipeline and used by various modules such as logging.")
           (base32
            "0bpb1c20sm8my650gl824nzaip83bfn8hr91s65k5ncmyh8hb6pl"))))
     (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; FIXME: Circular dependency on python-oslo.config.
     (propagated-inputs
       `(("python-babel" ,python-babel)
         ("python-six" ,python-six)))
-- 
cgit 1.4.1


From 130f68ec3bc2efb6895986435c2ff8043bbaa417 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Dec 2016 13:45:07 +0100
Subject: gnu: python-stevedore: Fix tests.

* gnu/packages/openstack.scm (python-stevedore,
  python2-stevedore)[native-inputs]: Add python-discover, python-oslosphinx,
  python-sphinx and python-testrepository.
---
 gnu/packages/openstack.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 4bd44d005a..9c43ea9c6a 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -292,10 +292,13 @@ portions of your testing code.")
     (native-inputs
       `(("python-pbr" ,python-pbr)
         ;; Tests
+        ("python-discover" ,python-discover)
         ("python-docutils" ,python-docutils)
         ("python-mock" ,python-mock)
+        ("python-oslosphinx" ,python-oslosphinx)
         ("python-oslotest" ,python-oslotest)
-        ("python-sphinx" ,python-sphinx)))
+        ("python-sphinx" ,python-sphinx)
+        ("python-testrepository" ,python-testrepository)))
     (home-page "https://github.com/dreamhost/stevedore")
     (synopsis "Manage dynamic plugins for Python applications")
     (description
-- 
cgit 1.4.1


From d9184f4f76443011130944f7a2ca7fa75bad7aea Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Dec 2016 13:49:08 +0100
Subject: gnu: python-oslo.config: Disable tests.

* gnu/packages/openstack.scm (python-oslo.config,
  python2-oslo.config)[arguments]: Set #:tests? #f.
---
 gnu/packages/openstack.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 9c43ea9c6a..2a1313c4bd 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -375,6 +375,8 @@ common features used in Tempest.")
          (base32
           "13r778jfb0fhna37c2pd1f2xipnsbd7zli7qhn96acrzymrwj5k1"))))
     (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; FIXME: Requires packaging python-argparse.
     (propagated-inputs
       `(("python-netaddr" ,python-netaddr)
         ("python-six" ,python-six)
-- 
cgit 1.4.1


From ad59ebda5350b94885475980dfdb1a6be8eda2d5 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Dec 2016 13:50:55 +0100
Subject: gnu: python-oslo.utils: Disable tests.

* gnu/packages/openstack.scm (python-oslo.utils,
  python2-oslo.utils)[arguments]: Set #:tests? #f.
  [native-inputs]: Add python-bandit and python-oslo.config.
---
 gnu/packages/openstack.scm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 2a1313c4bd..d05d9caf48 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -628,6 +628,8 @@ and better support for mocking results.")
             ;; phase.
             (delete-file "oslo_utils/tests/test_netutils.py")))))
     (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; FIXME: Requires oslo.config >= 2.7.0.
     (propagated-inputs
       `(("python-debtcollector" ,python-debtcollector)
         ("python-oslo.i18n" ,python-oslo.i18n)
@@ -641,6 +643,8 @@ and better support for mocking results.")
       `(("python-babel" ,python-babel)
         ("python-pbr" ,python-pbr)
         ;; Tests.
+        ("python-bandit" ,python-bandit)
+        ("python-oslo.config" ,python-oslo.config)
         ("python-oslotest" ,python-oslotest)
         ("python-mock" ,python-mock)
         ("python-mox3" ,python-mox3)
-- 
cgit 1.4.1


From 5ae31b547cda78025a5a9f4d29b0cda511ec66d6 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Dec 2016 13:55:54 +0100
Subject: gnu: python-oslo.serialization: Disable tests.

* gnu/packages/openstack.scm (python-oslo.serialization,
  python2-oslo.serialization)[arguments]: Set #:tests? #f.
---
 gnu/packages/openstack.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index d05d9caf48..97fdabffa7 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -521,6 +521,8 @@ handlers and support for context specific logging (like resource id’s etc).")
         (base32
          "00s03krhf833gs76aw5ns32w9m1i4hx6x6d9g82m0j5wyqk0sci4"))))
     (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; FIXME: Requires python-oslo.utils >= 3.2.0.
     (propagated-inputs
       `(("python-iso8601" ,python-iso8601)
         ("python-netaddr" ,python-netaddr)
-- 
cgit 1.4.1


From 73b494a11de3eb59fdbcd73f2c90e74c4fc08924 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Dec 2016 15:22:16 +0100
Subject: gnu: python-oslo.log: Disable tests.

* gnu/packages/openstack.scm (python-oslo.log, python2-oslo.log)[arguments]:
  Set #:tests? #f.
---
 gnu/packages/openstack.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 97fdabffa7..080f283b2a 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -484,6 +484,8 @@ in an application or library.")
         (base32
           "1fhy6yvbd565nv4x4i3ppyrlbmz3yy9d0xsvw5nkqsa7g43nmf8z"))))
   (build-system python-build-system)
+  (arguments
+   '(#:tests? #f)) ; FIXME: Requires oslo.utils >= 3.2.0.
   (propagated-inputs
    `(("python-debtcollector" ,python-debtcollector)
      ("python-oslo.config" ,python-oslo.config)
-- 
cgit 1.4.1


From f959495ba06d77194d843ea729c39aaa8a168051 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Dec 2016 15:23:39 +0100
Subject: gnu: python-tempest-lib: Disable tests.

* gnu/packages/openstack.scm (python-tempest-lib,
  python2-tempest-lib)[arguments]: Set #:tests? #f.
---
 gnu/packages/openstack.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 080f283b2a..33a54e3ab9 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -328,7 +328,8 @@ extensions.")
         "1cpp2vwmawpd29hjsklsps181lq2ah91cl412qvpnz228nf9sqn5"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases
+     `(#:tests? #f ; FIXME: Requires oslo.log >= 1.14.0.
+       #:phases
        (modify-phases %standard-phases
          (add-before
           'check 'pre-check
-- 
cgit 1.4.1


From bfba083684e80d2bc23e3c07205e3d63910e978f Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Dec 2016 16:53:55 +0100
Subject: gnu: python-keystoneclient: Disable tests.

* gnu/packages/openstack.scm (python-keystoneclient,
  python2-keystoneclient)[arguments]: Set #:tests? #f.
---
 gnu/packages/openstack.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 33a54e3ab9..b3e3f08c23 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -677,6 +677,8 @@ handling.")
          (base32
           "1w4csvkah67rfpxylxnvs2s3594i0f9isy8pf4gnsqs5zirvjaa4"))))
     (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; FIXME: Many tests are failing.
     (native-inputs
      `(("python-sphinx" ,python-sphinx)
        ;; and some packages for the tests
-- 
cgit 1.4.1


From 376c4619cf8ad683fba5d04513a5298c0a77cfdb Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Wed, 18 Jan 2017 08:53:04 +0100
Subject: gnu: python-mox3: Remove python-oslosphinx dependency (since the
 tests don't run anyway).

* gnu/packages/openstack.scm (python-mox3)[native-inputs]: Remove python-oslosphinx.
---
 gnu/packages/openstack.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index b3e3f08c23..2500590b2f 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -152,11 +152,11 @@ guidelines}.")
            "0njmh40i1lg5mzn9hc2ax83adj6dli455j6xifilrw27c4wlkjzx"))))
     (build-system python-build-system)
     (arguments
-     ;; TODO: Requires newer version of testtools (>=1.4.0).
+     ;; TODO: Resolve dependency cycle and re-enable.
      '(#:tests? #f))
     (native-inputs
       `(("python-fixtures" ,python-fixtures)
-        ("python-oslosphinx" ,python-oslosphinx)
+        ; TODO re-add ("python-oslosphinx" ,python-oslosphinx)
         ("python-pbr" ,python-pbr)
         ("python-sphinx" ,python-sphinx)
         ("python-testtools" ,python-testtools)))
-- 
cgit 1.4.1


From c8d7e063d0b576615fb481e0abc55c0aeab609b8 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Wed, 18 Jan 2017 08:53:03 +0100
Subject: gnu: Add python-reno.

* gnu/packages/openstack.scm (python-reno, python-reno2): New variables.
---
 gnu/packages/openstack.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 2500590b2f..5bb83095a0 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -19,6 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages openstack)
+  #:use-module (gnu packages gnupg)
   #:use-module (gnu packages python)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
@@ -550,6 +551,47 @@ in transmittable and storable formats, such as JSON and MessagePack.")
 (define-public python2-oslo.serialization
   (package-with-python2 python-oslo.serialization))
 
+(define-public python-reno
+  (package
+    (name "python-reno")
+    (version "2.0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "reno" version))
+        (sha256
+          (base32 "1i2wnn5fnm3jm5774pahg000q0lma5i913hml91bbbm2mybphndd"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'init-git
+           (lambda _
+             ;; reno expects a git repo
+             (zero? (system* "git" "init")))))))
+    (propagated-inputs
+      `(("python-babel" ,python-babel)
+        ("python-dulwich" ,python-dulwich)
+        ("python-pyyaml" ,python-pyyaml)
+        ("python-six" ,python-six)))
+    (native-inputs
+      `(("python-testtools" ,python-testtools)
+        ("python-pbr" ,python-pbr)
+        ("python-testscenarios" ,python-testscenarios)
+        ("python-testrepository" ,python-testrepository)
+        ("python-mock" ,python-mock)
+        ("python-oslotest" ,python-oslotest)
+        ("gnupg" ,gnupg)
+        ("git" ,git)))
+    (home-page "http://docs.openstack.org/developer/reno/")
+    (synopsis "Release notes manager")
+    (description "Reno is a tool for storing release notes in a git repository
+and building documentation from them.")
+    (license asl2.0)))
+
+(define-public python2-reno
+  (package-with-python2 python-reno))
+
 (define-public python-oslosphinx
   (package
     (name "python-oslosphinx")
-- 
cgit 1.4.1


From 23015b4fb4dd7964d37165687ca1fa6dc796a4f4 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 14 Feb 2017 00:15:27 +0100
Subject: gnu: python-oslosphinx: Disable tests.

* gnu/packages/openstack.scm (python-oslosphinx,
python2-oslosphinx)[arguments]: New field.
---
 gnu/packages/openstack.scm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 5bb83095a0..6f7e843e9d 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -604,6 +604,9 @@ and building documentation from them.")
         (base32
          "0cz8ym4i1n4rgljlqhyhfkpgdmid7nkb909k8r8nk186m9cmpla2"))))
     (build-system python-build-system)
+    ;; FIXME: Incompatible sphinx version.
+    (arguments
+     '(#:tests? #f))
     (propagated-inputs
       `(("python-requests" ,python-requests)))
     (native-inputs
-- 
cgit 1.4.1


From 2010af55b98b1cbe6295b7f8b066fed04696a4ba Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 15 Feb 2017 08:39:15 +0100
Subject: gnu: python-requests-mock: Update to 1.3.0.

* gnu/packages/openstack.scm (python-requests-mock, python2-requests-mock):
Update to 1.3.0.
---
 gnu/packages/openstack.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 6f7e843e9d..1e8a840e9a 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -245,14 +245,14 @@ tested on Python version 3.2, 2.7 and 2.6.")
 (define-public python-requests-mock
   (package
     (name "python-requests-mock")
-    (version "1.0.0")
+    (version "1.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "requests-mock" version))
        (sha256
         (base32
-         "0gcjjwsckhqixyffflc54i59x41jnbb37bli077vabii1bjmkin6"))))
+         "0jr997dvk6zbmhvbpcv3rajrgag69mcsm1ai3w3rgk2jdh6rg1mx"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-requests" ,python-requests)
-- 
cgit 1.4.1


From 9c4810b47cdf2aeccfbb99a6af427c6c2777c46e Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Sat, 18 Feb 2017 16:49:03 +0100
Subject: gnu: python-oslosphinx: Update to 4.10.0.

* gnu/packages/openstack.scm (python-oslosphinx): Update to 4.10.0.
---
 gnu/packages/openstack.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 1e8a840e9a..fe0dd11eb3 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -595,14 +595,14 @@ and building documentation from them.")
 (define-public python-oslosphinx
   (package
     (name "python-oslosphinx")
-    (version "4.3.0")
+    (version "4.10.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "oslosphinx" version))
        (sha256
         (base32
-         "0cz8ym4i1n4rgljlqhyhfkpgdmid7nkb909k8r8nk186m9cmpla2"))))
+         "09mxqyabi68f3s3arvdhlhq0mn38vf74jbsfcg84151hcj6czhnl"))))
     (build-system python-build-system)
     ;; FIXME: Incompatible sphinx version.
     (arguments
-- 
cgit 1.4.1


From 27693b1e34347c4e2e4d12283c8c825ec6332716 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Sat, 18 Feb 2017 18:12:34 +0100
Subject: gnu: python-oslosphinx: Re-enable tests.

* gnu/packages/openstack.scm (python-oslosphinx): Re-enable tests.
---
 gnu/packages/openstack.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index fe0dd11eb3..381480b786 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -604,9 +604,15 @@ and building documentation from them.")
         (base32
          "09mxqyabi68f3s3arvdhlhq0mn38vf74jbsfcg84151hcj6czhnl"))))
     (build-system python-build-system)
-    ;; FIXME: Incompatible sphinx version.
     (arguments
-     '(#:tests? #f))
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             ;; Note: Upstream tests would have also built the release notes.
+             ;; That only would work if we were in a git checkout.
+             ;; Therefore, we don't do it here.
+             (zero? (system* "python" "setup.py" "build_sphinx")))))))
     (propagated-inputs
       `(("python-requests" ,python-requests)))
     (native-inputs
-- 
cgit 1.4.1


From ec867b86a0575d049922e074312b36dfb9d71868 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 24 Feb 2017 20:27:47 +0100
Subject: gnu: python2-oslotest: Disable tests.

* gnu/packages/openstack.scm(python2-oslotest)[arguments]: New field.
(python-oslotest)[properties]: Delay it.
---
 gnu/packages/openstack.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 381480b786..8130097c83 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -662,10 +662,16 @@ from the OpenStack project.")
     (description
       "The Oslo Test framework provides common fixtures, support for debugging,
 and better support for mocking results.")
+    (properties `((python2-variant . ,(delay python2-oslotest))))
     (license asl2.0)))
 
 (define-public python2-oslotest
-  (package-with-python2 python-oslotest))
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-oslotest)))
+           (arguments
+            `(#:python ,python-2
+              ;; FIXME: 'subunit.run discover: error: no such option: --list'
+              #:tests? #f))))
 
 (define-public python-oslo.utils
   (package
-- 
cgit 1.4.1


From dc6bedbacadf7d0c9871fe3b22415d12ea266f74 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 24 Feb 2017 20:45:46 +0100
Subject: gnu: python2-requests-mock: Disable tests.

* gnu/packages/openstack.scm (python2-requests-mock)[arguments]: New field.
(python-requests-mock): Delay it.
---
 gnu/packages/openstack.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 8130097c83..d41c9c8916 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -271,10 +271,16 @@ tested on Python version 3.2, 2.7 and 2.6.")
     (description
       "This module provides a building block to stub out the HTTP requests
 portions of your testing code.")
+    (properties `((python2-variant . ,(delay python2-requests-mock))))
     (license asl2.0)))
 
 (define-public python2-requests-mock
-  (package-with-python2 python-requests-mock))
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-requests-mock)))
+           (arguments
+            `(#:python ,python-2
+              ;; FIXME: 'subunit.run discover: error: no such option: --list'
+              #:tests? #f))))
 
 (define-public python-stevedore
   (package
-- 
cgit 1.4.1


From 11a8767b9482f8ff6e89b3ab782b28400e2126d5 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 24 Feb 2017 20:48:11 +0100
Subject: gnu: python2-stevedore: Disable tests.

* gnu/packages/openstack.scm (python2-stevedore)[arguments]: New field.
(python-stevedore)[properties]: New field.
---
 gnu/packages/openstack.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index d41c9c8916..f6a399aa2f 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -317,10 +317,16 @@ mechanism by building on top of setuptools entry points.  The code for managing
 entry points tends to be repetitive, though, so stevedore provides manager
 classes for implementing common patterns for using dynamically loaded
 extensions.")
+    (properties `((python2-variant . ,(delay python2-stevedore))))
     (license asl2.0)))
 
 (define-public python2-stevedore
-  (package-with-python2 python-stevedore))
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-stevedore)))
+           (arguments
+            `(#:python ,python-2
+              ;; FIXME: 'subunit.run discover: error: no such option: --list'
+              #:tests? #f))))
 
 (define-public python-tempest-lib
   (package
-- 
cgit 1.4.1


From 041b5932dad0944079118ec97dd0d2317ba1f802 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 24 Feb 2017 20:51:39 +0100
Subject: gnu: python2-bandit: Disable tests.

* gnu/packages/openstack.scm (python2-bandit)[arguments]: New field.
(python-bandit)[properties]: Delay it.
---
 gnu/packages/openstack.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index f6a399aa2f..632534fb3c 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -65,10 +65,16 @@
 To do this Bandit processes each file, builds an AST from it, and runs
 appropriate plugins against the AST nodes.  Once Bandit has finished scanning
 all the files it generates a report.")
+    (properties `((python2-variant . ,(delay python2-bandit))))
     (license asl2.0)))
 
 (define-public python2-bandit
-  (package-with-python2 python-bandit))
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-bandit)))
+           (arguments
+            `(#:python ,python-2
+              ;; FIXME: 'subunit.run discover: error: no such option: --list'
+              #:tests? #f))))
 
 (define-public python-debtcollector
   (package
-- 
cgit 1.4.1


From e1f2e190471ae87bc51f8e9539f4bfbe9f69caa0 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 24 Feb 2017 20:56:06 +0100
Subject: gnu: python2-swiftclient: Disable tests.

* gnu/packages/openstack.scm (python2-swiftclient)[arguments]: New field.
---
 gnu/packages/openstack.scm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 632534fb3c..cdd37815de 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -860,6 +860,10 @@ permanence.")
 (define-public python2-swiftclient
   (let ((swiftclient (package-with-python2 python-swiftclient)))
     (package (inherit swiftclient)
+      (arguments
+       `(#:python ,python-2
+         ;; FIXME: subunit.run discover: error: no such option: --list
+         #:tests? #f))
       (propagated-inputs
        `(("python2-futures" ,python2-futures)
          ("python2-requests" ,python2-requests)
-- 
cgit 1.4.1


From d6caebc4d63ac8e7ae5e82b1261557e1b6898c10 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 24 Feb 2017 21:30:22 +0100
Subject: gnu: python2-reno: Disable tests.

* gnu/packages/openstack.scm (python2-reno)[arguments]: New field.
(python-reno)[properties]: Delay it.
---
 gnu/packages/openstack.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/openstack.scm')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index cdd37815de..51566b65e3 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -605,10 +605,16 @@ in transmittable and storable formats, such as JSON and MessagePack.")
     (synopsis "Release notes manager")
     (description "Reno is a tool for storing release notes in a git repository
 and building documentation from them.")
+    (properties `((python2-variant . ,(delay python2-reno))))
     (license asl2.0)))
 
 (define-public python2-reno
-  (package-with-python2 python-reno))
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-reno)))
+           (arguments
+            `(#:python ,python-2
+              ;; FIXME: 'subunit.run discover: error: no such option: --list'
+              #:tests? #f))))
 
 (define-public python-oslosphinx
   (package
-- 
cgit 1.4.1