gnu: libringclient: Disable the libwrap feature.

[jackhill/guix/guix.git] / gnu / packages / openstack.scm

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 6c81454..26b275e 100644 (file)
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -4,6 +4,8 @@
 ;;; Copyright © 2016, 2017, 2019 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2016, 2017, 2019 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>

+;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>

 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ -25,6 +27,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages python)
   #:use-module (gnu packages check)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages python)

+  #:use-module (gnu packages python-check)

   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)


@@ -44,47 +47,64 @@
 (define-public python-bandit
   (package
     (name "python-bandit")
 (define-public python-bandit
   (package
     (name "python-bandit")

-    (version "1.4.0")
+    (version "1.6.2")

     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "bandit" version))
        (sha256
         (base32
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "bandit" version))
        (sha256
         (base32

-         "1m5bm42120zyazky4k0lp3d9r0jwhjmp6sb108xfr0vz952p15yb"))))
+         "0rb034c99pyhb4a60z7f2kz40cjydhm8m9v2blaal1rmhlam7rs1"))))

     (build-system python-build-system)
     (arguments
     (build-system python-build-system)
     (arguments

-     `(#:phases (modify-phases %standard-phases
-                  (delete 'check)
-                  (add-after 'install 'check
-                    (lambda* (#:key inputs outputs #:allow-other-keys)
-                      ;; Tests require the 'bandit' executable in PATH.
-                      ;; It's only built during install time.
-                      (add-installed-pythonpath inputs outputs)
-                      (setenv "PATH" (string-append (assoc-ref outputs "out")
-                                                    "/bin:" (getenv "PATH")))
-                      (invoke "python" "setup.py" "testr"))))))
+     ;; The tests are disabled to avoid a circular dependency with
+     ;; python-stestr.
+     `(#:tests? #f))

     (propagated-inputs
     (propagated-inputs

-      `(("python-gitpython" ,python-gitpython)
-        ("python-pyyaml" ,python-pyyaml)
-        ("python-six" ,python-six)
-        ("python-stevedore" ,python-stevedore)))
+     `(("python-gitpython" ,python-gitpython)
+       ("python-pyyaml" ,python-pyyaml)
+       ("python-six" ,python-six)
+       ("python-stevedore" ,python-stevedore)))

     (native-inputs
     (native-inputs

-      `(;; Tests.
-        ("python-beautifulsoup4" ,python-beautifulsoup4)
-        ("python-fixtures" ,python-fixtures)
-        ("python-mock" ,python-mock)
-        ("python-subunit" ,python-subunit)
-        ("python-testrepository" ,python-testrepository)
-        ("python-testscenarios" ,python-testscenarios)
-        ("python-testtools" ,python-testtools)))
-    (home-page "https://wiki.openstack.org/wiki/Security/Projects/Bandit")
+     `(("python-pbr" ,python-pbr)))
+    (home-page "https://github.com/PyCQA/bandit")

     (synopsis "Security oriented static analyser for python code")
     (synopsis "Security oriented static analyser for python code")

-    (description
-      "Bandit is a tool designed to find common security issues in Python code.
-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.")
+    (description "Bandit is a tool designed to find common security issues in
+Python code.  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.")
+    (license asl2.0)))
+
+(define-public python-cliff
+  (package
+    (name "python-cliff")
+    (version "3.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "cliff" version))
+       (sha256
+        (base32
+         "0n8pzr0mnn9lq2mykds69ij2xrn0fsirh4ndmkx0mzydbx5niysv"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f))
+    (native-inputs
+     `(("python-pbr" ,python-pbr)))
+    (propagated-inputs
+     `(("python-cmd2" ,python-cmd2)
+       ("python-prettytable" ,python-prettytable)
+       ("python-pyparsing" ,python-pyparsing)
+       ("python-pyyaml" ,python-pyyaml)
+       ("python-bandit" ,python-bandit)
+       ("python-stevedore" ,python-stevedore)))
+    (home-page "https://opendev.org/openstack/cliff")
+    (synopsis "Framework for building command line programs")
+    (description "The @code{cliff} framework allows creating multi-level
+commands such as those of @command{subversion} and @command{git}, where the
+main program handles some basic argument parsing and then invokes a
+sub-command to do the work.  It uses plugins to define sub-commands, output
+formatters, and other extensions.")

     (license asl2.0)))
 
 (define-public python-debtcollector
     (license asl2.0)))
 
 (define-public python-debtcollector


@@ -115,44 +135,35 @@ all the files it generates a report.")
       "This package provides a collection of Python deprecation patterns and
 strategies that help you collect your technical debt in a non-destructive
 manner.")
       "This package provides a collection of Python deprecation patterns and
 strategies that help you collect your technical debt in a non-destructive
 manner.")

-    (properties `((python2-variant . ,(delay python2-debtcollector))))

     (license asl2.0)))
 
     (license asl2.0)))
 

-(define-public python2-debtcollector
-  (let ((base (package-with-python2 (strip-python2-variant
-                                     python-debtcollector))))
-    (package
-      (inherit base)
-      (propagated-inputs
-       `(("python2-funcsigs" ,python2-funcsigs)
-         ,@(package-propagated-inputs base))))))
-

 (define-public python-hacking
   (package
     (name "python-hacking")
 (define-public python-hacking
   (package
     (name "python-hacking")

-    (version "1.0.0")
+    (version "4.0.0")

     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "hacking" version))
        (sha256
         (base32
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "hacking" version))
        (sha256
         (base32

-         "0s9l99s64jsyvm28fa4hzllbdi21sb7jn4gzdf1pd5ckvy7p4b0k"))))
+         "062rvbkvbavqqz55f7q00ikwipkn5j0rdls1rrajdbfwgckjcrsm"))))

     (build-system python-build-system)
     (build-system python-build-system)

