From de2032b912ede1756290e7ca9f7af7e9b72627eb Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 19 Dec 2017 12:50:22 +0100 Subject: gnu: Add python-activepapers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-activepapers, python2-activepapers): New variables. Co-authored-by: Ludovic Courtès --- gnu/packages/python.scm | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1ef54b7fd55..48e8d44ffc1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12001,3 +12001,73 @@ particularly convenient for use in tests.") (define-public python2-tempdir (package-with-python2 python-tempdir)) +(define-public python-activepapers + (package + (name "python-activepapers") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ActivePapers.Py" version)) + (sha256 + (base32 + "12wkhjh90ffipjzv10swndp2xv9hd7xrxvg6v0n4n3i411pj4xb8")))) + (build-system python-build-system) + (arguments + `(#:modules ((ice-9 ftw) + (srfi srfi-1) + (guix build utils) + (guix build python-build-system)) + + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-python2-code + (lambda _ + (for-each delete-file + '("lib/activepapers/builtins2.py" + "lib/activepapers/standardlib2.py" + "lib/activepapers/utility2.py")))) + (replace 'check + (lambda _ + ;; Deactivate the test cases that download files + (setenv "NO_NETWORK_ACCESS" "1") + ;; For some strange reason, some tests fail if nosetests runs all + ;; test modules in a single execution. They pass if each test + ;; module is run individually. + (for-each (lambda (filename) + (invoke "nosetests" + (string-append "tests/" filename))) + (scandir "tests" + (lambda (filename) + (string-suffix? ".py" filename))))))))) + (native-inputs + `(("python-tempdir" ,python-tempdir) + ("python-nose" ,python-nose))) + (propagated-inputs + `(("python-h5py" ,python-h5py))) + (home-page "http://www.activepapers.org/") + (synopsis "Executable papers for scientific computing") + (description + "ActivePapers is a tool for working with executable papers, which +combine data, code, and documentation in single-file packages, +suitable for publication as supplementary material or on repositories +such as figshare or Zenodo.") + (properties `((python2-variant . ,(delay python2-activepapers)))) + (license license:bsd-3))) + +(define-public python2-activepapers + (let ((base (package-with-python2 + (strip-python2-variant python-activepapers)))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (delete 'delete-python2-code) + (add-after 'unpack 'delete-python3-code + (lambda _ + (for-each delete-file + '("lib/activepapers/builtins3.py" + "lib/activepapers/standardlib3.py" + "lib/activepapers/utility3.py"))))))))))) -- cgit v1.3 From 3a1f26ff75d5032f402b5bb95c579ced37492f10 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 4 Dec 2017 11:17:18 -0500 Subject: gnu: Add python-olefile. * gnu/packages/python.scm (python-olefile, python2-olefile): New variables. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 48e8d44ffc1..d3bd2078b0d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3657,6 +3657,32 @@ Python's distutils.") services for your Python modules and applications.") (license license:lgpl3+))) +(define-public python-olefile + (package + (name "python-olefile") + (version "0.44") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/decalage2/olefile/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wmxbrhyqjry2000zx0zdhqdqxhgi06nz7sbzjlh222q2zjv1gpj")))) + (build-system python-build-system) + (home-page + "https://www.decalage.info/python/olefileio") + (synopsis "Read and write Microsoft OLE2 files.") + (description + "@code{olefile} can parse, read and write Microsoft OLE2 files (Structured +Storage or Compound Document, Microsoft Office). It is an improved version of +the OleFileIO module from PIL, the Python Image Library.") + (license license:bsd-3))) + +(define-public python2-olefile + (package-with-python2 python-olefile)) + (define-public python-pillow (package (name "python-pillow") -- cgit v1.3 From 9e3a8ed0ebc5b4095f1b64d85fd56ce7fb636580 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 4 Dec 2017 17:56:37 -0500 Subject: gnu: python-pillow: Update to 4.3.0. * gnu/packages/python.scm (python-pillow): Update to 4.3.0. [propagated-inputs]: Add python-olefile. * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Kei Kebreau --- gnu/local.mk | 1 - .../python-pillow-freetype-2.7-test-failure.patch | 75 ---------------------- gnu/packages/python.scm | 7 +- 3 files changed, 4 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu/local.mk b/gnu/local.mk index ea9c42449ac..b1cf3c3de58 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1025,7 +1025,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pandas-skip-failing-tests.patch \ %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pillow-freetype-2.7-test-failure.patch \ %D%/packages/patches/python-pygit2-disable-network-tests.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch b/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch deleted file mode 100644 index 18bc30bc79e..00000000000 --- a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch +++ /dev/null @@ -1,75 +0,0 @@ -Fix some test failures when building with freetype-2.7. - -https://github.com/python-pillow/Pillow/issues/2116 -https://github.com/python-pillow/Pillow/pull/2286 - -Patch copied from upstream source repository: - -https://github.com/python-pillow/Pillow/commit/acf68c835c93ba144f83198306aa7e6082a43f43 - -From acf68c835c93ba144f83198306aa7e6082a43f43 Mon Sep 17 00:00:00 2001 -From: hugovk -Date: Mon, 12 Dec 2016 15:16:43 +0200 -Subject: [PATCH] Increase epsilon for FreeType 2.7 - ---- - Tests/test_imagefont.py | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py -index de89ac92..5207dce3 100644 ---- a/Tests/test_imagefont.py -+++ b/Tests/test_imagefont.py -@@ -125,7 +125,9 @@ try: - - target = 'Tests/images/rectangle_surrounding_text.png' - target_img = Image.open(target) -- self.assert_image_similar(im, target_img, .5) -+ -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 2.5) - - def test_render_multiline(self): - im = Image.new(mode='RGB', size=(300, 100)) -@@ -144,7 +146,7 @@ try: - # some versions of freetype have different horizontal spacing. - # setting a tight epsilon, I'm showing the original test failure - # at epsilon = ~38. -- self.assert_image_similar(im, target_img, .5) -+ self.assert_image_similar(im, target_img, 6.2) - - def test_render_multiline_text(self): - ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE) -@@ -158,7 +160,8 @@ try: - target = 'Tests/images/multiline_text.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - # Test that text() can pass on additional arguments - # to multiline_text() -@@ -178,7 +181,8 @@ try: - target = 'Tests/images/multiline_text'+ext+'.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - def test_unknown_align(self): - im = Image.new(mode='RGB', size=(300, 100)) -@@ -227,7 +231,8 @@ try: - target = 'Tests/images/multiline_text_spacing.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - def test_rotated_transposed_font(self): - img_grey = Image.new("L", (100, 100)) --- -2.12.0 - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d3bd2078b0d..9fd7d9f6be8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3686,15 +3686,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "3.3.3") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) - (patches (search-patches "python-pillow-freetype-2.7-test-failure.patch")) (sha256 (base32 - "0xkv0p1d73gz0a1qaasf0ai4262g8f334j07vd60bjrxs2wr3nmj")))) + "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) @@ -3706,6 +3705,8 @@ the OleFileIO module from PIL, the Python Image Library.") ("openjpeg" ,openjpeg) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) + (propagated-inputs + `(("python-olefile" ,python-olefile))) (arguments `(#:phases (modify-phases %standard-phases (add-after -- cgit v1.3 From e144cbcf850adca4cac8a4548632add1dc738219 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Wed, 20 Dec 2017 17:18:56 +0100 Subject: gnu: python-numpy: Reorganize patches. * gnu/packages/python.scm (python-numpy)[arguments]: Delete phase "set-environment-variables". Add phase "configure-blas-lapack". Move phase "check" after phase "install". --- gnu/packages/python.scm | 63 ++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 30 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9fd7d9f6be8..5dc7b1d847c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2619,12 +2619,12 @@ between language specification and implementation aspects.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'build 'set-environment-variables - (lambda* (#:key inputs #:allow-other-keys) - (call-with-output-file "site.cfg" - (lambda (port) - (format port - "[openblas] + (add-before 'build 'configure-blas-lapack + (lambda* (#:key inputs #:allow-other-keys) + (call-with-output-file "site.cfg" + (lambda (port) + (format port + "[openblas] libraries = openblas library_dirs = ~a/lib include_dirs = ~a/include @@ -2635,30 +2635,33 @@ lapack_libs = lapack library_dirs = ~a/lib include_dirs = ~a/include " - (assoc-ref inputs "openblas") - (assoc-ref inputs "openblas") - (assoc-ref inputs "lapack") - (assoc-ref inputs "lapack")))) - ;; Make /gnu/store/...-bash-.../bin/sh the default shell, instead of - ;; /bin/sh. - (substitute* "numpy/distutils/exec_command.py" - (("(os.environ.get\\('SHELL', ')(/bin/sh'\\))" match match-start match-end) - (string-append match-start (assoc-ref inputs "bash") match-end))) - ;; Use "gcc" executable, not "cc". - (substitute* "numpy/distutils/system_info.py" - (("c = distutils\\.ccompiler\\.new_compiler\\(\\)") - "c = distutils.ccompiler.new_compiler(); c.set_executables(compiler='gcc',compiler_so='gcc',linker_exe='gcc',linker_so='gcc -shared')")) - #t)) - ;; Tests can only be run after the library has been installed and not - ;; within the source directory. - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Make installed package available for running the tests - (add-installed-pythonpath inputs outputs) - (with-directory-excursion "/tmp" - (zero? (system* "python" "-c" - "import numpy; numpy.test(verbose=2)")))))))) + (assoc-ref inputs "openblas") + (assoc-ref inputs "openblas") + (assoc-ref inputs "lapack") + (assoc-ref inputs "lapack")))) + #t)) + (add-before 'build 'fix-executable-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Make /gnu/store/...-bash-.../bin/sh the default shell, + ;; instead of /bin/sh. + (substitute* "numpy/distutils/exec_command.py" + (("(os.environ.get\\('SHELL', ')(/bin/sh'\\))" match match-start match-end) + (string-append match-start (assoc-ref inputs "bash") match-end))) + ;; Use "gcc" executable, not "cc". + (substitute* "numpy/distutils/system_info.py" + (("c = distutils\\.ccompiler\\.new_compiler\\(\\)") + "c = distutils.ccompiler.new_compiler(); c.set_executables(compiler='gcc',compiler_so='gcc',linker_exe='gcc',linker_so='gcc -shared')")) + #t)) + ;; Tests can only be run after the library has been installed and not + ;; within the source directory. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) + (with-directory-excursion "/tmp" + (zero? (system* "python" "-c" + "import numpy; numpy.test(verbose=2)")))))))) (home-page "http://www.numpy.org/") (synopsis "Fundamental package for scientific computing with Python") (description "NumPy is the fundamental package for scientific computing -- cgit v1.3 From a08d5a07a921af93487c1b52cd0c1fb8fbe27b51 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Wed, 20 Dec 2017 17:19:14 +0100 Subject: gnu: Add python2-numpy-1.8. * gnu/packages/python.scm (python2-numpy-1.8): New variable. --- gnu/packages/python.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5dc7b1d847c..a3e1a885f99 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2694,6 +2694,49 @@ capabilities.") (define-public python2-numpy-next (package-with-python2 python-numpy-next)) +;; NOTE: NumPy 1.8 is packaged only for Python 2 because it is of +;; interest only for legacy code going back to NumPy's predecessor +;; Numeric. +(define-public python2-numpy-1.8 + (package (inherit python2-numpy) + (version "1.8.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/numpy/numpy/archive/v" version ".tar.gz")) + (file-name (string-append "python2-numpy-" version ".tar.gz")) + (sha256 + (base32 + "0sc20gz1b17xnyrkp5frca3ql5qfalpv916hfg2kqxpwr6jg0f1g")))) + (arguments + (substitute-keyword-arguments (package-arguments python2-numpy) + ((#:phases phases) + `(modify-phases ,phases + (replace 'configure-blas-lapack + (lambda* (#:key inputs #:allow-other-keys) + (call-with-output-file "site.cfg" + (lambda (port) + (format port + "[openblas] +libraries = openblas,lapack +library_dirs = ~a/lib:~a/lib +include_dirs = ~a/include:~a/include +" + (assoc-ref inputs "openblas") + (assoc-ref inputs "lapack") + (assoc-ref inputs "openblas") + (assoc-ref inputs "lapack")))) + #t)))))) + (description "NumPy is the fundamental package for scientific computing +with Python. It contains among other things: a powerful N-dimensional array +object, sophisticated (broadcasting) functions, tools for integrating C/C++ +and Fortran code, useful linear algebra, Fourier transform, and random number +capabilities. Version 1.8 is the last one to contain the numpy.oldnumeric API +that includes the compatibility layer numpy.oldnumeric with NumPy's predecessor +Numeric.") + (license license:bsd-3))) + (define-public python-munch (package (name "python-munch") -- cgit v1.3 From 9be5ecdf8a0156f2ba47a76eb1340f89de8c018b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Dec 2017 23:27:29 +0100 Subject: gnu: python, python-web: Update ‘permanently moved’ home pages. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In practice, this switches all of them to HTTPS. * gnu/packages/python.scm (python-six, python-spectra, python-scipy) (python-beautifulsoup4, python-termcolor, python-rsa, python-anyjson) (python-whoosh, python2-pathlib2, python-pbkdf2, python-ansi2html) (python-rfc3987, python-validate-email, python-swagger-spec-validator) [home-page]: Update. * gnu/packages/python-web.scm (python-sockjs-tornado, python-webob) (python-zope-event, python-zope-testing, python-zope-testrunner) (python-zope-i18nmessageid, python-zope-schema, python-zope-configuration) (python-zope-proxy, python-zope-location, python-zope-security) (python-oauth2client, python-flask-script, python-flask-migrate) (python-flask-httpauth)[home-page]: Update. --- gnu/packages/python-web.scm | 30 +++++++++++++++--------------- gnu/packages/python.scm | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 12e45b2effd..4e280b4590f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -121,7 +121,7 @@ other HTTP libraries.") #:tests? #f)) (propagated-inputs `(("python-tornado" ,python-tornado))) - (home-page "http://github.com/mrjoes/sockjs-tornado/") + (home-page "https://github.com/mrjoes/sockjs-tornado/") (synopsis "SockJS python server implementation on top of Tornado framework") (description @@ -584,7 +584,7 @@ your Web app.") (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) - (home-page "http://webob.org/") + (home-page "https://webob.org/") (synopsis "WSGI request and response object") (description "WebOb provides wrappers around the WSGI request environment, and an @@ -607,7 +607,7 @@ object to help create WSGI responses.") (base32 "11p75zpfz3ffhz21nzx9wb23xs993ck5s6hkjcvhswwizni5jynw")))) (build-system python-build-system) - (home-page "http://pypi.python.org/pypi/zope.event") + (home-page "https://pypi.python.org/pypi/zope.event") (synopsis "Event publishing system for Python") (description "Zope.event provides an event publishing API, intended for use by applications which are unaware of any subscribers to their events. It @@ -694,7 +694,7 @@ that have uses outside of the Zope framework.") `(("python-zope-exceptions" ,python-zope-exceptions))) (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) - (home-page "http://pypi.python.org/pypi/zope.testing") + (home-page "https://pypi.python.org/pypi/zope.testing") (synopsis "Zope testing helpers") (description "Zope.testing provides a number of testing utilities for HTML forms, HTTP servers, regular expressions, and more.") @@ -727,7 +727,7 @@ forms, HTTP servers, regular expressions, and more.") ("unzip" ,unzip))) (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) - (home-page "http://pypi.python.org/pypi/zope.testrunner") + (home-page "https://pypi.python.org/pypi/zope.testrunner") (synopsis "Zope testrunner script") (description "Zope.testrunner provides a script for running Python tests.") @@ -757,7 +757,7 @@ tests.") (base32 "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml")))) (build-system python-build-system) - (home-page "http://pypi.python.org/pypi/zope.i18nmessageid") + (home-page "https://pypi.python.org/pypi/zope.i18nmessageid") (synopsis "Message identifiers for internationalization") (description "Zope.i18nmessageid provides facilities for declaring internationalized messages within program source text.") @@ -789,7 +789,7 @@ internationalized messages within program source text.") `(("python-zope-testing" ,python-zope-testing) ("python-coverage" ,python-coverage) ("python-nose" ,python-nose))) - (home-page "http://pypi.python.org/pypi/zope.schema") + (home-page "https://pypi.python.org/pypi/zope.schema") (synopsis "Zope data schemas") (description "Zope.scheme provides extensions to zope.interface for defining data schemas.") @@ -816,7 +816,7 @@ defining data schemas.") (propagated-inputs `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) ("python-zope-schema" ,python-zope-schema))) - (home-page "http://pypi.python.org/pypi/zope.configuration") + (home-page "https://pypi.python.org/pypi/zope.configuration") (synopsis "Zope Configuration Markup Language") (description "Zope.configuration implements ZCML, the Zope Configuration Markup Language.") @@ -842,7 +842,7 @@ Markup Language.") '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) - (home-page "http://pypi.python.org/pypi/zope.proxy") + (home-page "https://pypi.python.org/pypi/zope.proxy") (synopsis "Generic, transparent proxies") (description "Zope.proxy provides generic, transparent proxies for Python. Proxies are special objects which serve as mostly-transparent wrappers around @@ -872,7 +872,7 @@ brokering, etc.) for which the proxy is responsible.") (propagated-inputs `(("python-zope-proxy" ,python-zope-proxy) ("python-zope-schema" ,python-zope-schema))) - (home-page "http://pypi.python.org/pypi/zope.location/") + (home-page "https://pypi.python.org/pypi/zope.location/") (synopsis "Zope location library") (description "Zope.location implements the concept of \"locations\" in Zope3, which are are special objects that have a structural location.") @@ -907,7 +907,7 @@ Zope3, which are are special objects that have a structural location.") ("python-zope-location" ,python-zope-location) ("python-zope-testrunner" ,python-zope-testrunner) ("python-zope-testing" ,python-zope-testing))) - (home-page "http://pypi.python.org/pypi/zope.security") + (home-page "https://pypi.python.org/pypi/zope.security") (synopsis "Zope security framework") (description "Zope.security provides a generic mechanism to implement security policies on Python objects.") @@ -1971,7 +1971,7 @@ users' sessions over extended periods of time.") ("python-pyasn1-modules" ,python-pyasn1-modules) ("python-rsa" ,python-rsa) ("python-six" ,python-six))) - (home-page "http://github.com/google/oauth2client/") + (home-page "https://github.com/google/oauth2client/") (synopsis "OAuth 2.0 client library") (description "@code{python-oauth2client} provides an OAuth 2.0 client library for Python") @@ -2098,7 +2098,7 @@ this it tries to be opinion-free and very extendable.") (native-inputs `(("python-pytest" ,python-pytest))) (home-page - "http://github.com/smurfix/flask-script") + "https://github.com/smurfix/flask-script") (synopsis "Scripting support for Flask") (description "The Flask-Script extension provides support for writing external scripts in Flask. This includes running a development server, @@ -2128,7 +2128,7 @@ itself.") ("python-sqlalchemy" ,python-sqlalchemy) ("python-flask-script" ,python-flask-script) ("python-flask-sqlalchemy" ,python-flask-sqlalchemy))) - (home-page "http://github.com/miguelgrinberg/flask-migrate/") + (home-page "https://github.com/miguelgrinberg/flask-migrate/") (synopsis "SQLAlchemy database migrations for Flask programs using Alembic") (description "This package contains SQLAlchemy database migration tools @@ -2219,7 +2219,7 @@ thread-local variable.") (build-system python-build-system) (native-inputs `(("python-flask" ,python-flask))) - (home-page "http://github.com/miguelgrinberg/flask-httpauth/") + (home-page "https://github.com/miguelgrinberg/flask-httpauth/") (synopsis "Basic and Digest HTTP authentication for Flask routes") (description "@code{flask_httpauth} provides Basic and Digest HTTP authentication for Flask routes.") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a3e1a885f99..101967a1604 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -967,7 +967,7 @@ from the Python interpreter, or as a small part of a larger application.") (native-inputs `(("python-py" ,python-py) ("python-pytest" ,python-pytest))) - (home-page "http://pypi.python.org/pypi/six/") + (home-page "https://pypi.python.org/pypi/six/") (synopsis "Python 2 and 3 compatibility utilities") (description "Six is a Python 2 and 3 compatibility library. It provides utility @@ -2804,7 +2804,7 @@ objects.") `(("python-colormath" ,python-colormath))) (native-inputs `(("python-nose" ,python-nose))) - (home-page "http://github.com/jsvine/spectra") + (home-page "https://github.com/jsvine/spectra") (synopsis "Color scales and color conversion") (description "This package provides a Python library intended to make color math, @@ -3525,7 +3525,7 @@ atlas_libs = openblas (zero? (system* "python" "-c" "import scipy; scipy.test('full')"))) #t))))) - (home-page "http://www.scipy.org/") + (home-page "https://www.scipy.org/") (synopsis "The Scipy library provides efficient numerical routines") (description "The SciPy library is one of the core packages that make up the SciPy stack. It provides many user-friendly and efficient numerical @@ -4720,7 +4720,7 @@ libxml2 and libxslt.") (replace 'check (lambda _ (zero? (system* "./convert-py3k"))))))) (home-page - "http://www.crummy.com/software/BeautifulSoup/bs4/") + "https://www.crummy.com/software/BeautifulSoup/bs4/") (synopsis "Python screen-scraping library") (description @@ -6103,7 +6103,7 @@ a hash value.") (arguments ;; There are no tests. `(#:tests? #f)) - (home-page "http://pypi.python.org/pypi/termcolor") + (home-page "https://pypi.python.org/pypi/termcolor") (synopsis "ANSII Color formatting for terminal output") (description "This package provides ANSII Color formatting for output in terminals.") @@ -7233,7 +7233,7 @@ text.") encryption and decryption, signing and verifying signatures, and key generation according to PKCS#1 version 1.5. It can be used as a Python library as well as on the command line.") - (home-page "http://stuvel.eu/rsa") + (home-page "https://stuvel.eu/rsa") (license license:asl2.0))) (define-public python2-rsa @@ -7492,7 +7492,7 @@ fast xml and html manipulation.") ;; but it could be annoying/difficult. ;; We can enable tests for the Python 2 version, though, and do below. #:tests? #f)) - (home-page "http://bitbucket.org/runeh/anyjson/") + (home-page "https://bitbucket.org/runeh/anyjson/") (synopsis "Wraps best available JSON implementation in a common interface") (description @@ -7837,7 +7837,7 @@ useful for solving the Assignment Problem.") (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "http://bitbucket.org/mchaput/whoosh") + (home-page "https://bitbucket.org/mchaput/whoosh") (synopsis "Full text indexing, search, and spell checking library") (description "Whoosh is a fast, pure-Python full text indexing, search, and spell @@ -7907,7 +7907,7 @@ anymore.") `(#:python ,python-2)) (native-inputs `(("python2-six" ,python2-six))) - (home-page "http://pypi.python.org/pypi/pathlib2/") + (home-page "https://pypi.python.org/pypi/pathlib2/") (synopsis "Object-oriented file system paths - backport of standard pathlib module") (description "The goal of pathlib2 is to provide a backport of standard @@ -10037,7 +10037,7 @@ protocols written in pure Python.") (zero? (system* "python" "test/test_pbkdf2.py"))))))) (propagated-inputs `(("python-pycrypto" ,python-pycrypto))) ; optional - (home-page "http://www.dlitz.net/software/python-pbkdf2/") + (home-page "https://www.dlitz.net/software/python-pbkdf2/") (synopsis "Password-based key derivation") (description "This module implements the password-based key derivation function, PBKDF2, specified in RSA PKCS#5 v2.0. @@ -10123,7 +10123,7 @@ to ansi-escaped strings suitable for display in a terminal.") ("python-nose" ,python-nose))) (propagated-inputs `(("python-six" ,python-six))) - (home-page "http://github.com/ralphbean/ansi2html") + (home-page "https://github.com/ralphbean/ansi2html") (synopsis "Convert ANSI-decorated console output to HTML") (description "@command{ansi2html} is a Python library and command line utility for @@ -11294,7 +11294,7 @@ applying JSON Patches according to RFC 6902.") (base32 "192pclzs2y0yaywqkrlvd0x73740q310kvqvm6jldhi619mq59wi")))) (build-system python-build-system) - (home-page "http://pypi.python.org/pypi/rfc3987") + (home-page "https://pypi.python.org/pypi/rfc3987") (synopsis "Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)") (description "@code{rfc3987} provides routines for parsing and validation of URIs (see RFC 3986) and IRIs (see RFC 3987).") @@ -11315,7 +11315,7 @@ validation of URIs (see RFC 3986) and IRIs (see RFC 3987).") (base32 "1bxffaf5yz2cph8ki55vdvdypbwkvn2xr1firlcy62vqbzf1jivq")))) (build-system python-build-system) - (home-page "http://github.com/syrusakbary/validate_email") + (home-page "https://github.com/syrusakbary/validate_email") (synopsis "Verifies if an email address is valid and really exists") (description "@code{validate_email} can be used to verify if an email address is valid and really exists.") @@ -11478,7 +11478,7 @@ from your Flask project. It is a fork of Flask-Swagger.") `(("python-jsonschema" ,python-jsonschema) ("python-six" ,python-six))) (home-page - "http://github.com/Yelp/swagger_spec_validator") + "https://github.com/Yelp/swagger_spec_validator") (synopsis "Validation of Swagger specifications") (description "@code{swagger_spec_validator} provides a library for validating Swagger API specifications.") -- cgit v1.3 From 467cfaa3fcf4f1d45c07ed0f3ba5d85a079f0fd3 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 24 Dec 2017 01:50:38 +0100 Subject: gnu: Add python-semver. * gnu/packages/python.scm (python-semver, python2-semver): New variables. --- gnu/packages/python.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 101967a1604..7ff1e78bbe7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12144,3 +12144,36 @@ such as figshare or Zenodo.") '("lib/activepapers/builtins3.py" "lib/activepapers/standardlib3.py" "lib/activepapers/utility3.py"))))))))))) + +(define-public python-semver + (package + (name "python-semver") + (version "2.7.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "semver" version)) + (sha256 + (base32 + "0hhgqppchv59rqj0yzi1prdg2nfsywqmjsqy2rycyxm0hvxmbyqz")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-test-requirements + (lambda _ + (substitute* "setup.py" + ;; Our Python is new enough. + (("'virtualenv<14\\.0\\.0'") "'virtualenv'")) + #t))))) + (native-inputs + `(("python-tox" ,python-tox) + ("python-virtualenv" ,python-virtualenv))) + (home-page "https://github.com/k-bx/python-semver") + (synopsis "Python helper for Semantic Versioning") + (description "This package provides a Python library for +@url{Semantic Versioning, http://semver.org/}.") + (license license:bsd-3))) + +(define-public python2-semver + (package-with-python2 python-semver)) -- cgit v1.3 From 15b60fc3138e9d601aff3e3317373ed465e6ea93 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 24 Dec 2017 16:23:50 -0500 Subject: gnu: python-pillow: Fix test failures on i686-linux and armhf-linux. * gnu/packages/patches/python-pillow-fix-failing-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python.scm (python-pillow)[source]: Use it. --- gnu/local.mk | 1 + .../patches/python-pillow-fix-failing-tests.patch | Bin 0 -> 112373 bytes gnu/packages/python.scm | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-pillow-fix-failing-tests.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 586f023ee66..2c4305d94ce 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1016,6 +1016,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-networkx2-reproducible-build.patch \ %D%/packages/patches/python-nose-timer-drop-ordereddict.patch \ %D%/packages/patches/python-parse-too-many-fields.patch \ + %D%/packages/patches/python-pillow-fix-failing-tests.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python-statsmodels-fix-tests.patch \ %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch \ diff --git a/gnu/packages/patches/python-pillow-fix-failing-tests.patch b/gnu/packages/patches/python-pillow-fix-failing-tests.patch new file mode 100644 index 00000000000..2575d6f6124 Binary files /dev/null and b/gnu/packages/patches/python-pillow-fix-failing-tests.patch differ diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7ff1e78bbe7..ce3aa299bcf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3739,7 +3739,9 @@ the OleFileIO module from PIL, the Python Image Library.") (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")))) + "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")) + (patch-flags '("-p1" "--binary")) + (patches (search-patches "python-pillow-fix-failing-tests.patch")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) -- cgit v1.3