From 2054b5220180d5cf5c0cfa8b2509a3f66417a1df Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Fri, 25 Aug 2017 20:12:41 +0200 Subject: gnu: Update python-lxml to 3.8.0. * gnu/packages/python.scm (python-lxml): Update to 3.8.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 346faf434c..e650cdb8b4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6225,14 +6225,14 @@ translate the complete SQLite API into Python.") (define-public python-lxml (package (name "python-lxml") - (version "3.6.0") + (version "3.8.0") (source (origin (method url-fetch) (uri (pypi-uri "lxml" version)) (sha256 (base32 - "1pvbmiy2m7jwv493kilbghhj2pkh8wy1na3ji350vhzhlwlclx4w")))) + "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk")))) (build-system python-build-system) (inputs `(("libxml2" ,libxml2) -- cgit v1.3 From 13be557d985ebc3770f28188f3ce45c2392c6c1d Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 6 Sep 2017 12:42:10 +0200 Subject: gnu: Add python-html5-parser, python2-html5-parser. * gnu/packages/python.scm (python-html5-parser): New variable. (python2-html5-parser: New variable. --- gnu/packages/python.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e650cdb8b4..a190873515 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5976,6 +5976,37 @@ and written in Python.") (define-public python2-html5lib-0.9 (package-with-python2 python-html5lib-0.9)) +(define-public python-html5-parser + (package + (name "python-html5-parser") + (version "0.4.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "html5-parser" version)) + (sha256 + (base32 + "1d8sxhl41ffh7qlk7wlsy17xw6slzx5v1yna9s72wx5qrpaa3wxr")))) + (build-system python-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libxml2" ,libxml2))) + (propagated-inputs + `(("python-lxml" ,python-lxml) + ("python-beautifulsoup4" ,python-beautifulsoup4))) + (home-page "https://html5-parser.readthedocs.io") + (synopsis "Fast C-based HTML5 parsing for Python") + (description "This package provides a fast implementation of the HTML5 +parsing spec for Python. Parsing is done in C using a variant of the gumbo +parser. The gumbo parse tree is then transformed into an lxml tree, also in +C, yielding parse times that can be a thirtieth of the html5lib parse times.") + ;; src/as-python-tree.[c|h] are licensed GPL3. The other files + ;; indicate ASL2.0, including the LICENSE file for the whole project. + (license (list license:asl2.0 license:gpl3)))) + +(define-public python2-html5-parser + (package-with-python2 python-html5-parser)) + (define-public python-webencodings (package (name "python-webencodings") -- cgit v1.3 From c98f9c52960735da672d5e9766bdfef5ff136a6e Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Mon, 4 Sep 2017 14:11:40 +0200 Subject: gnu: python-tox: Update to 2.8.0. * gnu/packages/python.scm (python-tox): Update to 2.8.0. --- gnu/packages/python.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a190873515..c6f9f34ce7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9886,14 +9886,14 @@ Pytest but stripped of Pytest specific details.") (define-public python-tox (package (name "python-tox") - (version "2.3.1") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "tox" version)) (sha256 (base32 - "1vj73ar4rimq3fwy5r2z3jv4g9qbh8rmpmncsc00g0k310acqzxz")))) + "00lrql2cfzhb712v70inac6mrgdv8s8fmvz7qpggkk623hkm2pgc")))) (build-system python-build-system) (arguments ;; FIXME: Tests require pytest-timeout, which itself requires @@ -9905,7 +9905,8 @@ Pytest but stripped of Pytest specific details.") ("python-virtualenv" ,python-virtualenv))) (native-inputs `(; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout) - ("python-pytest" ,python-pytest))) ; >= 2.3.5 + ("python-pytest" ,python-pytest) ; >= 2.3.5 + ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "http://tox.testrun.org/") (synopsis "Virtualenv-based automation of test activities") (description "Tox is a generic virtualenv management and test command line -- cgit v1.3 From 4967946b8ae81794971f72fe2e40a2bc428f91b6 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 6 Sep 2017 10:07:55 +0300 Subject: gnu: Add python-uritemplate. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-uritemplate, python2-uritemplate): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c6f9f34ce7..bf669a5317 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -16227,3 +16227,24 @@ ECB and OFB).") (define-public python2-pyaes (package-with-python2 python-pyaes)) + +(define-public python-uritemplate + (package + (name "python-uritemplate") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "uritemplate" version)) + (sha256 + (base32 + "0781gm9g34wa0asc19dx81ng0nqq07igzv3bbvdqmz13pv7469n0")))) + (build-system python-build-system) + (home-page "https://uritemplate.readthedocs.org") + (synopsis "Library to deal with URI Templates") + (description "@code{uritemplate} provides Python library to deal with URI +Templates.") + (license license:bsd-2))) + +(define-public python2-uritemplate + (package-with-python2 python-uritemplate)) -- cgit v1.3 From 1eb6b724834e2405c16a3ef3299bd68d6f622dec Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 6 Sep 2017 10:01:23 +0300 Subject: gnu: Add python-betamax-matchers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-betamax-matchers, python2-betamax-matchers): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bf669a5317..d3df1ac5c5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13201,6 +13201,30 @@ replay them during future tests. It is designed to work with python-requests.") (define-public python2-betamax (package-with-python2 python-betamax)) +(define-public python-betamax-matchers + (package + (name "python-betamax-matchers") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "betamax-matchers" version)) + (sha256 + (base32 + "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43")))) + (build-system python-build-system) + (propagated-inputs + `(("python-betamax" ,python-betamax) + ("python-requests-toolbelt" ,python-requests-toolbelt))) + (home-page "https://github.com/sigmavirus24/betamax_matchers") + (synopsis "VCR imitation for python-requests") + (description "@code{betamax-matchers} provides a set of Matchers for +Betamax.") + (license license:asl2.0))) + +(define-public python2-betamax-matchers + (package-with-python2 python-betamax-matchers)) + (define-public python-s3transfer (package (name "python-s3transfer") -- cgit v1.3 From cfd34f43164b68ddc91cc051f72f2d3fe5a0ab40 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sat, 22 Jul 2017 14:23:18 +0200 Subject: gnu: python-apsw: Build with all extensions. * gnu/packages/python.scm (python-apsw)[phases]: Replace build phase; add flag to build all extensions. Add build-test-helper to allow testing of extensions. --- gnu/packages/python.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d3df1ac5c5..d7156bf518 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6237,6 +6237,16 @@ implementation of D-Bus.") (arguments `(#:phases (modify-phases %standard-phases + (replace 'build + (lambda _ + (zero? + (system* "python" "setup.py" "build" "--enable-all-extensions")))) + (add-after 'build 'build-test-helper + (lambda _ + (zero? + (system + (string-append "gcc -fPIC -shared -o ./testextension.sqlext " + "-I. -Isqlite3 src/testextension.c") )))) (delete 'check) (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.3 From 01fc102e377bc949846d026563e239f689184d82 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Sep 2017 03:15:09 +0200 Subject: gnu: python-botocore: Update to 1.7.9. * gnu/packages/python.scm (python-botocore): Update to 1.7.9. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d7156bf518..29ea2806e9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9956,14 +9956,14 @@ document.") (define-public python-botocore (package (name "python-botocore") - (version "1.5.26") + (version "1.7.9") (source (origin (method url-fetch) (uri (pypi-uri "botocore" version)) (sha256 (base32 - "1b7l48hr88galrrc5q6k21z3sdadzxc87ppzs7k9fz4p1w8bfnvb")))) + "02b1bw25r1wdjs5yppb1h9igf11wj092biriv2yg8hzp5r0wrkmg")))) (build-system python-build-system) (arguments ;; FIXME: Many tests are failing. -- cgit v1.3 From 46841c07ecabdd3168e77f0bf2a53fbd8d3ef98b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Sep 2017 03:04:51 +0200 Subject: gnu: python-s3transfer: Update to 0.1.11. * gnu/packages/python.scm (python-s3transfer): Update to 0.1.11. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 29ea2806e9..2efde467a3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13238,13 +13238,13 @@ Betamax.") (define-public python-s3transfer (package (name "python-s3transfer") - (version "0.1.10") + (version "0.1.11") (source (origin (method url-fetch) (uri (pypi-uri "s3transfer" version)) (sha256 (base32 - "1h8g9bknvxflxkpbnxyfxmk8pvgykbbk9ljdvhqh6z4vjc2926ms")))) + "0yfrfnf404cxzn3iswibqjxklsl0b1lwgqiml6pwiqj79a7zbwbn")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From 3f9a4eaf92c7a4197ce3a23ee8ac5968f80b6431 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Sep 2017 02:55:46 +0200 Subject: gnu: awscli: Update to 1.11.151. * gnu/packages/python.scm (awscli): Update to 1.11.151. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2efde467a3..6c76df7b8b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9990,14 +9990,14 @@ interface to the Amazon Web Services (AWS) API.") (define-public awscli (package (name "awscli") - (version "1.11.63") + (version "1.11.151") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "1r8aqv8w27k76lcsfk83w6qw9lz8gk2ibzwacp5wjhpp2gik911m")))) + "0h6rirbfy0f9cxm7ikll0kr720dircfmxf2vslmhn4n325831wsp")))) (build-system python-build-system) (propagated-inputs `(("python-colorama" ,python-colorama) -- cgit v1.3 From 24d158136fa8ec56a643bf707c2563d9721ed806 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Thu, 14 Sep 2017 21:43:51 +0200 Subject: gnu: Add python-schedule. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-schedule, python2-schedule): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6c76df7b8b..5927db0d66 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1249,6 +1249,33 @@ datetime module, available in Python 2.3+.") (define-public python2-parsedatetime (package-with-python2 python-parsedatetime)) +(define-public python-schedule + (package + (name "python-schedule") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "schedule" version)) + (sha256 + (base32 + "0vplyjcbfrq50sphlwya749z8p2pcyi2nycw3518i0qpd9a6189i")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-mock" ,python-mock))) + (home-page "https://github.com/dbader/schedule") + (synopsis "Schedule periodic function calls in Python") + (description + "Schedule is an in-process scheduler for periodic jobs that uses the +builder pattern for configuration. Schedule lets you run Python functions (or +any other callable) periodically at pre-determined intervals using a simple, +human-friendly syntax.") + (license license:expat))) + +(define-public python2-schedule + (package-with-python2 python-schedule)) + (define-public python-pandas (package (name "python-pandas") -- cgit v1.3 From 04fb4516f4b619cf663dead171a14110e72d13e1 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sat, 5 Aug 2017 12:09:56 +1000 Subject: gnu: Add python-backpack. * gnu/packages/python.scm (python-backpack): New variable. --- gnu/packages/python.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5927db0d66..3e2cd209c2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson ;;; Copyright © 2015, 2016, 2017 Leo Famulari -;;; Copyright © 2015 Ben Woodcroft +;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Erik Edrosa ;;; Copyright © 2015, 2016, 2017 Efraim Flashner ;;; Copyright © 2015 Kyle Meyer @@ -12179,6 +12179,32 @@ YAML-serialized data.") (define-public python2-pyaml (package-with-python2 python-pyaml)) +(define-public python-backpack + (package + (name "python-backpack") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "backpack" version)) + (sha256 + (base32 + "14rq1mvm0jda90lcx9gyyby9dvq4x3js2cmxvd6vl4686ixwyqh1")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-nose" ,python-nose))) + (propagated-inputs + `(("python-simplejson" ,python-simplejson))) + (home-page "https://github.com/sdispater/backpack") + (synopsis "Utilities for working with Python collections") + (description "Backpack provides some useful utilities for working with +collections of data.") + (license license:expat))) + +(define-public python2-backpack + (package-with-python2 python-backpack)) + (define-public python-flexmock (package (name "python-flexmock") -- cgit v1.3 From 963926bc78cf79fab2fea26aca6c760c91ecf4f2 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Tue, 15 Aug 2017 17:58:05 +1000 Subject: gnu: python-pyaml: Update to 17.7.2. * gnu/packages/databases.scm (python-pyaml): Update to 17.7.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3e2cd209c2..d7d8a540eb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12157,13 +12157,13 @@ addresses, and phone numbers.") (define-public python-pyaml (package (name "python-pyaml") - (version "15.8.2") + (version "17.7.2") (source (origin (method url-fetch) (uri (pypi-uri "pyaml" version)) (sha256 (base32 - "1f5m28vkh4ksq3d80d8mmd2z8wxvc3mgy2pmrv2751dm2xgznm4w")))) + "132grrw0ajq4nrappi3ldbkb952k7yn9b6c7csi2rmvzm1g6ppp2")))) (build-system python-build-system) (native-inputs `(("python-unidecode" ,python-unidecode))) -- cgit v1.3 From 5eebe8dcf746fb6e53a2e9d9d8bed7177de62806 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Tue, 15 Aug 2017 18:22:48 +1000 Subject: gnu: python-cleo: Update to 0.6.1. * gnu/packages/databases.scm (python-cleo): Update to 0.6.1. [native-inputs]: Add python-pytest-mock. [propagated-inputs]: Add python-backpack, python-pastel. Remove python-psutil. --- gnu/packages/python.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d7d8a540eb..d04d7cb1a8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -80,6 +80,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages graphviz) + #:use-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) @@ -11983,20 +11984,22 @@ Wikipedia code samples at (define-public python-cleo (package (name "python-cleo") - (version "0.4.1") + (version "0.6.1") (source (origin (method url-fetch) (uri (pypi-uri "cleo" version)) (sha256 (base32 - "1k2dcl6mqpn5bljyl6w42rqyd9mb3y9kh2mg7m2x3kfjwvg0rpva")))) + "0q1cf0szr0d54am4pypzwdnm74zpladdsinad94c2fz5i06fdpf7")))) (build-system python-build-system) (native-inputs `(;; For testing ("python-mock" ,python-mock) + ("python-pytest-mock" ,python-pytest-mock) ("python-pytest" ,python-pytest))) (propagated-inputs - `(("python-psutil" ,python-psutil) + `(("python-backpack" ,python-backpack) + ("python-pastel" ,python-pastel) ("python-pylev" ,python-pylev))) (home-page "https://github.com/sdispater/cleo") (synopsis "Command-line arguments library for Python") -- cgit v1.3 From 00c788824172d0f942cbee274c96941c505596f7 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Tue, 15 Aug 2017 18:25:07 +1000 Subject: gnu: python-pygments: Update to 2.2.0. * gnu/packages/databases.scm (python-pygments): Update to 2.2.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d04d7cb1a8..c431993fa8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3216,14 +3216,14 @@ reStructuredText.") (define-public python-pygments (package (name "python-pygments") - (version "2.1.3") + (version "2.2.0") (source (origin (method url-fetch) (uri (pypi-uri "Pygments" version)) (sha256 (base32 - "10axnp2wpjnq9g8wg53fx0c70dfxqrz498jyz8mrdx9a3flwir48")))) + "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv")))) (build-system python-build-system) (arguments ;; FIXME: Tests require sphinx, which depends on this. -- cgit v1.3 From 77e5c370322399bc4e6570c6a25e7e2676379085 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sat, 5 Aug 2017 12:09:59 +1000 Subject: gnu: python-orator: Update to 0.9.7. * gnu/packages/python.scm (python-orator, python2-orator): Update to 0.9.7. [arguments]: Enable tests. Loosen dependency requirements. [propagated-inputs]: Remove python-arrow. Add python-backpack, python-pendulum, python-pygments, python-six. (python2-orator)[propagated-inputs]: Also remove python2-ipaddress. --- gnu/packages/python.scm | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c431993fa8..24fca7e4dd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -109,6 +109,7 @@ #:use-module (gnu packages statistics) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages video) @@ -12232,24 +12233,44 @@ mocks, stubs and fakes.") (define-public python-orator (package (name "python-orator") - (version "0.8.2") + (version "0.9.7") (source (origin (method url-fetch) (uri (pypi-uri "orator" version)) (sha256 (base32 - "1li49irsqha17nrda4nsb48biyy0rarp9pphf0jpqwm5zr8hv569")))) + "14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c")))) (build-system python-build-system) - (arguments '(#:tests? #f)) ; no tests + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'loosen-dependencies + ;; Tests are not actually run since they are not included with the + ;; distributed package, but dependencies are checked. + (lambda _ + (substitute* "setup.py" + ((",<.*'") "'") + (("flexmock==0.9.7") "flexmock") + ;; The pytest-mock package is out of date, so we remove minimum + ;; version requirement. + (("pytest-mock.*'") "pytest-mock'")) + #t))))) + (native-inputs + `(("python-pytest-mock" ,python-pytest-mock) + ("python-pytest" ,python-pytest-3.0) + ("python-flexmock" ,python-flexmock))) (propagated-inputs - `(("python-arrow" ,python-arrow) + `(("python-backpack" ,python-backpack) ("python-blinker" ,python-blinker) ("python-cleo" ,python-cleo) ("python-faker" ,python-faker) ("python-inflection" ,python-inflection) ("python-lazy-object-proxy" ,python-lazy-object-proxy) + ("python-pendulum" ,python-pendulum) ("python-pyaml" ,python-pyaml) + ("python-pygments" ,python-pygments) ("python-simplejson" ,python-simplejson) + ("python-six" ,python-six) ("python-wrapt" ,python-wrapt))) (home-page "https://orator-orm.com/") (synopsis "ActiveRecord ORM for Python") @@ -12260,12 +12281,7 @@ implementation for Python.") (properties `((python2-variant . ,(delay python2-orator)))))) (define-public python2-orator - (let ((base (package-with-python2 (strip-python2-variant python-orator)))) - (package - (inherit base) - (propagated-inputs - `(("python2-ipaddress" ,python2-ipaddress) - ,@(package-propagated-inputs base)))))) + (package-with-python2 (strip-python2-variant python-orator))) (define-public python-prompt-toolkit (package -- cgit v1.3 From da1f7a9e16d7debd59b8e1d39291cdf4cc4f6ea0 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sat, 5 Aug 2017 12:10:00 +1000 Subject: gnu: python-orator: Move to (gnu packages databases). * gnu/packages/python.scm: Remove (gnu packages time) import. (python-orator, python2-orator): Move from here ... * gnu/packages/databases.scm: ... to here. --- gnu/packages/databases.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++- gnu/packages/python.scm | 54 ------------------------------------------- 2 files changed, 56 insertions(+), 55 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c6a9ff5bd6..6ce58985ea 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2016 David Thompson ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Eric Bavier -;;; Copyright © 2015 Sou Bunnbu +;;; Copyright © 2015, 2016 Sou Bunnbu ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 @@ -18,6 +18,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Vong +;;; Copyright © 2017 Ben Woodcroft ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,6 +53,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages time) #:use-module (gnu packages jemalloc) #:use-module (gnu packages language) #:use-module (gnu packages libevent) @@ -1621,3 +1623,56 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") (define-public python2-lmdb (package-with-python2 python-lmdb)) + +(define-public python-orator + (package + (name "python-orator") + (version "0.9.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "orator" version)) + (sha256 + (base32 + "14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'loosen-dependencies + ;; Tests are not actually run since they are not included with the + ;; distributed package, but dependencies are checked. + (lambda _ + (substitute* "setup.py" + ((",<.*'") "'") + (("flexmock==0.9.7") "flexmock") + ;; The pytest-mock package is out of date, so we remove minimum + ;; version requirement. + (("pytest-mock.*'") "pytest-mock'")) + #t))))) + (native-inputs + `(("python-pytest-mock" ,python-pytest-mock) + ("python-pytest" ,python-pytest-3.0) + ("python-flexmock" ,python-flexmock))) + (propagated-inputs + `(("python-backpack" ,python-backpack) + ("python-blinker" ,python-blinker) + ("python-cleo" ,python-cleo) + ("python-faker" ,python-faker) + ("python-inflection" ,python-inflection) + ("python-lazy-object-proxy" ,python-lazy-object-proxy) + ("python-pendulum" ,python-pendulum) + ("python-pyaml" ,python-pyaml) + ("python-pygments" ,python-pygments) + ("python-simplejson" ,python-simplejson) + ("python-six" ,python-six) + ("python-wrapt" ,python-wrapt))) + (home-page "https://orator-orm.com/") + (synopsis "ActiveRecord ORM for Python") + (description + "Orator provides a simple ActiveRecord-like Object Relational Mapping +implementation for Python.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-orator)))))) + +(define-public python2-orator + (package-with-python2 (strip-python2-variant python-orator))) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 24fca7e4dd..475b6903f3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -109,7 +109,6 @@ #:use-module (gnu packages statistics) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) - #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages video) @@ -12230,59 +12229,6 @@ mocks, stubs and fakes.") (define-public python2-flexmock (package-with-python2 python-flexmock)) -(define-public python-orator - (package - (name "python-orator") - (version "0.9.7") - (source (origin - (method url-fetch) - (uri (pypi-uri "orator" version)) - (sha256 - (base32 - "14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'loosen-dependencies - ;; Tests are not actually run since they are not included with the - ;; distributed package, but dependencies are checked. - (lambda _ - (substitute* "setup.py" - ((",<.*'") "'") - (("flexmock==0.9.7") "flexmock") - ;; The pytest-mock package is out of date, so we remove minimum - ;; version requirement. - (("pytest-mock.*'") "pytest-mock'")) - #t))))) - (native-inputs - `(("python-pytest-mock" ,python-pytest-mock) - ("python-pytest" ,python-pytest-3.0) - ("python-flexmock" ,python-flexmock))) - (propagated-inputs - `(("python-backpack" ,python-backpack) - ("python-blinker" ,python-blinker) - ("python-cleo" ,python-cleo) - ("python-faker" ,python-faker) - ("python-inflection" ,python-inflection) - ("python-lazy-object-proxy" ,python-lazy-object-proxy) - ("python-pendulum" ,python-pendulum) - ("python-pyaml" ,python-pyaml) - ("python-pygments" ,python-pygments) - ("python-simplejson" ,python-simplejson) - ("python-six" ,python-six) - ("python-wrapt" ,python-wrapt))) - (home-page "https://orator-orm.com/") - (synopsis "ActiveRecord ORM for Python") - (description - "Orator provides a simple ActiveRecord-like Object Relational Mapping -implementation for Python.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-orator)))))) - -(define-public python2-orator - (package-with-python2 (strip-python2-variant python-orator))) - (define-public python-prompt-toolkit (package (name "python-prompt-toolkit") -- cgit v1.3 From 0c19c0f272f89fd94e88f1d7fd8e581b47bad3e7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Sep 2017 17:13:37 +0200 Subject: gnu: python-pyopenssl: Update to 17.3.0. * gnu/packages/python.scm (python-pyopenssl): Update to 17.3.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 475b6903f3..a0aef0f947 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7980,14 +7980,14 @@ message digests and key derivation functions.") (define-public python-pyopenssl (package (name "python-pyopenssl") - (version "17.2.0") + (version "17.3.0") (source (origin (method url-fetch) (uri (pypi-uri "pyOpenSSL" version)) (sha256 (base32 - "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax")))) + "0xkc1wfnpg6abzllivg3ylhc63npjdy1v81f4kc08bm8cj80nqr9")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.3 From ad0f92d0281b49f87f8cfc480990b4922a22ce0f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Sep 2017 17:06:14 +0200 Subject: gnu: python-pyjwt: Update to 1.5.3. * gnu/packages/python.scm (python-pyjwt): Update to 1.5.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a0aef0f947..223a308fb4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2864,14 +2864,14 @@ somewhat intelligeble.") (define-public python-pyjwt (package (name "python-pyjwt") - (version "1.5.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (pypi-uri "PyJWT" version)) (sha256 (base32 - "0pvr3iymab7v2qz74ann760z7qahqgqszxz5iqqbaqv4z2zz0y8i")) + "1rxsg14i33vm2i6lz0my628108c81k43v10n4h3p0gx62xdyf2sh")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3