-    (propagated-inputs
-     `(("python-flake8" ,python-flake8-2.5)
-       ("python-mccabe-0.2.1" ,python-mccabe-0.2.1)
-       ("python-pbr" ,python-pbr)
-       ("python-pep8-1.5.7" ,python-pep8-1.5.7)
-       ("python-pyflakes-1.2" ,python-pyflakes-1.2)
-       ("python-six" ,python-six)))
+     (propagated-inputs
+     `(("python-flake8" ,python-flake8)))

     (native-inputs
      `( ;; Tests
     (native-inputs
      `( ;; Tests

+       ("python-coverage" ,python-coverage)
+       ("python-ddt" ,python-ddt)
+       ("python-dnspython" ,python-dnspython)
+       ("python-fixtures" ,python-fixtures)

        ("python-eventlet" ,python-eventlet)
        ("python-mock" ,python-mock)
        ("python-eventlet" ,python-eventlet)
        ("python-mock" ,python-mock)

-       ("python-reno" ,python-reno)
-       ("python-testrepository" ,python-testrepository)
-       ("python-testscenarios" ,python-testscenarios)))
+       ("python-monotonic" ,python-monotonic)
+       ("python-subunit" ,python-subunit)
+       ("python-stestr" ,python-stestr)
+       ("python-testscenarios" ,python-testscenarios)
+       ("python-testtools" ,python-testtools)))

     (home-page "https://github.com/openstack-dev/hacking")
     (synopsis "OpenStack hacking guideline enforcement")
     (description
     (home-page "https://github.com/openstack-dev/hacking")
     (synopsis "OpenStack hacking guideline enforcement")
     (description


@@ -161,9 +172,6 @@ manner.")
 guidelines}.")
     (license asl2.0)))
 
 guidelines}.")
     (license asl2.0)))
 

-(define-public python2-hacking
-  (package-with-python2 python-hacking))
-

 (define-public python-mox3
   (package
     (name "python-mox3")
 (define-public python-mox3
   (package
     (name "python-mox3")


@@ -194,9 +202,6 @@ Google mox framework} to Python 3.  It was meant to be as compatible
 with mox as possible, but small enhancements have been made.")
     (license asl2.0)))
 
 with mox as possible, but small enhancements have been made.")
     (license asl2.0)))
 

-(define-public python2-mox3
-  (package-with-python2 python-mox3))
-

 (define-public python-openstackdocstheme
   (package
     (name "python-openstackdocstheme")
 (define-public python-openstackdocstheme
   (package
     (name "python-openstackdocstheme")


@@ -224,9 +229,6 @@ with mox as possible, but small enhancements have been made.")
 to docs.openstack.org and developer.openstack.org.")
     (license asl2.0)))
 
 to docs.openstack.org and developer.openstack.org.")
     (license asl2.0)))
 

-(define-public python2-openstackdocstheme
-  (package-with-python2 python-openstackdocstheme))
-

 (define-public python-os-client-config
   (package
     (name "python-os-client-config")
 (define-public python-os-client-config
   (package
     (name "python-os-client-config")


@@ -260,9 +262,6 @@ to docs.openstack.org and developer.openstack.org.")
   comprehensive manner.")
     (license asl2.0)))
 
   comprehensive manner.")
     (license asl2.0)))
 

