From 6b59fc1020174e8157c9f6ab78fdddd54efa3eb2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 26 Feb 2016 11:03:11 +0200 Subject: gnu: Add python-backports-abc. * gnu/packages/python.scm (python-backports-abc): New variable. --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2441220901..3cd02c112f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4990,6 +4990,31 @@ connection to each user.") ,python2-backport-ssl-match-hostname) ,@(package-inputs tornado)))))) +;; the python- version can be removed with python-3.5 +(define-public python-backports-abc + (package + (name "python-backports-abc") + (version "0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "backports_abc" version)) + (sha256 + (base32 + "19fh75lni9pb673n2fn505m1rckm0af0szcv5xx1qm1xpa940glb")))) + (build-system python-build-system) + (inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "https://github.com/cython/backports_abc") + (synopsis "Backport of additions to the 'collections.abc' module.") + (description + "Python-backports-abc provides a backport of additions to the +'collections.abc' module in Python-3.5.") + (license psfl))) + +(define-public python2-backports-abc + (package-with-python2 python-backports-abc)) + (define-public python-waf (package (name "python-waf") -- cgit v1.3 From a724924bebfdab5b451b830d0db3ef892eb925ce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 26 Feb 2016 10:55:56 +0200 Subject: gnu: python-tornado: Update to 4.3. * gnu/packages/python.scm (python-tornado): Update to 4.3. [native-inputs]: Add python-backports-abc. (python2-tornado)[inputs]: Add python2-singledispatch. --- gnu/packages/python.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3cd02c112f..812aeb0027 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4958,20 +4958,19 @@ It is written entirely in Python.") (define-public python-tornado (package (name "python-tornado") - (version "4.1") + (version "4.3") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/t/tornado/" - "tornado-" version ".tar.gz")) + (uri (pypi-uri "tornado" version)) (sha256 - (base32 "0a12f00h277zbifibnj46wf14801f573irvf6hwkgja5vspd7awr")))) + (base32 "1gzgwayl6hmc9jfcl88bni4jcsk2jcca9dn1rvrfsvnijcjx7hn9")))) (build-system python-build-system) (inputs `(("python-certifi" ,python-certifi))) (native-inputs - `(("python-setuptools" ,python-setuptools))) + `(("python-backports-abc" ,python-backports-abc) + ("python-setuptools" ,python-setuptools))) (home-page "http://www.tornadoweb.org/") (synopsis "Python web framework and asynchronous networking library") (description @@ -4988,6 +4987,7 @@ connection to each user.") (inputs `(("python2-backport-ssl-match-hostname" ,python2-backport-ssl-match-hostname) + ("python2-singledispatch", python2-singledispatch) ,@(package-inputs tornado)))))) ;; the python- version can be removed with python-3.5 -- cgit v1.3 From aa5946edb20a10a245ea24082bee0e01265235f9 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 29 Feb 2016 14:36:01 -0800 Subject: gnu: Remove python2-pil. python2-pil is vulnerable to several security issues (CVE-2016-0740, CVE-2016-0775, and CVE-2016-2533). Fortunately, python2-pillow provides equivalent functionality, so this package can be cleanly removed. * gnu/packages/python.scm (python2-pil): Remove variable. --- gnu/packages/python.scm | 61 ------------------------------------------------- 1 file changed, 61 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 812aeb0027..4f34537df6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4596,67 +4596,6 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.") (strip-python2-variant python-beautifulsoup4))) (native-inputs `(("python2-setuptools" ,python2-setuptools))))) -(define-public python2-pil - (package - (name "python2-pil") - (version "1.1.7") - (source - (origin - (method url-fetch) - (uri (string-append - "http://effbot.org/downloads/Imaging-" - version ".tar.gz")) - (sha256 - (base32 - "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9")) - (modules '((guix build utils))) - (snippet - ;; Adapt to newer freetype. As the package is unmaintained upstream, - ;; there is no use in creating a patch and reporting it. - '(substitute* "_imagingft.c" - (("freetype/") - "freetype2/"))))) - (build-system python-build-system) - (inputs - `(("freetype" ,freetype) - ("libjpeg" ,libjpeg) - ("libtiff" ,libtiff) - ("python-setuptools" ,python-setuptools) - ("zlib" ,zlib))) - (arguments - ;; Only the fork python-pillow works with Python 3. - `(#:python ,python-2 - #:tests? #f ; no check target - #:phases - (alist-cons-before - 'build 'configure - ;; According to README and setup.py, manual configuration is - ;; the preferred way of "searching" for inputs. - ;; lcms is not found, TCL_ROOT refers to the unavailable tkinter. - (lambda* (#:key inputs #:allow-other-keys) - (let ((jpeg (assoc-ref inputs "libjpeg")) - (zlib (assoc-ref inputs "zlib")) - (tiff (assoc-ref inputs "libtiff")) - (freetype (assoc-ref inputs "freetype"))) - (substitute* "setup.py" - (("JPEG_ROOT = None") - (string-append "JPEG_ROOT = libinclude(\"" jpeg "\")")) - (("ZLIB_ROOT = None") - (string-append "ZLIB_ROOT = libinclude(\"" zlib "\")")) - (("TIFF_ROOT = None") - (string-append "TIFF_ROOT = libinclude(\"" tiff "\")")) - (("FREETYPE_ROOT = None") - (string-append "FREETYPE_ROOT = libinclude(\"" - freetype "\")"))))) - %standard-phases))) - (home-page "http://www.pythonware.com/products/pil/") - (synopsis "Python Imaging Library") - (description "The Python Imaging Library (PIL) adds image processing -capabilities to the Python interpreter.") - (license (x11-style - "file://README" - "See 'README' in the distribution.")))) - (define-public python2-cssutils (package (name "python2-cssutils") -- cgit v1.3 From 55a9a8c2b91b19b6233eaee6d1a42f8b7be7235f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Feb 2016 14:01:14 +0100 Subject: gnu: python-pysam, python2-pysam: Move to bioinformatics.scm. * gnu/packages/python.scm (python-pysam, python2-pysam): Move to... * gnu/packages/bioinformatics.scm (python-pysam, python2-pysam): ...here. --- gnu/packages/bioinformatics.scm | 38 ++++++++++++++++++++++++++++++++++++++ gnu/packages/python.scm | 38 -------------------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5f8ce22a8b..45ab9aa7b3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -838,6 +838,44 @@ well as many of the command line options.") multiple sequence alignments.") (license license:expat))) +(define-public python-pysam + (package + (name "python-pysam") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/p/pysam/pysam-" + version ".tar.gz")) + (sha256 + (base32 + "1fb6i6hbpzxaxb62kyyp5alaidwhj40f7c6gwbhr6njzlqd5l459")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; tests are excluded in the manifest + #:phases + (alist-cons-before + 'build 'set-flags + (lambda _ + (setenv "LDFLAGS" "-lncurses") + (setenv "CFLAGS" "-D_CURSES_LIB=1")) + %standard-phases))) + (inputs + `(("python-cython" ,python-cython) + ("python-setuptools" ,python-setuptools) + ("ncurses" ,ncurses) + ("zlib" ,zlib))) + (home-page "https://github.com/pysam-developers/pysam") + (synopsis "Python bindings to the SAMtools C API") + (description + "Pysam is a Python module for reading and manipulating files in the +SAM/BAM format. Pysam is a lightweight wrapper of the SAMtools C API. It +also includes an interface for tabix.") + (license license:expat))) + +(define-public python2-pysam + (package-with-python2 python-pysam)) + (define-public clipper (package (name "clipper") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4f34537df6..131ec6207b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1040,44 +1040,6 @@ get the local timezone information, unless you know the zoneinfo name, and under several distributions that's hard or impossible to figure out.") (license cc0))) -(define-public python-pysam - (package - (name "python-pysam") - (version "0.8.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/p/pysam/pysam-" - version ".tar.gz")) - (sha256 - (base32 - "1fb6i6hbpzxaxb62kyyp5alaidwhj40f7c6gwbhr6njzlqd5l459")))) - (build-system python-build-system) - (arguments - `(#:tests? #f ; tests are excluded in the manifest - #:phases - (alist-cons-before - 'build 'set-flags - (lambda _ - (setenv "LDFLAGS" "-lncurses") - (setenv "CFLAGS" "-D_CURSES_LIB=1")) - %standard-phases))) - (inputs - `(("python-cython" ,python-cython) - ("python-setuptools" ,python-setuptools) - ("ncurses" ,ncurses) - ("zlib" ,zlib))) - (home-page "https://github.com/pysam-developers/pysam") - (synopsis "Python bindings to the SAMtools C API") - (description - "Pysam is a Python module for reading and manipulating files in the -SAM/BAM format. Pysam is a lightweight wrapper of the SAMtools C API. It -also includes an interface for tabix.") - (license license:expat))) - -(define-public python2-pysam - (package-with-python2 python-pysam)) - (define-public python2-pysqlite (package (name "python2-pysqlite") -- cgit v1.3 From 65f1b8a591c4481b6b084a16bc5a1597a04509da Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 4 Mar 2016 05:35:46 -0500 Subject: gnu: python-cryptography, python-cryptography-vectors: Update to 1.2.3. These packages should be updated together. * gnu/packages/python.scm (python-cryptography): Update to 1.2.3. (python-cryptography-vectors): Update to 1.2.3. --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 131ec6207b..050f9e64c0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5768,7 +5768,7 @@ responses, rather than doing any computation.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) @@ -5777,7 +5777,7 @@ responses, rather than doing any computation.") version ".tar.gz")) (sha256 (base32 - "1zg47fzzn30mgkkbwrxqqcfq9crgabcmxyiy106n9404wbhfjkkl")))) + "0shawgpax79gvjrj0a313sll9gaqys7q1hxngn6j4k24lmz7bwki")))) (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools))) @@ -5794,14 +5794,14 @@ responses, rather than doing any computation.") (define-public python-cryptography (package (name "python-cryptography") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "0rvaha7ymgbqkzbxk7xmj67k5b3hbp8w8cn3m5z776vd22wrq89z")))) + "0kj511z4g21fhcr649pyzpl0zzkkc7hsgxxjys6z8wwfvmvirccf")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.3 From bea6d94d2498f45b5dc99375ab367ffa51a6abfd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 13 Mar 2016 16:09:17 -0400 Subject: gnu: python-hypothesis: Update to 3.1.0. * gnu/packages/python.scm (python-hypothesis, python2-hypothesis): Update to 3.1.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 050f9e64c0..a44c8ea8d0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7457,13 +7457,13 @@ Amazon Web Services (AWS) API.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.0.4") + (version "3.1.0") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0bh6pqyc56cqlbpg0ffzjs6466blyylix4nsw11qrqwf01cg9gdq")))) + "0qyqq9akm4vshhn8cngjc1qykcvsn7cz6dlm6njfsgpbraqrmbbw")))) (build-system python-build-system) (propagated-inputs `(("python-flake8" ,python-flake8) -- cgit v1.3 From 9bb6d18482429ffbe88788c982c92477561e2fdc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 28 Jan 2016 00:42:33 -0500 Subject: gnu: Add python2-atomicwrites. * gnu/packages/python.scm (python2-atomicwrites): New variable. --- gnu/packages/python.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a44c8ea8d0..916931e2da 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6756,7 +6756,14 @@ WebSocket usage in Python programs.") (description "Library for atomic file writes using platform dependent tools for atomic filesystem operations.") (home-page "https://github.com/untitaker/python-atomicwrites") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-atomicwrites)))))) + +(define-public python2-atomicwrites + (package (inherit (package-with-python2 + (strip-python2-variant python-atomicwrites))) + (native-inputs + `(("python2-setuptools" ,python2-setuptools))))) (define-public python-requests-toolbelt (package -- cgit v1.3 From d3b29319b195e3b94c468469cb2f29c2a9c859e6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 3 Mar 2016 17:04:16 -0500 Subject: gnu: python2-pyicu: Update to 1.9.2. * gnu/packages/python.scm (python2-pyicu): Update to 1.9.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 916931e2da..271e15789e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1136,7 +1136,7 @@ Python 3.3+.") (define-public python2-pyicu (package (name "python2-pyicu") - (version "1.8") + (version "1.9.2") (source (origin (method url-fetch) @@ -1144,7 +1144,7 @@ Python 3.3+.") version ".tar.gz")) (sha256 (base32 - "1y361x82lnh9k9srmdx3q92z5iag112z7r5fxm0n1sfwb349yjdw")))) + "1diba0g8md614fvm9yf50paiwdkhj6rd7xwf1rg9mc0pxc0hhn4v")))) (build-system python-build-system) (inputs `(("icu4c" ,icu4c))) -- cgit v1.3 From ed07b08d937a8f1f3f982f3fc825e5319c156503 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 3 Mar 2016 17:04:56 -0500 Subject: gnu: Split python2-pyicu into python-pyicu and python2-pyicu. * gnu/packages/python.scm (python2-pyicu): Split variable into... (python-pyicu, python2-pyicu): ...both Python variants. (python-pyicu)[arguments]: Enable tests. --- gnu/packages/python.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 271e15789e..9730219e7d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1133,9 +1133,9 @@ Python 3.3+.") (package-with-python2 python-simplejson)) -(define-public python2-pyicu +(define-public python-pyicu (package - (name "python2-pyicu") + (name "python-pyicu") (version "1.9.2") (source (origin @@ -1148,15 +1148,18 @@ Python 3.3+.") (build-system python-build-system) (inputs `(("icu4c" ,icu4c))) - (arguments - `(#:python ,python-2 ; Python 3 works also, but needs special care for - ; linking with libpython3.3m - #:tests? #f)) ; no check target (home-page "http://pyicu.osafoundation.org/") (synopsis "Python extension wrapping the ICU C++ API") (description "PyICU is a python extension wrapping the ICU C++ API.") - (license x11))) + (license x11) + (properties `((python2-variant . ,(delay python2-pyicu)))))) + +(define-public python2-pyicu + (package + (inherit (package-with-python2 + (strip-python2-variant python-pyicu))) + (native-inputs `(("python2-setuptools" ,python2-setuptools))))) (define-public python2-dogtail ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and -- cgit v1.3 From eed1a61fbbae973defa81a886080dd743c12c828 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 28 Jan 2016 00:51:49 -0500 Subject: gnu: Add python-vobject. * gnu/packages/python.scm (python-vobject, python2-vobject): New variables. --- gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9730219e7d..af3c60bac9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8203,3 +8203,33 @@ introspection of @code{zope.interface} instances in code.") (inherit (package-with-python2 (strip-python2-variant python-psycopg2))) (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + +(define-public python-vobject + (package + (name "python-vobject") + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "vobject" version)) + (sha256 + (base32 + "1cwzjnrdr9yg2x21wbf3kf59ibnchvj33mygd69yzi178a9gs9gz")))) + (build-system python-build-system) + (inputs + `(("python-dateutil-2" ,python-dateutil-2) + ("python-pyicu" ,python-pyicu))) + (synopsis "Parse and generate vCard and vCalendar files") + (description "Vobject is intended to be a full featured Python package for +parsing and generating vCard and vCalendar files. Currently, iCalendar files +are supported and well tested. vCard 3.0 files are supported, and all data +should be imported, but only a few components are understood in a sophisticated +way.") + (home-page "http://eventable.github.io/vobject/") + (license asl2.0) + (properties `((python2-variant . ,(delay python2-vobject)))))) + +(define-public python2-vobject + (package + (inherit (package-with-python2 + (strip-python2-variant python-vobject))) + (native-inputs `(("python2-setuptools" ,python2-setuptools))))) -- cgit v1.3 From cedac813a58e6220edc771f112e0d50ab188b0ce Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 14 Feb 2016 02:00:42 -0500 Subject: gnu: Add python-munkres. * gnu/packages/python.scm (python-munkres, python2-munkres): New variables. --- gnu/packages/python.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index af3c60bac9..aab239fe03 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8233,3 +8233,26 @@ way.") (inherit (package-with-python2 (strip-python2-variant python-vobject))) (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + +(define-public python-munkres + (package + (name "python-munkres") + (version "1.0.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "munkres" version)) + (sha256 + (base32 + "1i6nf45i0kkzdx6k70giybsqxz4dxsjbrkrfqgjd7znfkf25sjik")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; no test suite + (home-page "http://software.clapper.org/munkres/") + (synopsis "Implementation of the Munkres algorithm") + (description "The Munkres module provides an implementation of the Munkres +algorithm (also called the Hungarian algorithm or the Kuhn-Munkres algorithm), +useful for solving the Assignment Problem.") + (license bsd-3))) + +(define-public python2-munkres + (package-with-python2 python-munkres)) -- cgit v1.3 From f3b3d78fbc3c2c98e2d403c1fd102560ae292c98 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 14 Feb 2016 02:03:38 -0500 Subject: gnu: Add python-flask. * gnu/packages/python.scm (python-flask, python2-flask): New variables. --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index aab239fe03..d7828fb233 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8256,3 +8256,31 @@ useful for solving the Assignment Problem.") (define-public python2-munkres (package-with-python2 python-munkres)) + +(define-public python-flask + (package + (name "python-flask") + (version "0.10.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "Flask" version)) + (sha256 + (base32 + "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc")))) + (build-system python-build-system) + (propagated-inputs + `(("python-itsdangerous" ,python-itsdangerous) + ("python-jinja2" ,python-jinja2) + ("python-werkzeug" ,python-werkzeug))) + (home-page "https://github.com/mitsuhiko/flask/") + (synopsis "Microframework based on Werkzeug, Jinja2 and good intentions") + (description "Flask is a micro web framework based on the Werkzeug toolkit +and Jinja2 template engine. It is called a micro framework because it does not +presume or force a developer to use a particular tool or library.") + (license bsd-3) + (properties `((python2-variant . ,(delay python2-flask)))))) + +(define-public python2-flask + (package (inherit (package-with-python2 + (strip-python2-variant python-flask))) + (native-inputs `(("python2-setuptools" ,python2-setuptools))))) -- cgit v1.3 From 603d665bc3767f73d4b78f52fb20cf76e21689fc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 18 Mar 2016 00:40:26 -0400 Subject: gnu: Add python-cookies. * gnu/packages/python.scm (python-cookies, python2-cookies): New variable. --- gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d7828fb233..9144a37de4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8284,3 +8284,33 @@ presume or force a developer to use a particular tool or library.") (package (inherit (package-with-python2 (strip-python2-variant python-flask))) (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + +(define-public python-cookies + (package + (name "python-cookies") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "cookies" version)) + (sha256 + (base32 + "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn")))) + (build-system python-build-system) + (arguments + `(;; test are broken: https://gitlab.com/sashahart/cookies/issues/3 + #:tests? #f)) + (native-inputs + `(("python-pytest" ,python2-pytest))) + (synopsis "HTTP cookie parser and renderer") + (description "A RFC 6265-compliant HTTP cookie parser and renderer in +Python.") + (home-page "https://gitlab.com/sashahart/cookies") + (license license:expat) + (properties `((python2-variant . ,(delay python2-cookies)))))) + +(define-public python2-cookies + (let ((cookies (package-with-python2 + (strip-python2-variant python-cookies)))) + (package (inherit cookies) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs cookies)))))) -- cgit v1.3 From 0efde7d6d6370759f62cb38cc97bd9ee942cb23c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Feb 2016 04:19:28 -0500 Subject: gnu: Add python-responses. * gnu/packages/python.scm (python-responses, python2-responses): New variables. --- gnu/packages/python.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9144a37de4..b2b906704f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8314,3 +8314,38 @@ Python.") (package (inherit cookies) (native-inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs cookies)))))) + +(define-public python-responses + (package + (name "python-responses") + (version "0.5.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "responses" version)) + (sha256 + (base32 + "1spcfxixyk9k7pk82jm6zqkwk031s95lh8q0mz7539jrb7269bcc")))) + (build-system python-build-system) + (arguments + `(;; Test suite is not distributed: + ;; https://github.com/getsentry/responses/issues/38 + #:tests? #f)) + (native-inputs + `(("python-cookies" ,python-cookies) + ("python-mock" ,python-mock))) + (propagated-inputs + `(("python-requests" ,python-requests) + ("python-six" ,python-six))) + (home-page "https://github.com/getsentry/responses") + (synopsis "Utility for mocking out the `requests` Python library") + (description "A utility library for mocking out the `requests` Python +library.") + (license asl2.0) + (properties `((python2-variant . ,(delay python2-responses)))))) + +(define-public python2-responses + (let ((responses (package-with-python2 + (strip-python2-variant python-responses)))) + (package (inherit responses) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs responses)))))) -- cgit v1.3 From 76b94885348b20c79c49613c07a0e472d284a36b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Feb 2016 04:22:01 -0500 Subject: gnu: Add python2-pathlib. * gnu/packages/python.scm (python-pathlib, python2-pathlib): New variables. --- gnu/packages/python.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b2b906704f..cff82fa198 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8349,3 +8349,37 @@ library.") (package (inherit responses) (native-inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs responses)))))) + +(define-public python-pathlib + (package + (name "python-pathlib") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pathlib" version)) + (sha256 + (base32 + "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ (zero? (system* "python" "./test_pathlib.py"))))))) + (home-page "https://pathlib.readthedocs.org/") + (synopsis "Object-oriented filesystem paths") + (description "Pathlib offers a set of classes to handle filesystem paths. +It offers the following advantages over using string objects: + +@enumerate +@item No more cumbersome use of os and os.path functions. Everything can +be done easily through operators, attribute accesses, and method calls. +@item Embodies the semantics of different path types. For example, +comparing Windows paths ignores casing. +@item Well-defined semantics, eliminating any inconsistencies or +ambiguities (forward vs. backward slashes, etc.). +@end enumerate\n") + (license license:expat))) + +(define-public python2-pathlib + (package-with-python2 python-pathlib)) -- cgit v1.3 From 25a7db0ad32d0863fbb648a93699b034bd9fce0b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Feb 2016 04:36:37 -0500 Subject: gnu: Add python-jellyfish. * gnu/packages/python.scm (python-jellyfish, python2-jellyfish): New variables. --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index cff82fa198..4ea2064df6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8383,3 +8383,31 @@ ambiguities (forward vs. backward slashes, etc.). (define-public python2-pathlib (package-with-python2 python-pathlib)) + +(define-public python-jellyfish + (package + (name "python-jellyfish") + (version "0.5.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "jellyfish" version)) + (sha256 + (base32 + "12bxh8cy9xmvyrjz7aw159nd5pyvb645rkvw4r6bvm4xbvs8gd07")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/jamesturk/jellyfish") + (synopsis "Approximate and phonetic matching of strings") + (description "Jellyfish uses a variety of string comparison and phonetic +encoding algorithms to do fuzzy string matching.") + (license bsd-2) + (properties `((python2-variant . ,(delay python2-jellyfish)))))) + +(define-public python2-jellyfish + (let ((jellyfish (package-with-python2 + (strip-python2-variant python-jellyfish)))) + (package (inherit jellyfish) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ("python2-unicodecsv" ,python2-unicodecsv) + ,@(package-native-inputs jellyfish)))))) -- cgit v1.3 From 13edb0e5c36181bc8a48fa6a28005b3e3046174a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Feb 2016 04:38:42 -0500 Subject: gnu: Add python2-unicodecsv. * gnu/packages/python.scm (python2-unicodecsv): New variable. --- 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 4ea2064df6..75481fc5b6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8411,3 +8411,30 @@ encoding algorithms to do fuzzy string matching.") (native-inputs `(("python2-setuptools" ,python2-setuptools) ("python2-unicodecsv" ,python2-unicodecsv) ,@(package-native-inputs jellyfish)))))) + +(define-public python2-unicodecsv + (package + (name "python2-unicodecsv") + (version "0.14.1") + (source (origin + (method url-fetch) + ;; The test suite is not included in the PyPi release. + ;; https://github.com/jdunck/python-unicodecsv/issues/19 + (uri (string-append "https://github.com/jdunck/python-unicodecsv/" + "archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "087nqanfcyp6mlfbbr5lva5f3w6iz1bybls9xlrb8icmc474wh4w")))) + (build-system python-build-system) + (arguments + `(;; It supports Python 3, but Python 3 can already do Unicode CSV. + #:python ,python-2)) + (native-inputs + `(("python2-setuptools" ,python2-setuptools) + ("python2-unittest2" ,python2-unittest2))) + (home-page "https://github.com/jdunck/python-unicodecsv") + (synopsis "Unicode CSV module for Python 2") + (description "Unicodecsv is a drop-in replacement for Python 2.7's CSV +module, adding support for Unicode strings.") + (license bsd-2))) -- cgit v1.3 From 064503aaa2aaceecc4e4df835f7e5a72e8a7c4a7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 14 Feb 2016 02:12:27 -0500 Subject: gnu: Add python-rarfile. * gnu/packages/python.scm (python-rarfile, python2-rarfile): New variables. * gnu/packages/patches/python-rarfile-fix-tests.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + .../patches/python-rarfile-fix-tests.patch | 14 ++++++++++ gnu/packages/python.scm | 32 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 gnu/packages/patches/python-rarfile-fix-tests.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu-system.am b/gnu-system.am index ff53b3eb04..f13a55de12 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -701,6 +701,7 @@ dist_patch_DATA = \ gnu/packages/patches/python-disable-ssl-test.patch \ gnu/packages/patches/python-fix-tests.patch \ gnu/packages/patches/python-ipython-inputhook-ctype.patch \ + gnu/packages/patches/python-rarfile-fix-tests.patch \ gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ gnu/packages/patches/python-configobj-setuptools.patch \ gnu/packages/patches/python-paste-remove-website-test.patch \ diff --git a/gnu/packages/patches/python-rarfile-fix-tests.patch b/gnu/packages/patches/python-rarfile-fix-tests.patch new file mode 100644 index 0000000000..8ae8894009 --- /dev/null +++ b/gnu/packages/patches/python-rarfile-fix-tests.patch @@ -0,0 +1,14 @@ +There is no test.sh, but there are test1.sh and test2.sh. + +diff --git a/test/Makefile b/test/Makefile +index 027bc5f..5383db3 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -1,5 +1,6 @@ + test: +- ./test.sh ++ ./test1.sh ++ ./test2.sh + + clean: + rm -rf __pycache__ diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 75481fc5b6..97a69c3a1b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8438,3 +8438,35 @@ encoding algorithms to do fuzzy string matching.") (description "Unicodecsv is a drop-in replacement for Python 2.7's CSV module, adding support for Unicode strings.") (license bsd-2))) + +(define-public python-rarfile + (package + (name "python-rarfile") + (version "2.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "rarfile" version)) + (sha256 + (base32 + "0d8n1dlpiz7av8dmbp0vclrwl9cnxizr4f2c9xvj1h5nvn480527")) + ;; https://github.com/markokr/rarfile/pull/17/ + (patches (list (search-patch "python-rarfile-fix-tests.patch"))))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + ;; Many tests fail, but the installation proceeds. + (lambda _ (zero? (system* "make" "-C" "test" "test"))))))) + (native-inputs + `(("which" ,which))) ; required for tests + (propagated-inputs + `(("libarchive" ,libarchive))) + (home-page "https://github.com/markokr/rarfile") + (synopsis "RAR archive reader for Python") + (description "This is Python module for RAR archive reading. The interface +is made as zipfile like as possible.") + (license isc))) + +(define-public python2-rarfile + (package-with-python2 python-rarfile)) -- cgit v1.3