;;; 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, 2017 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; 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>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages ssh)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
+ #:use-module (gnu packages xml)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module ((guix licenses)
("python-testrepository" ,python-testrepository)
("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)))
- (home-page "https://wiki.openstack.org/wiki/Security/Projects/Bandit")
+ (home-page "https://github.com/PyCQA/bandit")
(synopsis "Security oriented static analyser for python code")
(description
"Bandit is a tool designed to find common security issues in Python code.
all the files it generates a report.")
(license asl2.0)))
-(define-public python2-bandit
- (package-with-python2 python-bandit))
-
(define-public python-debtcollector
(package
(name "python-debtcollector")
(define-public python-hacking
(package
(name "python-hacking")
- (version "1.0.0")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "hacking" version))
(sha256
(base32
- "0s9l99s64jsyvm28fa4hzllbdi21sb7jn4gzdf1pd5ckvy7p4b0k"))))
+ "1vlgh81v4vsw3q3cf7qggsp043vq16knp203lrll82h7l7rhd8r3"))))
(build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'delete-broken-test
+ (lambda _
+ ;; TODO: Just one test fails:
+ ;; hacking.tests.test_doctest.HackingTestCase.test_pycodestyle
+ ;; (H403-hacking_docstring_multiline_end-line-5)
+ (delete-file "hacking/tests/test_doctest.py")
+ #t)))))
(propagated-inputs
- `(("python-flake8" ,python-flake8-2.5)
+ `(("python-flake8" ,python-flake8-2.6)
("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-pyflakes-1.2" ,python-pyflakes-1.2)
("python-six" ,python-six)))
(native-inputs
`( ;; Tests
("python-pbr" ,python-pbr)))
(native-inputs
`(("python-openstackdocstheme" ,python-openstackdocstheme)
- ("python-sphinx" ,python-sphinx-1.6)
+ ("python-sphinx" ,python-sphinx)
("python-subunit" ,python-subunit)
("python-testrepository" ,python-testrepository)
("python-testtools" ,python-testtools)))
`(("python-dulwich" ,python-dulwich)
("python-pbr" ,python-pbr)))
(native-inputs
- `(("python-sphinx" ,python-sphinx-1.6)))
+ `(("python-sphinx" ,python-sphinx)))
(home-page "https://docs.openstack.org/openstackdocstheme/latest/")
(synopsis "OpenStack Docs Theme")
(description
("python-six" ,python-six)))
(native-inputs
`(("python-mock" ,python-mock)
- ("python-sphinx" ,python-sphinx-1.6)
+ ("python-sphinx" ,python-sphinx)
("python-testrepository" ,python-testrepository)))
(home-page "https://github.com/dreamhost/stevedore")
(synopsis "Manage dynamic plugins for Python applications")
common features used in Tempest.")
(license asl2.0)))
-(define-public python2-tempest-lib
- (package-with-python2 python-tempest-lib))
-
;; Packages from the Oslo library
(define-public python-oslo.config
(package
("python-openstackdocstheme" ,python-openstackdocstheme)
("python-oslotest" ,python-oslotest)
("python-reno" ,python-reno)
- ("python-sphinx" ,python-sphinx-1.6)
+ ("python-sphinx" ,python-sphinx)
("python-testrepository" ,python-testrepository)
("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)))
.ini style configuration files.")
(license asl2.0)))
-(define-public python2-oslo.config
- (package-with-python2 python-oslo.config))
-
(define-public python-oslo.context
(package
(name "python-oslo.context")
- (version "1.0.0")
+ (version "2.20.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslo.context" version))
(sha256
(base32
- "0kvha0rs9295njyl2z6n6zm5dapi5mrl5zwjm0m6ldqrvccyf8c3"))))
+ "0iiq9rpwg6wrdqnhf3d8z8g0g7fjhs5zn6qw6igvxplz2c3rbvvx"))))
(build-system python-build-system)
+ (propagated-inputs
+ `(("python-debtcollector" ,python-debtcollector)
+ ("python-pbr" ,python-pbr)))
(native-inputs
- `(("python-babel" ,python-babel)
- ("python-pbr" ,python-pbr)
- ;; Tests.
- ("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)))
+ `(("python-fixtures" ,python-fixtures)
+ ("python-hacking" ,python-hacking)
+ ("python-oslotest" ,python-oslotest)))
(home-page "https://launchpad.net/oslo")
(synopsis "Oslo context library")
(description
(define-public python-oslo.i18n
(package
(name "python-oslo.i18n")
- (version "3.19.0")
+ (version "3.20.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslo.i18n" version))
(sha256
(base32
- "18lbfq55cqrbmwm5p6vci9mkjfzr0zwz54ax3ysa463wba5m84cp"))))
+ "0kjcdw4bk3mi4vqmqwhhq053kxbbbj05si6nwxd1pzx33z067ky3"))))
(build-system python-build-system)
(propagated-inputs
`(("python-babel" ,python-babel)
(define-public python-oslo.log
(package
(name "python-oslo.log")
- (version "1.6.0")
+ (version "3.36.0")
(source
(origin
(method url-fetch)
- (uri (string-append
- "https://pypi.python.org/packages/source/o/oslo.log/oslo.log-"
- version
- ".tar.gz"))
+ (uri (pypi-uri "oslo.log" version))
(sha256
(base32
- "1fhy6yvbd565nv4x4i3ppyrlbmz3yy9d0xsvw5nkqsa7g43nmf8z"))))
+ "0h7hplf1h8k24v75m3mq1jlrl74x5ynyr4hwgffsg5campxnza4x"))))
(build-system python-build-system)
- (arguments
- '(#:tests? #f)) ; FIXME: Requires oslo.utils >= 3.2.0.
(propagated-inputs
- `(("python-debtcollector" ,python-debtcollector)
+ `(("python-dateutil" ,python-dateutil)
+ ("python-debtcollector" ,python-debtcollector)
+ ("python-monotonic" ,python-monotonic)
("python-oslo.config" ,python-oslo.config)
("python-oslo.context" ,python-oslo.context)
("python-oslo.i18n" ,python-oslo.i18n)
("python-oslo.utils" ,python-oslo.utils)
("python-oslo.serialization" ,python-oslo.serialization)
+ ("python-pbr" ,python-pbr)
+ ("python-pyinotify" ,python-pyinotify)
("python-six" ,python-six)))
(native-inputs
- `(("python-babel" ,python-babel)
- ("python-iso8601" ,python-iso8601)
- ("python-mock" ,python-mock)
+ `(("python-mock" ,python-mock)
("python-oslotest" ,python-oslotest)
- ("python-pbr" ,python-pbr)))
+ ("python-subunit" ,python-subunit)
+ ("python-testrepository" ,python-testrepository)
+ ("python-testtools" ,python-testtools)))
(home-page "https://launchpad.net/oslo")
(synopsis "Python logging library of the Oslo project")
(description
handlers and support for context specific logging (like resource id’s etc).")
(license asl2.0)))
-(define-public python2-oslo.log
- (package-with-python2 python-oslo.log))
-
(define-public python-oslo.serialization
(package
(name "python-oslo.serialization")
- (version "2.2.0")
+ (version "2.24.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslo.serialization" version))
(sha256
(base32
- "00s03krhf833gs76aw5ns32w9m1i4hx6x6d9g82m0j5wyqk0sci4"))))
+ "08bxkp98c617y58x630xq44iiffm7f0f3cwh6zbnlkgq0zgh7jk1"))))
(build-system python-build-system)
- (arguments
- '(#:tests? #f)) ; FIXME: Requires python-oslo.utils >= 3.2.0.
(propagated-inputs
- `(("python-iso8601" ,python-iso8601)
+ `(("python-msgpack" ,python-msgpack)
("python-netaddr" ,python-netaddr)
("python-oslo.utils" ,python-oslo.utils)
- ("python-simplejson" ,python-simplejson)
("python-six" ,python-six)
("python-pytz" ,python-pytz)))
(native-inputs
- `(("python-babel" ,python-babel)
- ("python-pbr" ,python-pbr)
+ `(("python-pbr" ,python-pbr)
;; Tests.
("python-mock" ,python-mock)
("python-oslo.i18n" ,python-oslo.i18n)
in transmittable and storable formats, such as JSON and MessagePack.")
(license asl2.0)))
-(define-public python2-oslo.serialization
- (package-with-python2 python-oslo.serialization))
-
(define-public python-reno
(package
(name "python-reno")
(add-before 'check 'init-git
(lambda _
;; reno expects a git repo
- (zero? (system* "git" "init")))))))
+ (invoke "git" "init"))))))
(propagated-inputs
`(("python-dulwich" ,python-dulwich)
("python-pbr" ,python-pbr)
("python-docutils" ,python-docutils)
("python-sphinx" ,python-sphinx)
("gnupg" ,gnupg)
- ("git" ,git)))
- (home-page "http://docs.openstack.org/developer/reno/")
+ ("git" ,git-minimal)))
+ (home-page "https://docs.openstack.org/reno/latest/")
(synopsis "Release notes manager")
(description "Reno is a tool for storing release notes in a git repository
and building documentation from them.")
;; 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")))))))
+ (invoke "python" "setup.py" "build_sphinx"))))))
(propagated-inputs
`(("python-requests" ,python-requests)))
(native-inputs
(define-public python-oslotest
(package
(name "python-oslotest")
- (version "3.2.0")
+ (version "3.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslotest" version))
(sha256
(base32
- "1xay6wjxzqm4bg87fahqas84dhvhgf1gghzldkcczsfx897mqdkh"))))
+ "1pp8lq61d548cxcqi451czvrz5i5b3hyi2ry00wmngdgiswcqj1h"))))
(build-system python-build-system)
(propagated-inputs
`(("python-fixtures" ,python-fixtures)
(define-public python-oslo.utils
(package
(name "python-oslo.utils")
- (version "3.0.0")
+ (version "3.36.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslo.utils" version))
(sha256
(base32
- "1c4jrbvfs4hs37fics8frqlyhmsv7v92ncv2cpbm0av9x0ic6pnj"))
- (snippet
- '(begin
- ;; FIXME: setuptools fails to import this file during the test
- ;; phase.
- (delete-file "oslo_utils/tests/test_netutils.py")))))
+ "1ipjcgg9z697wmibhcbg5lqpk5gafakdx4qkff3w255zr0mvw04r"))))
(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)
("python-monotonic" ,python-monotonic)
("python-netaddr" ,python-netaddr)
("python-netifaces" ,python-netifaces)
+ ("python-pyparsing" ,python-pyparsing)
("python-pytz" ,python-pytz)
("python-six" ,python-six)))
(native-inputs
- `(("python-babel" ,python-babel)
- ("python-pbr" ,python-pbr)
+ `(("python-pbr" ,python-pbr)
;; Tests.
("python-bandit" ,python-bandit)
+ ("python-ddt" ,python-ddt)
+ ("python-fixtures" ,python-fixtures)
("python-oslo.config" ,python-oslo.config)
("python-oslotest" ,python-oslotest)
("python-mock" ,python-mock)
- ("python-mox3" ,python-mox3)
- ("python-testscenarios" ,python-testscenarios)))
+ ("python-testrepository" ,python-testrepository)
+ ("python-testscenarios" ,python-testscenarios)
+ ("python-testtools" ,python-testtools)))
(home-page "https://launchpad.net/oslo")
(synopsis "Oslo utility library")
(description
handling.")
(license asl2.0)))
-(define-public python2-oslo.utils
- (package-with-python2 python-oslo.utils))
-
(define-public python-keystoneclient
(package
(name "python-keystoneclient")
LDAP.")
(license asl2.0)))
-(define-public python2-keystoneclient
- (let ((keystoneclient (package-with-python2 python-keystoneclient)))
- (package (inherit keystoneclient)
- (propagated-inputs
- `(("python2-requests" ,python2-requests)
- ,@(alist-delete "python-requests"
- (package-propagated-inputs keystoneclient))))
- (native-inputs
- `(("python2-oauthlib" ,python2-oauthlib)
- ("python2-oslosphinx" ,python2-oslosphinx)
- ("python2-requests-mock" ,python2-requests-mock)
- ("python2-tempest-lib" ,python2-tempest-lib)
- ,@(fold alist-delete (package-native-inputs keystoneclient)
- '("python-oauthlib" "python-oslosphinx" "python-requests-mock" "python-tempest-lib")))))))
-
(define-public python-swiftclient
(package
(name "python-swiftclient")
storage, email storage and backup archiving. Having no central \"brain\" or
master point of control provides greater scalability, redundancy and
permanence.")
- (properties `((python2-variant . ,(delay python2-swiftclient))))
(license asl2.0)))
-(define-public python2-swiftclient
- (let ((swiftclient (package-with-python2
- (strip-python2-variant python-swiftclient))))
- (package (inherit swiftclient)
- (propagated-inputs
- `(("python2-futures" ,python2-futures)
- ,@(package-propagated-inputs swiftclient))))))
-
(define-public python-git-review
(package
(name "python-git-review")
- (version "1.26.0")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "git-review" version))
(sha256
- (base32
- "150b1zvm6favd1ad8yl2bilq7xkr4m1mw9510frh47f8ghfkqz28"))))
+ (base32 "0nn17mfqvsa3ryjz53qjslmf60clc0vx2115kkj66h28p6vsnflf"))))
(build-system python-build-system)
(arguments
- '(#:tests? #f ; tests require a running Gerrit server
+ '(#:tests? #f ; tests require a running Gerrit server
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-program
`("PATH" ":" prefix
,(map (lambda (dir)
(string-append dir "/bin"))
- (list git openssh))))))))))
+ (list git openssh)))))
+ #t)))))
(native-inputs
`(("python-pbr" ,python-pbr)))
(propagated-inputs