-(define-public python2-os-client-config
-  (package-with-python2 python-os-client-config))
-

 (define-public python-os-testr
   (package
     (name "python-os-testr")
 (define-public python-os-testr
   (package
     (name "python-os-testr")


@@ -293,28 +292,24 @@ to docs.openstack.org and developer.openstack.org.")
   for subunit.")
     (license asl2.0)))
 
   for subunit.")
     (license asl2.0)))
 

-(define-public python2-os-testr
-  (package-with-python2 python-os-testr))
-

 (define-public python-stevedore
   (package
     (name "python-stevedore")
 (define-public python-stevedore
   (package
     (name "python-stevedore")

-    (version "1.28.0")
+    (version "3.2.2")

     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "stevedore" version))
        (sha256
         (base32
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "stevedore" version))
        (sha256
         (base32

-         "02ynfgwma84g59834dmvzr39mcppy5s229zf1w23c0qngf753izi"))))
+         "1w11lm293afzb73iq0ba9wnmr2rjwymnhr92km4a4xrs7a5qcigq"))))

     (build-system python-build-system)
     (build-system python-build-system)

-    (propagated-inputs
-     `(("python-pbr" ,python-pbr)
-       ("python-six" ,python-six)))
+    (arguments
+     ;; The tests are disabled to avoid a circular dependency with
+     ;; python-stestr.
+     `(#:tests? #f))

     (native-inputs
     (native-inputs

-     `(("python-mock" ,python-mock)
-       ("python-sphinx" ,python-sphinx)
-       ("python-testrepository" ,python-testrepository)))
+     `(("python-pbr" ,python-pbr)))

     (home-page "https://github.com/dreamhost/stevedore")
     (synopsis "Manage dynamic plugins for Python applications")
     (description
     (home-page "https://github.com/dreamhost/stevedore")
     (synopsis "Manage dynamic plugins for Python applications")
     (description


@@ -328,9 +323,6 @@ classes for implementing common patterns for using dynamically loaded
 extensions.")
     (license asl2.0)))
 
 extensions.")
     (license asl2.0)))
 

-(define-public python2-stevedore
-  (package-with-python2 python-stevedore))
-

 (define-public python-tempest-lib
   (package
     (name "python-tempest-lib")
 (define-public python-tempest-lib
   (package
     (name "python-tempest-lib")


@@ -373,7 +365,11 @@ extensions.")
 common features used in Tempest.")
     (license asl2.0)))
 
 common features used in Tempest.")
     (license asl2.0)))
 

-;; Packages from the Oslo library
+\f
+;;;
+;;; Packages from the Oslo library
+;;;
+

 (define-public python-oslo.config
   (package
     (name "python-oslo.config")
 (define-public python-oslo.config
   (package
     (name "python-oslo.config")


@@ -383,8 +379,8 @@ common features used in Tempest.")
        (method url-fetch)
        (uri (pypi-uri "oslo.config" version))
        (sha256
        (method url-fetch)
        (uri (pypi-uri "oslo.config" version))
        (sha256

-         (base32
-          "0ymf7jxbq29fifyvkwhfiys1qvljqfxdw8ajwzwaf3yiqidgpxqd"))))
+        (base32
+         "0ymf7jxbq29fifyvkwhfiys1qvljqfxdw8ajwzwaf3yiqidgpxqd"))))

     (build-system python-build-system)
     (propagated-inputs
      `(("python-debtcollector" ,python-debtcollector)
     (build-system python-build-system)
     (propagated-inputs
      `(("python-debtcollector" ,python-debtcollector)


@@ -409,29 +405,40 @@ common features used in Tempest.")
     (home-page "https://launchpad.net/oslo")
     (synopsis "Oslo Configuration API")
     (description
     (home-page "https://launchpad.net/oslo")
     (synopsis "Oslo Configuration API")
     (description

-      "The Oslo configuration API supports parsing command line arguments and
+     "The Oslo configuration API supports parsing command line arguments and

 .ini style configuration files.")
     (license asl2.0)))
 
 (define-public python-oslo.context
   (package
     (name "python-oslo.context")
 .ini style configuration files.")
     (license asl2.0)))
 
 (define-public python-oslo.context
   (package
     (name "python-oslo.context")

-    (version "2.20.0")
+    (version "3.1.1")

     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "oslo.context" version))
        (sha256
         (base32
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "oslo.context" version))
        (sha256
         (base32

-         "0iiq9rpwg6wrdqnhf3d8z8g0g7fjhs5zn6qw6igvxplz2c3rbvvx"))))
+         "1l2z186rkd9acrb2ygf53yrdc1lgf7cy1akbhm21kgkzind4p2r6"))))

     (build-system python-build-system)
     (build-system python-build-system)

