(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
- (lambda _ (invoke "pytest" "-vv"))))))
+ (lambda _
+ (invoke "pytest" "-vv" "-k"
+ (string-append
+ ;; XXX: These tests fail when using Pytest 4.x and
+ ;; Babel 2.6.0. Try removing this for later versions.
+ "not test_no_inherit_metazone_marker_never_in_output"
+ " and not test_smoke_dates"
+ " and not test_smoke_numbers")))))))
(home-page "http://babel.pocoo.org/")
(synopsis
"Tools for internationalizing Python applications")
(define-public python2-setuptools
(package-with-python2 python-setuptools))
+;; The setuptools provided by Python 3.7.4 is too new for Tensorflow.
+(define-public python-setuptools-for-tensorflow
+ (hidden-package
+ (package
+ (inherit python-setuptools)
+ (version "39.1.0")
+ (source (origin
+ (inherit (package-source python-setuptools))
+ (uri (pypi-uri "setuptools" version ".zip"))
+ (sha256
+ (base32
+ "1mzdhvfhnv4lggxa8rjl0dzqxvfx377gg5sqs57v89wrp09lwj65")))))))
+
(define-public python-uniseg
(package
(name "python-uniseg")
(define-public python-six
(package
(name "python-six")
- (version "1.11.0")
+ (version "1.12.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "six" version))
(sha256
(base32
- "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h"))))
+ "0wxs1q74v07ssjywbbm7x6h5v9qx209ld2yfsif4060sxi0h2sni"))))
(build-system python-build-system)
(arguments
`(#:phases
(define-public python-pyicu
(package
(name "python-pyicu")
- (version "2.2")
+ (version "2.3.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "PyICU" version))
(sha256
(base32
- "0wq9y5fi1ighgf5aws9nr87vi1w44p7q1k83rx2y3qj5d2xyhspa"))))
+ "1x4w8m7ifki9z2a187pgjr33z6z0rp2fii9b73djak1vhm9v9cnx"))))
(build-system python-build-system)
(inputs
`(("icu4c" ,icu4c)))
(define-public python-py
(package
(name "python-py")
- (version "1.5.4")
+ (version "1.8.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "py" version))
(sha256
(base32
- "1xxvwfn82457djf55f5n2c94699rfqnk43br8fif2r2q8gvrmm9z"))))
+ "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw"))))
(build-system python-build-system)
(arguments
;; FIXME: "ImportError: 'test' module incorrectly imported from
(package
(name "python-pympler")
(home-page "https://pythonhosted.org/Pympler/")
- (version "0.5")
+ (version "0.7")
(source (origin
(method url-fetch)
(uri (pypi-uri "Pympler" version))
(sha256
(base32
- "03qwsbilqgvnbl3a1jmpgixbr2kq6m3fvdlzyr3wdp01bwlc85kx"))))
+ "0ki7bqp1h9l1xc2k1h4vjyzsgs20i8ingvcdhszyi72s28wyf4bs"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(properties `((python2-variant . ,(delay python2-cython))))))
(define-public python2-cython
- (package (inherit (package-with-python2
- (strip-python2-variant python-cython)))
- (name "python2-cython")
- (inputs
- `(("python-2" ,python-2))))) ; this is not automatically changed
+ (let ((base (package-with-python2 (strip-python2-variant python-cython))))
+ (package
+ (inherit base)
+ (name "python2-cython")
+ (inputs
+ `(("python-2" ,python-2))) ;this is not automatically changed
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-before 'check 'adjust-test_embed
+ (lambda _
+ (substitute* "runtests.py"
+ ;; test_embed goes great lengths to find the static libpythonX.Y.a
+ ;; so it can give the right -L flag to GCC when embedding static
+ ;; builds of Python. It is unaware that the Python "config"
+ ;; directory (where the static library lives) was renamed in
+ ;; Python 3, and falls back to sysconfig.get_config_var('LIBDIR'),
+ ;; which works fine, because that is where the shared library is.
+ ;;
+ ;; It also appears to be unaware that the Makefile in Demos/embed
+ ;; already unconditionally pass the static library location to GCC,
+ ;; after checking sysconfig.get_config_var('LIBPL).
+ ;;
+ ;; The effect is that the linker is unable to resolve libexpat
+ ;; symbols when building for Python 2, because neither the Python 2
+ ;; shared library nor Expat is available. To fix it, we can either
+ ;; add Expat as an input and make it visible to the linker, or just
+ ;; prevent it from overriding the Python shared library location.
+ ;; The end result is identical, so we take the easy route.
+ ((" or libname not in os\\.listdir\\(libdir\\)")
+ ""))
+ #t)))))))))
;; The RPython toolchain currently does not support Python 3.
(define-public python2-rpython
(define-public python-pycodestyle
(package
(name "python-pycodestyle")
- (version "2.4.0")
+ (version "2.5.0")
(source
- (origin
- (method url-fetch)
- (uri (pypi-uri "pycodestyle" version))
- (sha256
- (base32
- "0fhy4vnlgpjq4qd1wdnl6pvdw7rah0ypmn8c9mkhz8clsndskz6b"))))
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pycodestyle" version))
+ (sha256
+ (base32
+ "0v4prb05n21bm8650v0a01k1nyqjdmkrsm3zycfxh2j5k9n962p4"))))
(build-system python-build-system)
(home-page "https://pycodestyle.readthedocs.io/")
(synopsis "Python style guide checker")
(define-public python-setuptools-scm
(package
(name "python-setuptools-scm")
- (version "3.1.0")
+ (version "3.2.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "setuptools_scm" version))
(sha256
(base32
- "0h4bglwfz8b9prqljv8z3w9rgydfyxzaj05bm1y6zs5m6shz548i"))))
+ "0n3knn3p1sqlx31k2lahn7z9bacvlv8nhlfidj77vz50bxqlgasj"))))
(build-system python-build-system)
(home-page "https://github.com/pypa/setuptools_scm/")
(synopsis "Manage Python package versions in SCM metadata")
(define-public python-datrie
(package
(name "python-datrie")
- (version "0.7.1")
+ (version "0.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "datrie" version))
(sha256
(base32
- "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"))))
+ "0338r8xgmpy78556jhms0h6qkvyjr10p8bpgdvcpqzm9lrmxmmdx"))))
(build-system python-build-system)
- (arguments
- `(#:phases (modify-phases %standard-phases
- (add-before 'build 'cythonize
- (lambda _
- ;; Regenerate Cython classes to solve ABI issues with Python
- ;; 3.7.0. See <https://github.com/pytries/datrie/issues/52>.
- (invoke "cython" "src/datrie.pyx" "src/cdatrie.pxd"
- "src/stdio_ext.pxd" "-a"))))))
(native-inputs
`(("python-cython" ,python-cython)
("python-hypothesis" ,python-hypothesis)
(uri (pypi-uri "pep8" version))
(sha256
(base32
- "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1"))))
+ "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1"))
+ (patches (search-patches "python-pep8-stdlib-tokenize-compat.patch"))))
(build-system python-build-system)
(home-page "https://pep8.readthedocs.org/")
(synopsis "Python style guide checker")
(define-public python-pyflakes
(package
(name "python-pyflakes")
- (version "2.0.0")
+ (version "2.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyflakes" version))
(sha256
(base32
- "0jba28czyvimdc72llms3f17swp3i8jdcabf5w0j00adfbn64xls"))))
+ "18pq95a1xj2dgdd0m85gyfsn40jajj4xc3lp8wfv7igqhrc86xnr"))))
(build-system python-build-system)
(home-page
"https://github.com/pyflakes/pyflakes")
(define-public python2-pyflakes-0.8.1
(package-with-python2 python-pyflakes-0.8.1))
-;; This package is used by hypothesis which has thousands of dependent packages.
-;; FIXME: Consolidate this with "python-flake8" below in the next rebuild cycle.
-(define-public python-flake8-3.5
+(define-public python-flake8
(package
(name "python-flake8")
- (version "3.5.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "flake8" version))
- (sha256
- (base32
- "184b33grvvjmiwlv9kyd7yng9qv5ld24154j70z332xxg9gjclvj"))))
+ (version "3.7.7")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "flake8" version))
+ (sha256
+ (base32
+ "0qg6zggqigrd4k3gv88shd1a27d0cwgfql8vfiq2c7rl7w3rd6c5"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- ;; Two errors don't seem to have assigned codes.
- (add-after 'unpack 'delete-broken-test
- (lambda _ (delete-file "tests/unit/test_pyflakes_codes.py") #t))
- (add-after 'unpack 'fix-problem-with-pycodestyle
- (lambda _
- ;; See https://gitlab.com/pycqa/flake8/merge_requests/230
- ;; This should no longer be needed with the next release.
- (substitute* "setup.py"
- (("PEP8_PLUGIN\\('break_around_binary_operator'\\),")
- "PEP8_PLUGIN('break_after_binary_operator'),\
-PEP8_PLUGIN('break_before_binary_operator'),"))
- #t))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
#t)))))
(propagated-inputs
`(("python-pycodestyle" ,python-pycodestyle)
+ ("python-entrypoints" ,python-entrypoints)
("python-pyflakes" ,python-pyflakes)
("python-mccabe" ,python-mccabe)))
(native-inputs
"The modular source code checker: pep8, pyflakes and co")
(description
"Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.")
- (properties `((python2-variant . ,(delay python2-flake8-3.5))))
+ (properties `((python2-variant . ,(delay python2-flake8))))
(license license:expat)))
-(define-public python2-flake8-3.5
- (let ((base (package-with-python2 (strip-python2-variant python-flake8-3.5))))
+(define-public python2-flake8
+ (let ((base (package-with-python2 (strip-python2-variant python-flake8))))
(package (inherit base)
(propagated-inputs
`(("python2-configparser" ,python2-configparser)
("python2-enum34" ,python2-enum34)
+ ("python2-typing" ,python2-typing)
,@(package-propagated-inputs base))))))
-;; Version 3.5.0 has compatibility issues with Pyflakes 2.0, so we need
-;; this newer version. Keep it as a separate variable for now to avoid
-;; rebuilding "python-hypothesis"; this should be removed in the next
-;; rebuild cycle.
-(define-public python-flake8
- (package
- (inherit python-flake8-3.5)
- (version "3.6.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "flake8" version))
- (sha256
- (base32
- "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba"))))
- (arguments
- (substitute-keyword-arguments (package-arguments python-flake8-3.5)
- ((#:phases phases)
- `(modify-phases ,phases
- (delete 'delete-broken-test)
- (delete 'fix-problem-with-pycodestyle)))))
- (properties `((python2-variant . ,(delay python2-flake8))))))
-
-(define-public python2-flake8
- (let ((base (package-with-python2 (strip-python2-variant python-flake8))))
- (package (inherit base)
- (propagated-inputs
- (package-propagated-inputs python2-flake8-3.5)))))
-
;; python-hacking requires flake8 <2.6.0.
(define-public python-flake8-2.5
(package
(modify-phases %standard-phases
(replace 'check
(lambda _
+ ;; Be compatible with Pytest 4:
+ ;; https://gitlab.com/pycqa/flake8-polyfill/merge_requests/7
+ (substitute* "setup.cfg"
+ (("\\[pytest\\]")
+ "[tool:pytest]"))
+
(setenv "PYTHONPATH"
(string-append (getcwd) "/build/lib:"
(getenv "PYTHONPATH")))
;; lines, but the test expects a single line...
(("env\\['COLUMNS'\\] = '80'")
"env['COLUMNS'] = '160'"))
+
+ (substitute* "Makefile"
+ ;; Recent versions of python-coverage have caused the test
+ ;; coverage to decrease (as of version 0.7). Allow that.
+ (("--fail-under=100")
+ "--fail-under=90"))
+
#t))
- (delete 'check)
- (add-after 'install 'check
+ (replace 'check
;; The test phase uses the built library and executable.
- ;; It's easier to run it after install since the build
- ;; directory contains version-specific PATH.
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(setenv "PATH" (string-append (getenv "PATH") ":"
(define-public python-fonttools
(package
(name "python-fonttools")
- (version "3.28.0")
+ (version "3.38.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "fonttools" version ".zip"))
(sha256
(base32
- "0vsvjhidpb5kywpjgz1j3fywzkddxkb0afqai18qa3h6lqjyxwpb"))))
+ "12ripk3s7skgxr1bs9r8n13r94ym3s8iir7ivfixls9fa4dabmlh"))))
(build-system python-build-system)
(native-inputs
`(("unzip" ,unzip)
("python-pytest" ,python-pytest)
("python-pytest-runner" ,python-pytest-runner)))
(build-system python-build-system)
+ ;; XXX: Incompatible with Pytest 4: <https://github.com/chardet/chardet/issues/173>.
+ (arguments `(#:tests? #f))
(home-page "https://github.com/chardet/chardet")
(synopsis "Universal encoding detector for Python 2 and 3")
(description
(define-public python-atomicwrites
(package
(name "python-atomicwrites")
- (version "1.1.5")
+ (version "1.3.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "atomicwrites" version))
(sha256
(base32
- "11bm90fwm2avvf4f3ib8g925w7jr4m11vcsinn1bi6ns4bm32214"))))
+ "19ngcscdf3jsqmpcxn6zl5b6anmsajb6izp1smcd1n02midl9abm"))))
(build-system python-build-system)
(synopsis "Atomic file writes in Python")
(description "Library for atomic file writes using platform dependent tools
(base32
"0rdjmmsab550kxsssdq49jcniz77zlkpw4pvi9hvib3lsskjmh4y"))))
(build-system python-build-system)
- (arguments `(#:python ,python-2
- ;; FIXME: Python 2.7.14 moved the test.support library,
- ;; but our package has not yet been adjusted. Enable
- ;; tests when the python2 package has been fixed.
- #:tests? #f))
+ (arguments
+ `(#:python ,python-2
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (invoke "python" "test_futures.py")
+ #t)))))
(home-page "https://github.com/agronholm/pythonfutures")
(synopsis
"Backport of the concurrent.futures package from Python 3.2")
(define-public python-pluggy
(package
(name "python-pluggy")
- (version "0.7.1")
+ (version "0.11.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pluggy" version))
(sha256
(base32
- "1qbn70mksmr03hac6jgp6fiqc4l7859z8dchx2x950vhlij87swm"))))
+ "10511a54dvafw1jrk75mrhml53c7b7w4yaw7241696lc2hfvr895"))))
(build-system python-build-system)
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)))
(define-public python2-pathlib2
(package
(name "python2-pathlib2")
- (version "2.3.2")
+ (version "2.3.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "pathlib2" version))
(sha256
(base32
- "10yb0iv5x2hs631rcppkhbddx799d3h8pcwmkbh2a66ns3w71ccf"))))
+ "0hpp92vqqgcd8h92msm9slv161b1q160igjwnkf2ag6cx0c96695"))))
(build-system python-build-system)
;; We only need the the Python 2 variant, since for Python 3 our minimum
;; version is 3.4 which already includes this package as part of the
(guix build utils)
(guix build python-build-system))
#:phases (modify-phases %standard-phases
- (add-after 'unpack 'unpack-libev
- (lambda* (#:key inputs #:allow-other-keys)
- (mkdir-p "deps/libev")
- ;; FIXME: gevent requires building libev, even though
- ;; it only links against the proper one.
- (invoke "tar" "-xf" (assoc-ref inputs "libev-source")
- "--strip-components=1" "-C" "deps/libev")))
(add-before 'patch-source-shebangs 'patch-hard-coded-paths
(lambda _
(substitute* "src/gevent/subprocess.py"
(setenv "CARES_EMBED" "false")
(setenv "EMBED" "false")
+ ;; Prevent building bundled libev.
+ (substitute* "setup.py"
+ (("run_make=_BUILDING")
+ "run_make=False"))
+
(let ((greenlet (string-append
(assoc-ref inputs "python-greenlet")
"/include")))
(lambda (item)
(string-prefix? "python" item)))
((python)
- (setenv "CPATH"
+ (setenv "C_INCLUDE_PATH"
(string-append greenlet "/" python)))))
#t))
(add-before 'check 'skip-timer-test
`(("python-greenlet" ,python-greenlet)
("python-objgraph" ,python-objgraph)))
(native-inputs
- `(("libev-source" ,(package-source libev))
- ("python-six" ,python-six)))
+ `(("python-six" ,python-six)))
(inputs
`(("c-ares" ,c-ares)
("libev" ,libev)))
(package
(inherit python-attrs)
(name "python-attrs-bootstrap")
- ;; Keep this on a fixed version so python-attrs can be updated without
- ;; triggering a mass-rebuild. FIXME: Update this in the next rebuild cycle.
- (version "17.4.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "attrs" version))
- (sha256
- (base32
- "1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w"))))
(native-inputs `())
(arguments `(#:tests? #f))))
(define-public python-configparser
(package
(name "python-configparser")
- (version "3.5.0")
+ (version "3.7.1")
(source
(origin
(method url-fetch)
- (uri (string-append
- "https://bitbucket.org/ambv/configparser/get/"
- version ".tar.bz2"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (uri (pypi-uri "configparser" version))
(sha256
(base32
- "0waq40as14abwzbb321hfz4vr1fi363nscy32ga14qvfygrg96wa"))))
+ "0cnz213il9lhgda6x70fw7mfqr8da43s3wm343lwzhqx94mgmmav"))))
(build-system python-build-system)
(home-page "https://github.com/jaraco/configparser/")
(synopsis "Backport of configparser from python 3.5")
(define-public python-more-itertools
(package
(name "python-more-itertools")
- (version "4.3.0")
+ (version "7.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "more-itertools" version))
(sha256
(base32
- "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4"))))
+ "16phg2f2dvm6ci5wr49ncha5lmc0m2in3bsl33c61vzca4gkvd4b"))))
(build-system python-build-system)
- (arguments
- `(,@(if (any (cute string-prefix? <> (or (%current-system)
- (%current-target-system)))
- '("armhf" "i686"))
- '(#:phases
- (modify-phases %standard-phases
- ;; This is required for 32-bit hardware.
- ;; TODO: Try to remove this when upgrading.
- (add-after 'unpack 'patch-test
- (lambda _
- (substitute* "more_itertools/tests/test_more.py"
- (("10 \\*\\* 10") "9 ** 9"))
- #t))))
- '())))
- (propagated-inputs
- `(("python-six" ,python-six-bootstrap)))
(home-page "https://github.com/erikrose/more-itertools")
(synopsis "More routines for operating on iterables, beyond itertools")
(description "Python's built-in @code{itertools} module implements a
number of iterator building blocks inspired by constructs from APL, Haskell,
and SML. @code{more-itertools} includes additional building blocks for
working with iterables.")
+ (properties `((python2-variant . ,(delay python2-more-itertools))))
(license license:expat)))
+;; The 5.x series are the last versions supporting Python 2.7.
(define-public python2-more-itertools
- (package-with-python2 python-more-itertools))
+ (package
+ (inherit python-more-itertools)
+ (name "python2-more-itertools")
+ (version "5.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "more-itertools" version))
+ (sha256
+ (base32
+ "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q"))))
+ (arguments
+ `(#:python ,python2-minimal))
+ (propagated-inputs
+ `(("python2-six" ,python2-six-bootstrap)))))
(define-public python-latexcodec
(package
(define-public pybind11
(package
(name "pybind11")
- (version "2.2.4")
+ (version "2.3.0")
(source (origin
(method git-fetch)
(uri (git-reference
(commit (string-append "v" version))))
(sha256
(base32
- "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv"))
+ "11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(native-inputs
HCoop / jackhill / guix / guix.git / blobdiff