;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages openstack)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages check)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-crypto)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages ssh)
+ #:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (guix build-system python)
("python-pbr" ,python-pbr)
;; Tests.
("python-oslotest" ,python-oslotest)))
- (home-page "http://www.openstack.org/")
+ (home-page "https://www.openstack.org/")
(synopsis
"Find deprecated patterns and strategies in Python code")
(description
(define-public python-hacking
(package
(name "python-hacking")
- (version "0.10.2")
+ (version "1.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "hacking" version))
(sha256
(base32
- "1a310k3dv04jg7zvmk37h2ql7y9kf4hvdxb74bjlwdxgmy6h4wap"))))
+ "0s9l99s64jsyvm28fa4hzllbdi21sb7jn4gzdf1pd5ckvy7p4b0k"))))
(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)
- ("python-pbr" ,python-pbr)
- ("python-pep8-1.5.7" ,python-pep8-1.5.7)
- ("python-pyflakes-0.8.1" ,python-pyflakes-0.8.1)
- ("python-six" ,python-six)))
+ `(("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-0.8.1" ,python-pyflakes-0.8.1)
+ ("python-six" ,python-six)))
(native-inputs
- `(;; Tests
- ("python-testscenarios" ,python-testscenarios)))
- (home-page "http://github.com/openstack-dev/hacking")
+ `( ;; Tests
+ ("python-eventlet" ,python-eventlet)
+ ("python-mock" ,python-mock)
+ ("python-reno" ,python-reno)
+ ("python-testrepository" ,python-testrepository)
+ ("python-testscenarios" ,python-testscenarios)))
+ (home-page "https://github.com/openstack-dev/hacking")
(synopsis "OpenStack hacking guideline enforcement")
(description
- "Python-hacking is a set of flake8 plugins that test and enforce the
+ "Python-hacking is a set of flake8 plugins that test and enforce the
@uref{http://docs.openstack.org/developer/hacking/, OpenStack style
guidelines}.")
(license asl2.0)))
(define-public python-mox3
(package
(name "python-mox3")
- (version "0.14.0")
+ (version "0.24.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mox3" version))
+ (patches (search-patches "python-mox3-python3.6-compat.patch"))
(sha256
(base32
- "0njmh40i1lg5mzn9hc2ax83adj6dli455j6xifilrw27c4wlkjzx"))))
+ "0w58adwv7q9wzvmq9mlrk2asfk73myq9fpwy7mjkzsz3baa95zf5"))))
(build-system python-build-system)
- (arguments
- ;; TODO: Resolve dependency cycle and re-enable.
- '(#:tests? #f))
+ (propagated-inputs
+ `(("python-fixtures" ,python-fixtures)
+ ("python-pbr" ,python-pbr)))
(native-inputs
- `(("python-fixtures" ,python-fixtures)
- ; TODO re-add ("python-oslosphinx" ,python-oslosphinx)
- ("python-pbr" ,python-pbr)
- ("python-sphinx" ,python-sphinx)
+ `(("python-openstackdocstheme" ,python-openstackdocstheme)
+ ("python-sphinx" ,python-sphinx-1.6)
+ ("python-subunit" ,python-subunit)
+ ("python-testrepository" ,python-testrepository)
("python-testtools" ,python-testtools)))
- (home-page "http://www.openstack.org/")
+ (home-page "https://www.openstack.org/")
(synopsis "Mock object framework for Python")
(description
- "Mox3 is an unofficial port of the Google mox framework
-(http://code.google.com/p/pymox/) to Python 3. It was meant to be as compatible
-with mox as possible, but small enhancements have been made. The library was
-tested on Python version 3.2, 2.7 and 2.6.")
+ "Mox3 is an unofficial port of the @uref{https://code.google.com/p/pymox/,
+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)))
(define-public python2-mox3
(package-with-python2 python-mox3))
+(define-public python-openstackdocstheme
+ (package
+ (name "python-openstackdocstheme")
+ (version "1.18.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "openstackdocstheme" version))
+ (sha256
+ (base32
+ "1ki5204rjdqjvr8xr9w2qc1z6b6d2i5jas0i70xzkf9njlzjzv2r"))))
+ (build-system python-build-system)
+ (arguments
+ ;; FIXME: Tests require an old version of python-hacking, which in
+ ;; turn depends on mox3 which depends on this package.
+ `(#:tests? #f))
+ (propagated-inputs
+ `(("python-dulwich" ,python-dulwich)
+ ("python-pbr" ,python-pbr)))
+ (native-inputs
+ `(("python-sphinx" ,python-sphinx-1.6)))
+ (home-page "https://docs.openstack.org/openstackdocstheme/latest/")
+ (synopsis "OpenStack Docs Theme")
+ (description
+ "This package provides themes and extensions for Sphinx for publishing
+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")
("python-testrepository" ,python-testrepository)
("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)))
- (home-page "http://www.openstack.org/")
+ (home-page "https://www.openstack.org/")
(synopsis
"OpenStack Client Configuration Library")
(description
(define-public python2-os-testr
(package-with-python2 python-os-testr))
-(define-public python-requests-mock
- (package
- (name "python-requests-mock")
- (version "1.3.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "requests-mock" version))
- (sha256
- (base32
- "0jr997dvk6zbmhvbpcv3rajrgag69mcsm1ai3w3rgk2jdh6rg1mx"))))
- (build-system python-build-system)
- (propagated-inputs
- `(("python-requests" ,python-requests)
- ("python-six" ,python-six)))
- (native-inputs
- `(("python-pbr" ,python-pbr)
- ("python-discover" ,python-discover)
- ("python-docutils" ,python-docutils)
- ("python-fixtures" ,python-fixtures)
- ("python-mock" ,python-mock)
- ("python-sphinx" ,python-sphinx)
- ("python-testrepository" ,python-testrepository)
- ("python-testtools" ,python-testtools)))
- (home-page "https://requests-mock.readthedocs.org/")
- (synopsis "Mock out responses from the requests package")
- (description
- "This module provides a building block to stub out the HTTP requests
-portions of your testing code.")
- (license asl2.0)))
-
-(define-public python2-requests-mock
- (package-with-python2 python-requests-mock))
-
(define-public python-stevedore
(package
(name "python-stevedore")
(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)
("python-oslotest" ,python-oslotest)
("python-oslosphinx" ,python-oslosphinx)
("python-sphinx" ,python-sphinx)))
- (home-page "http://launchpad.net/oslo")
+ (home-page "https://launchpad.net/oslo")
(synopsis "Oslo context library")
(description
"The Oslo context library has helpers to maintain useful information
("python-mox3" ,python-mox3)
("python-oslotest" ,python-oslotest)
("python-testscenarios" ,python-testscenarios)))
- (home-page "http://launchpad.net/oslo")
+ (home-page "https://launchpad.net/oslo")
(synopsis "Oslo internationalization (i18n) library")
(description
"The oslo.i18n library contain utilities for working with
("python-mock" ,python-mock)
("python-oslotest" ,python-oslotest)
("python-pbr" ,python-pbr)))
- (home-page "http://launchpad.net/oslo")
+ (home-page "https://launchpad.net/oslo")
(synopsis "Python logging library of the Oslo project")
(description
"The oslo.log (logging) configuration library provides standardized
("python-mock" ,python-mock)
("python-oslo.i18n" ,python-oslo.i18n)
("python-oslotest" ,python-oslotest)))
- (home-page "http://launchpad.net/oslo")
+ (home-page "https://launchpad.net/oslo")
(synopsis "Oslo serialization library")
(description
"The oslo.serialization library provides support for representing objects
(define-public python-reno
(package
(name "python-reno")
- (version "2.0.3")
+ (version "2.7.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "reno" version))
(sha256
- (base32 "1i2wnn5fnm3jm5774pahg000q0lma5i913hml91bbbm2mybphndd"))))
+ (base32 "0gwzi5dvacqx43smxl3rd1z33npn7gfhm50bvgmq90fib2q431wc"))))
(build-system python-build-system)
(arguments
`(#:phases
;; reno expects a git repo
(zero? (system* "git" "init")))))))
(propagated-inputs
- `(("python-babel" ,python-babel)
- ("python-dulwich" ,python-dulwich)
+ `(("python-dulwich" ,python-dulwich)
+ ("python-pbr" ,python-pbr)
("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)
+ ("python-docutils" ,python-docutils)
+ ("python-sphinx" ,python-sphinx)
("gnupg" ,gnupg)
("git" ,git)))
(home-page "http://docs.openstack.org/developer/reno/")
("python-docutils" ,python-docutils)
("python-hacking" ,python-hacking)
("python-sphinx" ,python-sphinx)))
- (home-page "http://www.openstack.org/")
+ (home-page "https://www.openstack.org/")
(synopsis "OpenStack sphinx extensions and theme")
(description
"This package provides themes and extensions for Sphinx documentation
(define-public python-oslotest
(package
(name "python-oslotest")
- (version "1.10.0")
+ (version "3.2.0")
(source
(origin
(method url-fetch)
- (uri (string-append
- "https://pypi.python.org/packages/source/o/oslotest/oslotest-"
- version
- ".tar.gz"))
+ (uri (pypi-uri "oslotest" version))
(sha256
(base32
- "0l3ny48ddz5xbf0v4r0jv1yhbdzinc2vy0lybhdkmx3xy0b886fs"))))
+ "1xay6wjxzqm4bg87fahqas84dhvhgf1gghzldkcczsfx897mqdkh"))))
(build-system python-build-system)
(propagated-inputs
`(("python-fixtures" ,python-fixtures)
("python-mock" ,python-mock)
("python-mox3" ,python-mox3)
- ("python-six" ,python-six)))
- (native-inputs
- `(("python-pbr" ,python-pbr)
("python-os-client-config" ,python-os-client-config)
+ ("python-six" ,python-six)
("python-subunit" ,python-subunit)
("python-testrepository" ,python-testrepository)
- ("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)))
- (home-page "http://launchpad.net/oslo")
+ (native-inputs
+ `(("python-pbr" ,python-pbr)
+ ("python-testscenarios" ,python-testscenarios)))
+ (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.")
- (properties `((python2-variant . ,(delay python2-oslotest))))
(license asl2.0)))
(define-public python2-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))))
+ (package-with-python2 python-oslotest))
(define-public python-oslo.utils
(package
("python-mock" ,python-mock)
("python-mox3" ,python-mox3)
("python-testscenarios" ,python-testscenarios)))
- (home-page "http://launchpad.net/oslo")
+ (home-page "https://launchpad.net/oslo")
(synopsis "Oslo utility library")
(description
"The @code{oslo.utils} library provides support for common utility type
("python-requests" ,python-requests)
("python-six" ,python-six)
("python-stevedore" ,python-stevedore)))
- (home-page "http://www.openstack.org/")
+ (home-page "https://www.openstack.org/")
(synopsis "Client Library for OpenStack Identity")
(description
"Python-keystoneclient is the identity service used by OpenStack for
(propagated-inputs
`(("python-requests" ,python-requests)
("python-six" ,python-six)))
- (home-page "http://www.openstack.org/")
+ (home-page "https://www.openstack.org/")
(synopsis "OpenStack Object Storage API Client Library")
(description
"OpenStack Object Storage (code-named Swift) creates redundant, scalable
storage, email storage and backup archiving. Having no central \"brain\" or
master point of control provides greater scalability, redundancy and
permanence.")
- (license asl2.0)))
+ (properties `((python2-variant . ,(delay python2-swiftclient))))
+ (license asl2.0)))
(define-public python2-swiftclient
- (let ((swiftclient (package-with-python2 python-swiftclient)))
+ (let ((swiftclient (package-with-python2
+ (strip-python2-variant python-swiftclient))))
(package (inherit swiftclient)
(propagated-inputs
`(("python2-futures" ,python2-futures)
- ("python2-requests" ,python2-requests)
- ,@(alist-delete "python-requests"
- (package-propagated-inputs swiftclient))))
- (native-inputs
- `(("python2-keystoneclient" ,python2-keystoneclient)
- ("python2-oslosphinx" ,python2-oslosphinx)
- ,@(fold alist-delete (package-native-inputs swiftclient)
- '("python-keystoneclient" "python-oslosphinx")))))))
+ ,@(package-propagated-inputs swiftclient))))))
(define-public python-git-review
(package
(name "python-git-review")
- (version "1.25.0")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "git-review" version))
(sha256
(base32
- "07d1jn9ryff5j5ic6qj5pbk10m1ccmpllj0wyalrcms1q9yhlzh8"))))
+ "150b1zvm6favd1ad8yl2bilq7xkr4m1mw9510frh47f8ghfkqz28"))))
(build-system python-build-system)
(arguments
'(#:tests? #f ; tests require a running Gerrit server
(inputs
`(("git" ,git)
("openssh" ,openssh)))
- (home-page "http://docs.openstack.org/infra/git-review/")
+ (home-page "https://docs.openstack.org/infra/git-review/")
(synopsis "Command-line tool for Gerrit")
(description
"Git-review is a command-line tool that helps submitting Git branches to
HCoop / jackhill / guix / guix.git / blobdiff