+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'relax-requirements
+                    (lambda _
+                      (substitute* "test-requirements.txt"
+                        (("hacking>=3.0.1,<3.1.0")
+                         "hacking>=3.0.1"))
+                      #t)))))

     (propagated-inputs
     (propagated-inputs

-     `(("python-debtcollector" ,python-debtcollector)
-       ("python-pbr" ,python-pbr)))
+     `(("python-debtcollector" ,python-debtcollector)))

     (native-inputs
     (native-inputs

-     `(("python-fixtures" ,python-fixtures)
+     `(("python-bandit" ,python-bandit)
+       ("python-coverage" ,python-coverage)
+       ("python-fixtures" ,python-fixtures)

        ("python-hacking" ,python-hacking)
        ("python-hacking" ,python-hacking)

-       ("python-oslotest" ,python-oslotest)))
+       ("python-oslotest" ,python-oslotest)
+       ("python-pbr" ,python-pbr)
+       ("python-stestr" ,python-stestr)))

     (home-page "https://launchpad.net/oslo")
     (synopsis "Oslo context library")
     (description
     (home-page "https://launchpad.net/oslo")
     (synopsis "Oslo context library")
     (description


@@ -440,42 +447,36 @@ about a request context.  The request context is usually populated in the WSGI
 pipeline and used by various modules such as logging.")
     (license asl2.0)))
 
 pipeline and used by various modules such as logging.")
     (license asl2.0)))
 

-(define-public python2-oslo.context
-  (package-with-python2 python-oslo.context))
-

 (define-public python-oslo.i18n
   (package
     (name "python-oslo.i18n")
     (version "3.20.0")
     (source
 (define-public python-oslo.i18n
   (package
     (name "python-oslo.i18n")
     (version "3.20.0")
     (source

-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "oslo.i18n" version))
-        (sha256
-          (base32
-           "0kjcdw4bk3mi4vqmqwhhq053kxbbbj05si6nwxd1pzx33z067ky3"))))
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "oslo.i18n" version))
+       (sha256
+        (base32
+         "0kjcdw4bk3mi4vqmqwhhq053kxbbbj05si6nwxd1pzx33z067ky3"))))

     (build-system python-build-system)
     (propagated-inputs
     (build-system python-build-system)
     (propagated-inputs

-      `(("python-babel" ,python-babel)
-        ("python-six" ,python-six)))
+     `(("python-babel" ,python-babel)
+       ("python-six" ,python-six)))

     (native-inputs
     (native-inputs

-      `(("python-pbr" ,python-pbr)
-        ;; Tests
-        ("python-mock" ,python-mock)
-        ("python-mox3" ,python-mox3)
-        ("python-oslotest" ,python-oslotest)
-        ("python-testscenarios" ,python-testscenarios)))
+     `(("python-pbr" ,python-pbr)
+       ;; Tests
+       ("python-mock" ,python-mock)
+       ("python-mox3" ,python-mox3)
+       ("python-oslotest" ,python-oslotest)
+       ("python-testscenarios" ,python-testscenarios)))

     (home-page "https://launchpad.net/oslo")
     (synopsis "Oslo internationalization (i18n) library")
     (description
     (home-page "https://launchpad.net/oslo")
     (synopsis "Oslo internationalization (i18n) library")
     (description

-      "The oslo.i18n library contain utilities for working with
+     "The oslo.i18n library contain utilities for working with

 internationalization (i18n) features, especially translation for text strings
 in an application or library.")
     (license asl2.0)))
 
 internationalization (i18n) features, especially translation for text strings
 in an application or library.")
     (license asl2.0)))
 

-(define-public python2-oslo.i18n
-  (package-with-python2 python-oslo.i18n))
-

 (define-public python-oslo.log
   (package
   (name "python-oslo.log")
 (define-public python-oslo.log
   (package
   (name "python-oslo.log")


@@ -583,81 +584,67 @@ in transmittable and storable formats, such as JSON and MessagePack.")
 and building documentation from them.")
     (license asl2.0)))
 
 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")
 (define-public python-oslosphinx
   (package
     (name "python-oslosphinx")

-    (version "4.10.0")
+    (version "4.18.0")

     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "oslosphinx" version))
        (sha256
         (base32
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "oslosphinx" version))
        (sha256
         (base32

-         "09mxqyabi68f3s3arvdhlhq0mn38vf74jbsfcg84151hcj6czhnl"))))
+         "1xm41857vzrzjmnyi6bqirg4i5qa61v7wxcsdc4q1nzgr3ndgz5k"))))

     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases

