diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-10 18:38:25 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-10 18:38:25 +0100 |
| commit | 8c5533b582bc3fe1293469771d1a326926e84586 (patch) | |
| tree | 7f71c4dd85489139a11897ee2668e26acdaf40b0 /gnu/packages/python-xyz.scm | |
| parent | 2b0c755d195c79bfc95cdbe802e1e2dea1adb7a2 (diff) | |
| parent | 41ce92501b53caa1dcf89fa81aed71dbf1f85d34 (diff) | |
| download | guix-8c5533b582bc3fe1293469771d1a326926e84586.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/python-xyz.scm')
| -rw-r--r-- | gnu/packages/python-xyz.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dff11233e6..33b9070e6a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1355,7 +1355,7 @@ existing ones.") (define-public scons (package (name "scons") - (version "3.0.3") + (version "3.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -1364,7 +1364,7 @@ existing ones.") (file-name (git-file-name name version)) (sha256 (base32 - "1xizkjgrvydkjhpv7i5rx0mdkp3618sis7jsckjh57nxcynlk5dc")))) + "1xy8jrwz87y589ihcld4hv7wn122sjbz914xn8h50ww77wbhk8hn")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; still relies on distutils @@ -1376,6 +1376,9 @@ existing ones.") (substitute* "src/engine/SCons/compat/__init__.py" (("sys.modules\\[new\\] = imp.load_module\\(old, \\*imp.find_module\\(old\\)\\)") "sys.modules[new] = __import__(old)")) + (substitute* "src/engine/SCons/Platform/__init__.py" + (("mod = imp.load_module\\(full_name, file, path, desc\\)") + "mod = __import__(full_name)")) (invoke "python" "bootstrap.py" "build/scons" "DEVELOPER=guix") (chdir "build/scons") #t))))) @@ -14712,14 +14715,14 @@ append on old values. Partd excels at shuffling operations.") (define-public python-dask (package (name "python-dask") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (pypi-uri "dask" version)) (sha256 (base32 - "03ykmq46q2hh7mn68vcxkgylybjaj3r0kfspaiymdmqmjzpjivr5")))) + "1hrnfz4pzawikz9b622vjz2500n7hs25nz9msy1k8l4g7l2kr6ky")))) (build-system python-build-system) ;; A single test out of 5000+ fails. This test is marked as xfail when ;; pytest-xdist is used. |