-         (replace 'check
+         (add-after 'unpack 'relax-requirements

            (lambda _
            (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.
-             (invoke "python" "setup.py" "build_sphinx"))))))
+             (substitute* "test-requirements.txt"
+               (("hacking!=0.13.0,<0.14,>=0.12.0")
+                "hacking!=0.13.0,>=0.12.0"))
+             #t)))))

     (propagated-inputs
     (propagated-inputs

-      `(("python-requests" ,python-requests)))
+     `(("python-requests" ,python-requests)))

     (native-inputs
     (native-inputs

-      `(("python-pbr" ,python-pbr)
-        ("python-docutils" ,python-docutils)
-        ("python-hacking" ,python-hacking)
-        ("python-sphinx" ,python-sphinx)))
+     `(("python-hacking" ,python-hacking)
+       ("python-openstackdocstheme" ,python-openstackdocstheme)
+       ("python-pbr" ,python-pbr)
+       ("python-reno" ,python-reno)
+       ("python-sphinx" ,python-sphinx)))

     (home-page "https://www.openstack.org/")
     (synopsis "OpenStack sphinx extensions and theme")
     (home-page "https://www.openstack.org/")
     (synopsis "OpenStack sphinx extensions and theme")

-    (description
-      "This package provides themes and extensions for Sphinx documentation
-from the OpenStack project.")
+    (description "This package provides themes and extensions for Sphinx
+documentation from the OpenStack project.")

     (license asl2.0)))
 
     (license asl2.0)))
 

-(define-public python2-oslosphinx
-  (package-with-python2 python-oslosphinx))
-

 (define-public python-oslotest
   (package
     (name "python-oslotest")
 (define-public python-oslotest
   (package
     (name "python-oslotest")

-    (version "3.4.0")
+    (version "4.4.1")

     (source
     (source

-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "oslotest" version))
-        (sha256
-          (base32
-            "1pp8lq61d548cxcqi451czvrz5i5b3hyi2ry00wmngdgiswcqj1h"))))
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "oslotest" version))
+       (sha256
+        (base32
+         "0r50sz55m8ljv2vk1k7sp88iz1iqq4p9w6kb8hn8g8c50r9zdi5i"))))

     (build-system python-build-system)
     (build-system python-build-system)

+    (arguments
+     ;; The tests are disabled to avoid a circular dependency with oslo.config.
+     `(#:tests? #f))

     (propagated-inputs
     (propagated-inputs

-      `(("python-fixtures" ,python-fixtures)
-        ("python-mock" ,python-mock)
-        ("python-mox3" ,python-mox3)
-        ("python-os-client-config" ,python-os-client-config)
-        ("python-six" ,python-six)
-        ("python-subunit" ,python-subunit)
-        ("python-testrepository" ,python-testrepository)
-        ("python-testtools" ,python-testtools)))
-    (native-inputs
-      `(("python-pbr" ,python-pbr)
-        ("python-testscenarios" ,python-testscenarios)))
+     `(("python-fixtures" ,python-fixtures)
+       ("python-six" ,python-six)
+       ("python-subunit" ,python-subunit)
+       ("python-testtools" ,python-testtools)))

     (home-page "https://launchpad.net/oslo")
     (synopsis "Oslo test framework")
     (home-page "https://launchpad.net/oslo")
     (synopsis "Oslo test framework")

-    (description
-      "The Oslo Test framework provides common fixtures, support for debugging,
-and better support for mocking results.")
+    (description "The Oslo Test framework provides common fixtures, support
+for debugging, and better support for mocking results.")

     (license asl2.0)))
 
     (license asl2.0)))
 

-(define-public python2-oslotest
-  (package-with-python2 python-oslotest))
-

 (define-public python-oslo.utils
   (package
     (name "python-oslo.utils")
 (define-public python-oslo.utils
   (package
     (name "python-oslo.utils")


@@ -841,6 +828,3 @@ permanence.")
      "Git-review is a command-line tool that helps submitting Git branches to
 Gerrit for review, or fetching existing ones.")
     (license asl2.0)))
      "Git-review is a command-line tool that helps submitting Git branches to
 Gerrit for review, or fetching existing ones.")
     (license asl2.0)))

-
-(define-public python2-git-review
-  (package-with-python2 python-git-review))