From 01107fc4eaa928ddd99b834ba8ce7b7244f8c3cd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 28 Jan 2022 14:33:56 +0100 Subject: gnu: texlive-latex-enumitem: Deprecate package. * gnu/packages/tex.scm (texlive-latex-enumitem): Deprecate in favor of texlive-enumitem. * gnu/packages/python-xyz.scm (python-matplotlib-documentation): (python-nbconvert): Apply deprecation. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c8ba314d38..51a7a64fe6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6543,19 +6543,19 @@ (define-public python-matplotlib-documentation ("python-mock" ,python-mock) ("graphviz" ,graphviz) ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts - texlive-latex-amsmath - texlive-latex-enumitem - texlive-latex-expdlist - texlive-latex-geometry - texlive-latex-preview - texlive-latex-type1cm - texlive-latex-ucs - - texlive-pdftex - - texlive-fonts-ec - texlive-times - texlive-txfonts))) + texlive-enumitem + texlive-latex-amsmath + texlive-latex-expdlist + texlive-latex-geometry + texlive-latex-preview + texlive-latex-type1cm + texlive-latex-ucs + + texlive-pdftex + + texlive-fonts-ec + texlive-times + texlive-txfonts))) ("texinfo" ,texinfo) ,@(package-native-inputs python-matplotlib))) (arguments @@ -12611,13 +12611,13 @@ (define-public python-nbconvert texlive-amsfonts texlive-booktabs texlive-caption + texlive-enumitem texlive-eurosym texlive-fonts-rsfs texlive-generic-ulem texlive-generic-iftex texlive-jknappen texlive-latex-amsmath - texlive-latex-enumitem texlive-latex-fancyvrb texlive-latex-float texlive-fontspec -- cgit v1.2.3 From 2b37ec1c608f935e183b532e92b973cbb0e8fb1b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 28 Jan 2022 14:37:49 +0100 Subject: gnu: Remove occurrences of deprecated texlive-latex-capt-of. * gnu/packages/maths.scm (hypre): * gnu/packages/python-xyz.scm (python-numpy-documentation): (python-ipython-documentation): Use texlive-capt-of instead of texlive-latex-capt-of. --- gnu/packages/maths.scm | 4 ++-- gnu/packages/python-xyz.scm | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9a0f913c5a..1895acd368 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2018 Eric Brown ;;; Copyright © 2018, 2021 Julien Lepiller ;;; Copyright © 2018 Amin Bandali -;;; Copyright © 2019, 2021 Nicolas Goaziou +;;; Copyright © 2019, 2021, 2022 Nicolas Goaziou ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith ;;; Copyright © 2020 Jakub Kądziołka @@ -5540,6 +5540,7 @@ (define-public hypre ("texlive" ,(texlive-updmap.cfg (list texlive-adjustbox texlive-amsfonts texlive-bibtex + texlive-capt-of texlive-caption texlive-cm texlive-etoolbox @@ -5551,7 +5552,6 @@ (define-public hypre texlive-xypic texlive-generic-listofitems texlive-generic-ulem - texlive-latex-capt-of texlive-latex-cmap texlive-latex-colortbl texlive-latex-etoc diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 51a7a64fe6..24e7fef494 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5829,12 +5829,13 @@ (define-public python-numpy-documentation ("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) ("python-numpydoc" ,python-numpydoc) - ("texlive" ,(texlive-updmap.cfg (list texlive-cm-super + ("texlive" ,(texlive-updmap.cfg (list + texlive-capt-of + texlive-cm-super texlive-fonts-ec texlive-generic-iftex texlive-pdftex texlive-amsfonts - texlive-latex-capt-of texlive-latex-cmap texlive-latex-environ texlive-latex-eqparbox @@ -8916,10 +8917,10 @@ (define-public python-ipython-documentation ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ;; FIXME: It's possible that a smaller union would work just as well. ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts + texlive-capt-of texlive-fonts-ec texlive-generic-iftex texlive-pdftex - texlive-latex-capt-of texlive-latex-cmap texlive-latex-environ texlive-latex-eqparbox -- cgit v1.2.3 From c5f1f8b81e66b6a63c6bcc173e34e96d9cda9270 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 28 Jan 2022 15:05:01 +0100 Subject: gnu: Properly deprecate texlive-generic-ulem. * gnu/packages/python-xyz.scm (python-nbconvert): * gnu/packages/maths.scm (hypre): Apply deprecation. * gnu/packages/tex.scm (texlive-generic-ulem): Fix typo in deprecation command. --- gnu/packages/maths.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/tex.scm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1895acd368..9f7c0476ca 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5551,7 +5551,6 @@ (define-public hypre texlive-xcolor texlive-xypic texlive-generic-listofitems - texlive-generic-ulem texlive-latex-cmap texlive-latex-colortbl texlive-latex-etoc @@ -5574,6 +5573,7 @@ (define-public hypre texlive-latex-tocloft texlive-latex-upquote texlive-latex-varwidth + texlive-ulem texlive-wasysym texlive-latex-wrapfig))))) (inputs diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 24e7fef494..a8aff94334 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12615,7 +12615,6 @@ (define-public python-nbconvert texlive-enumitem texlive-eurosym texlive-fonts-rsfs - texlive-generic-ulem texlive-generic-iftex texlive-jknappen texlive-latex-amsmath @@ -12638,6 +12637,7 @@ (define-public python-nbconvert texlive-tcolorbox texlive-titling texlive-tools + texlive-ulem texlive-xcolor texlive-zapfding))))) (propagated-inputs diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a6f693a0a5..4fc25ed656 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7843,7 +7843,7 @@ (define-public texlive-ulem striking out (line through words) and crossing out (/// over words).") (license license:lppl1.3c+))) -(define-deprecated-package texlive-latex-ulem texlive-ulem) +(define-deprecated-package texlive-generic-ulem texlive-ulem) (define-public texlive-latex-pgf (package -- cgit v1.2.3 From 977a6c5769145f86bed96c0c0a9f9ddce76df93d Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 11 Jan 2022 11:28:17 +0100 Subject: gnu: Add python-geojson. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-geojson): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a8aff94334..fc1ff5c80d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11642,6 +11642,28 @@ (define-public python-pytest-black Python code formatter \"black\".") (license license:expat))) +(define-public python-geojson + (package + (name "python-geojson") + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "geojson" version)) + (sha256 + (base32 "12k5bzqskvq3gqzkryarhdjl0df47y5k9cf8r3clasi2wjnbfjvf")))) + (build-system python-build-system) + (arguments + ;; https://github.com/jazzband/geojson/issues/175 + `(#:tests? #f)) + (home-page "https://github.com/jazzband/geojson") + (synopsis "Python bindings and utilities for GeoJSON") + (description + "This package provides Python bindings and utilities for +@uref{http://geojson.org/, GeoJSON}, a format for encoding geographic data +structures.") + (license license:bsd-3))) + (define-public python-get-version (package (name "python-get-version") -- cgit v1.2.3 From 27c1d58d901dcf48929bcb6f76d861fc21575dbf Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 11 Jan 2022 11:29:23 +0100 Subject: gnu: Add wfetch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (wfetch): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fc1ff5c80d..aab8b27eef 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11664,6 +11664,51 @@ (define-public python-geojson structures.") (license license:bsd-3))) +(define-public wfetch + (let ((commit "e1cfa37814aebc9eb56ce994ebe877b6a6f9a715") + (revision "1")) + (package + (name "wfetch") + (version (git-version "0.1-pre" revision commit)) + (home-page "https://github.com/Gcat101/Wfetch") + (source + (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dmr85plx8zr6s14ym3r32g6crwxghkval5a24ah90ijx4dbn5q5")))) + (build-system python-build-system) + (arguments + `(#:use-setuptools? #f ; no setup.py + #:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share"))) + (mkdir-p share) + (substitute* "wfetch/wfetch.py" + (("os.sep, 'opt', 'wfetch'") (string-append "'" share "'"))) + (install-file "wfetch/wfetch.py" bin) + (copy-recursively "wfetch/icons" share))))))) + (inputs (list python-pyowm python-fire python-termcolor python-requests)) + (synopsis "Command-line tool to display weather info") + (description + "This package provides a tool similar to Neofetch/pfetch, but for +weather: it can display the weather condition, temperature, humidity, etc. + +To use it, you must first run: + +@example +export WEATHER_CLI_API=@var{your OpenWeatherMap API key} +@end example\n") + (license license:gpl3+)))) + (define-public python-get-version (package (name "python-get-version") -- cgit v1.2.3 From 171084792fae1aa4c2cd395af25f8f581c4013e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 28 Jan 2022 10:56:07 +0100 Subject: gnu: python-pydantic: Update to 1.9.0. * gnu/packages/python-xyz.scm (python-pydantic): Update to 1.9.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aab8b27eef..a1cb1231f9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5075,7 +5075,7 @@ (define-public python-jsonrpc-server (define-public python-pydantic (package (name "python-pydantic") - (version "1.8.2") + (version "1.9.0") (source (origin (method git-fetch) @@ -5084,7 +5084,7 @@ (define-public python-pydantic (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "06162dss6mvi7wiy2lzxwvzajwxgy8b2fyym7qipaj7zibcqalq2")))) + (base32 "14wj3k9007fpbxk7593w6gdqrr68yzrsw4a41sj5ji4cv3r8z18b")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From f3d0ed37ea0cadbe56025e62c2f2c5e28014d041 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Jan 2022 18:29:11 -0500 Subject: gnu: python-black: Document the tomli version requirements. * gnu/packages/python-xyz.scm (python-black): Add comment. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a1cb1231f9..4f77fae8d0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5238,6 +5238,8 @@ (define-public python-black (arguments `(#:phases (modify-phases %standard-phases + ;; XXX Remove this when updating this package: + ;; https://github.com/psf/black/issues/2703#issuecomment-1004752142 (add-after 'unpack 'relax-version-requirements (lambda _ (substitute* "setup.py" -- cgit v1.2.3 From ad516f400992c5c95d9e2a19694b5c655a370fee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 31 Jan 2022 15:39:30 +0100 Subject: gnu: Add python-xlrd-1. * gnu/packages/python-xyz.scm (python-xlrd-1): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4f77fae8d0..1f40f982ce 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11419,6 +11419,32 @@ (define-public python-xlrd (define-public python2-xlrd (package-with-python2 python-xlrd)) +;; We need this for python-anndata +(define-public python-xlrd-1 + (package + (inherit python-xlrd) + (name "python-xlrd") + (version "1.2.0") + (source (origin + ;; The tests are not included in the PyPI archive. + (method git-fetch) + (uri (git-reference + (url "https://github.com/python-excel/xlrd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sm5p0ii5ayh52ak1jpw0n1kgsv72vdwwp8c3z13l8yf4irsb587")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Some tests depend on writing a temporary file to the user's home + ;; directory. + (add-after 'unpack 'fix-tests + (lambda _ + (setenv "HOME" "/tmp")))))))) + ;;; Note: this package is unmaintained since 2018 (archived on GitHub). (define-public python-xlwt (package -- cgit v1.2.3 From f383aca4086716b07f4e1f06df2aad4d7b796ebc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 31 Jan 2022 15:39:46 +0100 Subject: gnu: python-anndata: Update to 0.7.8. * gnu/packages/python-xyz.scm (python-anndata): Update to 0.7.8. [arguments]: Embed the appropriate version string instead of letting it try (and fail) to discover the correct string at load time. [propagated-inputs]: Add python-xlrd-1. --- gnu/packages/python-xyz.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1f40f982ce..945f3319f1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22728,7 +22728,7 @@ (define-public python-zarr (define-public python-anndata (package (name "python-anndata") - (version "0.7.6") + (version "0.7.8") (source (origin ;; The tarball from PyPi doesn't include tests. @@ -22739,7 +22739,7 @@ (define-public python-anndata (file-name (git-file-name name version)) (sha256 (base32 - "1q30bsfsq9xfqm8nmabg3bjh9gix3yng0170xiiyw1lin4xncf0q")))) + "1rrr9xfdaf00ixj5gyym75bl78gkaj55yfw3wjhvx0pdwqpwp9py")))) (build-system python-build-system) (arguments `(#:phases @@ -22754,6 +22754,9 @@ (define-public python-anndata (replace 'build (lambda _ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" ,version) + (substitute* "anndata/_metadata.py" + (("__version__ =.*") + (string-append "__version__ = \"" ,version "\"\n"))) ;; ZIP does not support timestamps before 1980. (setenv "SOURCE_DATE_EPOCH" "315532800") (invoke "flit" "build"))) @@ -22765,8 +22768,7 @@ (define-public python-anndata (format #true wheel) (invoke "python" "-m" "pip" "install" wheel (string-append "--prefix=" out))) - (find-files "dist" "\\.whl$"))) - #t))))) + (find-files "dist" "\\.whl$")))))))) (propagated-inputs (list python-h5py python-importlib-metadata @@ -22775,6 +22777,7 @@ (define-public python-anndata python-packaging python-pandas python-scipy + python-xlrd-1 python-zarr)) (native-inputs (list python-joblib python-pytest python-toml python-flit -- cgit v1.2.3 From 9686c828ed330a23357a8fd53e62ef9cdb7288ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 31 Jan 2022 15:41:13 +0100 Subject: gnu: python-seaborn: Fix build. * gnu/packages/python-xyz.scm (python-seaborn)[source]: Add patch. [arguments]: Add build phase 'patch-more-tests. * gnu/packages/patches/python-seaborn-2690.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 3 +- gnu/packages/patches/python-seaborn-2690.patch | 268 +++++++++++++++++++++++++ gnu/packages/python-xyz.scm | 19 +- 3 files changed, 288 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-seaborn-2690.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index d0dd972481..9f6966b0cd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -7,7 +7,7 @@ # Copyright © 2016, 2017, 2018 Kei Kebreau # Copyright © 2016, 2017 Rene Saavedra # Copyright © 2016 Adonay "adfeno" Felipe Nogueira -# Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus +# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus # Copyright © 2016 Ben Woodcroft # Copyright © 2016, 2017, 2018, 2019 Alex Vong # Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner @@ -1725,6 +1725,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ %D%/packages/patches/python-seaborn-kde-test.patch \ + %D%/packages/patches/python-seaborn-2690.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ diff --git a/gnu/packages/patches/python-seaborn-2690.patch b/gnu/packages/patches/python-seaborn-2690.patch new file mode 100644 index 0000000000..4662d19c2d --- /dev/null +++ b/gnu/packages/patches/python-seaborn-2690.patch @@ -0,0 +1,268 @@ +This patch was adapted from the upstream pull request 2690. + +From ebd6812d48f5b8ed1ebb7d79bda0b2a7b9ae2812 Mon Sep 17 00:00:00 2001 +From: Michael Waskom +Date: Sun, 31 Oct 2021 15:09:27 -0400 +Subject: [PATCH 1/4] Update boxplot tests for mpl3.5 compatability + +--- + seaborn/tests/test_categorical.py | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +diff --git a/seaborn/tests/test_categorical.py b/seaborn/tests/test_categorical.py +index d4e09b703..488fad2d6 100644 +--- a/seaborn/tests/test_categorical.py ++++ b/seaborn/tests/test_categorical.py +@@ -110,6 +110,11 @@ class CategoricalFixture: + df = pd.DataFrame(dict(y=y, g=g, h=h, u=u)) + x_df["W"] = g + ++ def get_box_artists(self, ax): ++ ++ # Exclude labeled patches, which are for the legend ++ return [p for p in ax.patches if not p.get_label()] ++ + + class TestCategoricalPlotter(CategoricalFixture): + +@@ -855,12 +863,12 @@ def test_hue_offsets(self): + def test_axes_data(self): + + ax = cat.boxplot(x="g", y="y", data=self.df) +- assert len(ax.artists) == 3 ++ assert len(self.get_box_artists(ax)) == 3 + + plt.close("all") + + ax = cat.boxplot(x="g", y="y", hue="h", data=self.df) +- assert len(ax.artists) == 6 ++ assert len(self.get_box_artists(ax)) == 6 + + plt.close("all") + +@@ -868,14 +876,14 @@ def test_box_colors(self): + + ax = cat.boxplot(x="g", y="y", data=self.df, saturation=1) + pal = palettes.color_palette(n_colors=3) +- for patch, color in zip(ax.artists, pal): ++ for patch, color in zip(self.get_box_artists(ax), pal): + assert patch.get_facecolor()[:3] == color + + plt.close("all") + + ax = cat.boxplot(x="g", y="y", hue="h", data=self.df, saturation=1) + pal = palettes.color_palette(n_colors=2) +- for patch, color in zip(ax.artists, pal * 2): ++ for patch, color in zip(self.get_box_artists(ax), pal * 2): + assert patch.get_facecolor()[:3] == color + + plt.close("all") +@@ -884,7 +892,7 @@ def test_draw_missing_boxes(self): + + ax = cat.boxplot(x="g", y="y", data=self.df, + order=["a", "b", "c", "d"]) +- assert len(ax.artists) == 3 ++ assert len(self.get_box_artists(ax)) == 3 + + def test_missing_data(self): + +@@ -894,13 +902,13 @@ def test_missing_data(self): + y[-2:] = np.nan + + ax = cat.boxplot(x=x, y=y) +- assert len(ax.artists) == 3 ++ assert len(self.get_box_artists(ax)) == 3 + + plt.close("all") + + y[-1] = 0 + ax = cat.boxplot(x=x, y=y, hue=h) +- assert len(ax.artists) == 7 ++ assert len(self.get_box_artists(ax)) == 7 + + plt.close("all") + +@@ -2766,11 +2774,11 @@ def test_plot_elements(self): + + g = cat.catplot(x="g", y="y", data=self.df, kind="box") + want_artists = self.g.unique().size +- assert len(g.ax.artists) == want_artists ++ assert len(self.get_box_artists(g.ax)) == want_artists + + g = cat.catplot(x="g", y="y", hue="h", data=self.df, kind="box") + want_artists = self.g.unique().size * self.h.unique().size +- assert len(g.ax.artists) == want_artists ++ assert len(self.get_box_artists(g.ax)) == want_artists + + g = cat.catplot(x="g", y="y", data=self.df, + kind="violin", inner=None) +@@ -3137,14 +3145,14 @@ def test_box_colors(self): + + ax = cat.boxenplot(x="g", y="y", data=self.df, saturation=1) + pal = palettes.color_palette(n_colors=3) +- for patch, color in zip(ax.artists, pal): ++ for patch, color in zip(self.get_box_artists(ax), pal): + assert patch.get_facecolor()[:3] == color + + plt.close("all") + + ax = cat.boxenplot(x="g", y="y", hue="h", data=self.df, saturation=1) + pal = palettes.color_palette(n_colors=2) +- for patch, color in zip(ax.artists, pal * 2): ++ for patch, color in zip(self.get_box_artists(ax), pal * 2): + assert patch.get_facecolor()[:3] == color + + plt.close("all") + +From ff78ed38817a346e760194ab3b03b28d7ea3ba1b Mon Sep 17 00:00:00 2001 +From: Michael Waskom +Date: Sun, 31 Oct 2021 15:50:54 -0400 +Subject: [PATCH 2/4] Update kdeplot tests for mpl3.5 compatability + +--- + seaborn/tests/test_distributions.py | 53 ++++++++++++++++++++--------- + 1 file changed, 37 insertions(+), 16 deletions(-) + +diff --git a/seaborn/tests/test_distributions.py b/seaborn/tests/test_distributions.py +index d241fd978..466efb69e 100644 +--- a/seaborn/tests/test_distributions.py ++++ b/seaborn/tests/test_distributions.py +@@ -39,6 +39,27 @@ + ) + + ++def get_contour_coords(c): ++ """Provide compatability for change in contour artist type in mpl3.5.""" ++ # See https://github.com/matplotlib/matplotlib/issues/20906 ++ if isinstance(c, mpl.collections.LineCollection): ++ return c.get_segments() ++ elif isinstance(c, mpl.collections.PathCollection): ++ return [p.vertices[:np.argmax(p.codes) + 1] for p in c.get_paths()] ++ ++ ++def get_contour_color(c): ++ """Provide compatability for change in contour artist type in mpl3.5.""" ++ # See https://github.com/matplotlib/matplotlib/issues/20906 ++ if isinstance(c, mpl.collections.LineCollection): ++ return c.get_color() ++ elif isinstance(c, mpl.collections.PathCollection): ++ if c.get_facecolor().size: ++ return c.get_facecolor() ++ else: ++ return c.get_edgecolor() ++ ++ + class TestDistPlot(object): + + rs = np.random.RandomState(0) +@@ -902,7 +923,7 @@ def test_fill_artists(self, long_df): + f, ax = plt.subplots() + kdeplot(data=long_df, x="x", y="y", hue="c", fill=fill) + for c in ax.collections: +- if fill: ++ if fill or Version(mpl.__version__) >= Version("3.5.0b0"): + assert isinstance(c, mpl.collections.PathCollection) + else: + assert isinstance(c, mpl.collections.LineCollection) +@@ -918,8 +939,8 @@ def test_common_norm(self, rng): + kdeplot(x=x, y=y, hue=hue, common_norm=True, ax=ax1) + kdeplot(x=x, y=y, hue=hue, common_norm=False, ax=ax2) + +- n_seg_1 = sum([len(c.get_segments()) > 0 for c in ax1.collections]) +- n_seg_2 = sum([len(c.get_segments()) > 0 for c in ax2.collections]) ++ n_seg_1 = sum([len(get_contour_coords(c)) > 0 for c in ax1.collections]) ++ n_seg_2 = sum([len(get_contour_coords(c)) > 0 for c in ax2.collections]) + assert n_seg_2 > n_seg_1 + + def test_log_scale(self, rng): +@@ -946,7 +967,7 @@ def test_log_scale(self, rng): + ax2.contour(10 ** xx, yy, density, levels=levels) + + for c1, c2 in zip(ax1.collections, ax2.collections): +- assert_array_equal(c1.get_segments(), c2.get_segments()) ++ assert_array_equal(get_contour_coords(c1), get_contour_coords(c2)) + + def test_bandwidth(self, rng): + +@@ -959,7 +980,7 @@ def test_bandwidth(self, rng): + kdeplot(x=x, y=y, bw_adjust=2, ax=ax2) + + for c1, c2 in zip(ax1.collections, ax2.collections): +- seg1, seg2 = c1.get_segments(), c2.get_segments() ++ seg1, seg2 = get_contour_coords(c1), get_contour_coords(c2) + if seg1 + seg2: + x1 = seg1[0][:, 0] + x2 = seg2[0][:, 0] +@@ -980,9 +1001,9 @@ def test_weights(self, rng): + kdeplot(x=x, y=y, hue=hue, weights=weights, ax=ax2) + + for c1, c2 in zip(ax1.collections, ax2.collections): +- if c1.get_segments() and c2.get_segments(): +- seg1 = np.concatenate(c1.get_segments(), axis=0) +- seg2 = np.concatenate(c2.get_segments(), axis=0) ++ if get_contour_coords(c1) and get_contour_coords(c2): ++ seg1 = np.concatenate(get_contour_coords(c1), axis=0) ++ seg2 = np.concatenate(get_contour_coords(c2), axis=0) + assert not np.array_equal(seg1, seg2) + + def test_hue_ignores_cmap(self, long_df): +@@ -1030,7 +1051,7 @@ def test_levels_and_thresh(self, long_df): + kdeplot(**plot_kws, levels=np.linspace(thresh, 1, n), ax=ax2) + + for c1, c2 in zip(ax1.collections, ax2.collections): +- assert_array_equal(c1.get_segments(), c2.get_segments()) ++ assert_array_equal(get_contour_coords(c1), get_contour_coords(c2)) + + with pytest.raises(ValueError): + kdeplot(**plot_kws, levels=[0, 1, 2]) +@@ -1042,7 +1063,7 @@ def test_levels_and_thresh(self, long_df): + kdeplot(**plot_kws, levels=n, thresh=0, ax=ax2) + + for c1, c2 in zip(ax1.collections, ax2.collections): +- assert_array_equal(c1.get_segments(), c2.get_segments()) ++ assert_array_equal(get_contour_coords(c1), get_contour_coords(c2)) + for c1, c2 in zip(ax1.collections, ax2.collections): + assert_array_equal(c1.get_facecolors(), c2.get_facecolors()) + +@@ -2322,13 +2343,13 @@ def test_bivariate_kde_norm(self, rng): + z = [0] * 80 + [1] * 20 + + g = displot(x=x, y=y, col=z, kind="kde", levels=10) +- l1 = sum(bool(c.get_segments()) for c in g.axes.flat[0].collections) +- l2 = sum(bool(c.get_segments()) for c in g.axes.flat[1].collections) ++ l1 = sum(bool(get_contour_coords(c)) for c in g.axes.flat[0].collections) ++ l2 = sum(bool(get_contour_coords(c)) for c in g.axes.flat[1].collections) + assert l1 > l2 + + g = displot(x=x, y=y, col=z, kind="kde", levels=10, common_norm=False) +- l1 = sum(bool(c.get_segments()) for c in g.axes.flat[0].collections) +- l2 = sum(bool(c.get_segments()) for c in g.axes.flat[1].collections) ++ l1 = sum(bool(get_contour_coords(c)) for c in g.axes.flat[0].collections) ++ l2 = sum(bool(get_contour_coords(c)) for c in g.axes.flat[1].collections) + assert l1 == l2 + + def test_bivariate_hist_norm(self, rng): + +From a20ce3fabeb23c97b5827d9fb0c6a96ac109ea64 Mon Sep 17 00:00:00 2001 +From: Michael Waskom +Date: Sun, 31 Oct 2021 16:10:47 -0400 +Subject: [PATCH 3/4] Update legend tests for mpl3.5 compatability + +--- + seaborn/tests/test_distributions.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/seaborn/tests/test_distributions.py b/seaborn/tests/test_distributions.py +index 466efb69e..024fe7541 100644 +--- a/seaborn/tests/test_distributions.py ++++ b/seaborn/tests/test_distributions.py +@@ -872,7 +872,7 @@ def test_legend(self, long_df): + for label, level in zip(legend_labels, order): + assert label.get_text() == level + +- legend_artists = ax.legend_.findobj(mpl.lines.Line2D)[::2] ++ legend_artists = ax.legend_.findobj(mpl.lines.Line2D) + palette = color_palette() + for artist, color in zip(legend_artists, palette): + assert_colors_equal(artist.get_color(), color) + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 945f3319f1..cee7dab15a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9615,11 +9615,28 @@ (define-public python-seaborn (uri (pypi-uri "seaborn" version)) (sha256 (base32 "1xpl3zb945sihsiwm9q1yyx84sakk1phcg0fprj6i0j0dllfjifg")) - (patches (search-patches "python-seaborn-kde-test.patch")))) + (patches (search-patches "python-seaborn-kde-test.patch" + "python-seaborn-2690.patch")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-more-tests + (lambda _ + (substitute* "seaborn/tests/test_distributions.py" + (("get_contour_color\\(ax\\.collections\\[0\\]\\)") + "get_contour_color(ax.collections[0])") + (("c\\.get_color\\(\\)") "get_contour_color(c)") + + ;; These three are borked and have been fixed upstream, but + ;; there's no simple patch we could apply here, so we just + ;; disable them. + (("def test_hue_ignores_cmap") + "def skip_test_hue_ignores_cmap") + (("def test_fill_artists") + "def skip_test_fill_artists") + (("def test_with_rug") + "def skip_test_with_rug")))) (add-before 'check 'start-xserver (lambda _ ;; There must be a running X server and make check doesn't -- cgit v1.2.3 From 305330a58555f1fb3b10b2fe92e0016317f70204 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Feb 2022 12:49:37 +0200 Subject: gnu: python-ipython: Fix CVE detection. * gnu/packages/python-xyz.scm (python-ipython)[properties]: New field. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cee7dab15a..3be20df7e1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8872,6 +8872,7 @@ (define-public python-ipython Powerful interactive shells, a browser-based notebook, support for interactive data visualization, embeddable interpreters and tools for parallel computing.") + (properties '((cpe-name . "ipython"))) (license license:bsd-3))) (define-public python-ipython-documentation -- cgit v1.2.3 From 82a00693b74f507ca20bfd09b0aee0109ee8c455 Mon Sep 17 00:00:00 2001 From: Pierre-Henry Fröhring Date: Sun, 30 Jan 2022 17:13:54 +0100 Subject: gnu: Add python-types-dataclasses. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-types-dataclasses): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3be20df7e1..b65022ac90 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28903,3 +28903,21 @@ (define-public python-esprima "This package provides ECMAScript parsing infrastructure for multipurpose analysis in Python.") (license license:bsd-3))) + +(define-public python-types-dataclasses + (package + (name "python-types-dataclasses") + (version "0.6.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "types-dataclasses" version)) + (sha256 + (base32 + "1mq6qd365m8ml889zl5dxj9kncjv71iq1d1fvgj59y0ixlpm6s35")))) + (build-system python-build-system) + (home-page "https://github.com/python/typeshed") + (synopsis "Typing stubs for dataclasses") + (description + "This packages provides a collection of library stubs for Python, with +static types.") + (license license:asl2.0))) -- cgit v1.2.3 From 906b4609d862fbefbb24bd3ec0529766812baab0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 2 Feb 2022 14:54:13 +0100 Subject: gnu: python-idna: Remove 2.7. * gnu/packages/python-xyz.scm (python-idna-2.7): Remove variable. --- gnu/packages/python-xyz.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b65022ac90..b0374622f2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12055,17 +12055,6 @@ (define-public python-idna specification.") (license license:bsd-4))) -(define-public python-idna-2.7 - (package (inherit python-idna) - (version "2.7") - (source (origin - (method url-fetch) - (uri (pypi-uri "idna" version)) - (sha256 - (base32 - "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8")))))) - - (define-public python2-idna (package-with-python2 python-idna)) -- cgit v1.2.3 From 3e6dcd1ee5ad47214b052ad7fda28908cf8ff514 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 3 Feb 2022 18:09:25 +0100 Subject: gnu: python-can: Update to 3.3.4. * gnu/packages/python-xyz.scm (python-can): Update to 3.3.4. [arguments]: Adjust version constraints. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b0374622f2..999003176d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2014,14 +2014,14 @@ (define-public python-aenum (define-public python-can (package (name "python-can") - (version "3.3.3") + (version "3.3.4") (source (origin (method url-fetch) (uri (pypi-uri "python-can" version)) (sha256 (base32 - "123lz1bl6xf3d0fvxzr4bg4884yg4m9s21z6xd2m68zhnbv9rmpc")))) + "0jclrvyxasaaxr0albq0kqrnrfqdgqxs7m2qw9nd8kfwg8xj4g1d")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -2030,7 +2030,8 @@ (define-public python-can (substitute* "setup.py" (("mock~=2\\.0") "mock") (("coverage<5") "coverage") - (("pytest~=4\\.3") "pytest") + (("pytest~=4\\.6") "pytest") + (("pytest-timeout~=1\\.3") "pytest-timeout") (("hypothesis~=4\\.56") "hypothesis")) #t)) (add-after 'unpack 'fix-broken-tests -- cgit v1.2.3 From 225deb5c4ed4d7f054629cb660289a2dfe20dfed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 3 Feb 2022 18:16:51 +0100 Subject: gnu: python-febelfin-coda: Update to 0.2.0. * gnu/packages/python-xyz.scm (python-febelfin-coda): Update to 0.2.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 999003176d..01c9ea3cf1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28195,13 +28195,13 @@ (define-public python-csb43 (define-public python-febelfin-coda (package (name "python-febelfin-coda") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) (uri (pypi-uri "febelfin-coda" version)) (sha256 - (base32 "10nf4hdwldqgdmh4g613vx55sbsw1x1yzpvs3crwlggbp75fjjfi")))) + (base32 "1isnf87gxlvfbmackv7b2c978vmnj7ij0v4svhyjl8pbb9hwjsvm")))) (build-system python-build-system) (home-page "https://coda.b2ck.com/") (synopsis "Module to parse Belgian CODA files") -- cgit v1.2.3 From a5eb5dd57162ee4fc662494b566d0a3c1e515e92 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 3 Feb 2022 19:05:56 +0100 Subject: gnu: python-libsass: Fix build. * gnu/packages/python-xyz.scm (python-libsass)[arguments]: Add phase to appease sanity check. While here, make tests conditional and remove trailing #t. --- gnu/packages/python-xyz.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 01c9ea3cf1..7493379cb6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12083,9 +12083,21 @@ (define-public python-libsass (setenv "SYSTEM_SASS" (assoc-ref %build-inputs "libsass")) #t)) (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "sasstests.py")))) + (add-after 'install 'delete-test (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "sasstests.py")))))) + ;; Delete sasstests.py because it attempts to open a file + ;; that is not installed when loaded, which breaks the sanity + ;; check. + (delete-file (string-append + (assoc-ref outputs "out") + "/lib/python" + (python-version + (dirname (dirname + (search-input-file inputs "bin/python")))) + "/site-packages/sasstests.py"))))))) (native-inputs (list python-pytest python-werkzeug)) (inputs -- cgit v1.2.3 From 3f0d01b2df782cbe875bf591242a331117604f1b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 3 Feb 2022 19:10:22 +0100 Subject: gnu: python-libsass: Remove label usage. * gnu/packages/python-xyz.scm (python-libsass)[arguments]: Don't reference libsass, which turned out to be unnecessary. --- gnu/packages/python-xyz.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7493379cb6..a1fb9856d3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12075,13 +12075,11 @@ (define-public python-libsass (base32 "1r0kgl7i6nnhgjl44sjw57k08gh2qr7l8slqih550dyxbf1akbxh")))) (build-system python-build-system) (arguments - `(#:phases + '(#:phases (modify-phases %standard-phases ;; Use Guix package of libsass instead of compiling from a checkout. (add-before 'build 'set-libsass - (lambda _ - (setenv "SYSTEM_SASS" (assoc-ref %build-inputs "libsass")) - #t)) + (lambda _ (setenv "SYSTEM_SASS" "indeed"))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- cgit v1.2.3 From df0ad9560f5a42f2851501657a4c032fa125b88c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 3 Feb 2022 21:27:09 +0100 Subject: gnu: python-translate-toolkit: Disable sanity check. * gnu/packages/python-xyz.scm (python-translate-toolkit)[arguments]: Add #:phases. --- gnu/packages/python-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a1fb9856d3..46419e8ace 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19251,7 +19251,12 @@ (define-public python-translate-toolkit ;; TypeError: parse() missing 2 required positional arguments: 'tree' and ;; 'parse_funcs' ;; during test setup. - `(#:tests? #f)) + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; translate-toolkit has many optional dependencies (see + ;; optional.txt), which the sanity check does not understand. + (delete 'sanity-check)))) (home-page "https://toolkit.translatehouse.org") (synopsis "Tools and API for translation and localization engineering") (description -- cgit v1.2.3 From 2d5c270ec4f39b81ad07c6a4fc847c9e5997b822 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 4 Feb 2022 20:06:58 +0100 Subject: gnu: python-pybtex: Fix test failure. * gnu/packages/python-xyz.scm (python-pybtex)[arguments]: Run nosetests directly instead of via setup.py. --- gnu/packages/python-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 46419e8ace..7c1b5e8ed3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21816,7 +21816,12 @@ (define-public python-pybtex (inputs (list python-latexcodec python-pyyaml python-six)) (arguments - `(#:test-target "nosetests")) + (list + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "nosetests"))))))) (home-page "https://pybtex.org/") (synopsis "BibTeX-compatible bibliography processor") (description "Pybtex is a BibTeX-compatible bibliography processor written -- cgit v1.2.3 From 418208090b21319797fd461e091570fd9d54d894 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 6 Feb 2022 23:49:22 -0500 Subject: gnu: Remove python2-llfuse. * gnu/packages/python-xyz.scm (python2-llfuse): Remove variable. (python-llfuse)[properties]: Remove field. --- gnu/packages/python-xyz.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7c1b5e8ed3..453cdbb16c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11123,14 +11123,7 @@ (define-public python-llfuse (description "Python-LLFUSE is a set of Python bindings for the low level FUSE API.") (home-page "https://bitbucket.org/nikratio/python-llfuse/") - (license license:lgpl2.0+) - (properties `((python2-variant . ,(delay python2-llfuse)))))) - -(define-public python2-llfuse - (let ((base (package-with-python2 - (strip-python2-variant python-llfuse)))) - (package/inherit base - (propagated-inputs `(("python2-contextlib2" ,python2-contextlib2)))))) + (license license:lgpl2.0+))) (define-public python-msgpack (package -- cgit v1.2.3 From c5e436b0b1a4d2d8637f8f08e662619f3f7fe881 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 6 Feb 2022 23:48:35 -0500 Subject: gnu: python-llfuse: Update to 1.4.1. * gnu/packages/python-xyz.scm (python-llfuse): Update to 1.4.1. [native-inputs]: Add python-pytest. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 453cdbb16c..1b1dd4db32 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11107,18 +11107,18 @@ (define-public python-gorilla (define-public python-llfuse (package (name "python-llfuse") - (version "1.3.8") + (version "1.4.1") (source (origin (method url-fetch) (uri (pypi-uri "llfuse" version)) (sha256 (base32 - "1g2cdhdqrb6m7655qp61pn61pwj1ql61cdzhr2jvl3w4i8877ddr")))) + "1jaf790rsxvz3hs9fbr3hrnmg0xzl6a2bqfa10bbbsjsdbcpk762")))) (build-system python-build-system) (inputs (list fuse attr)) (native-inputs - (list pkg-config)) + (list pkg-config python-pytest)) (synopsis "Python bindings for FUSE") (description "Python-LLFUSE is a set of Python bindings for the low level FUSE API.") -- cgit v1.2.3 From 28c0a7cc8c5897433de525afa8f93e3ad7e71abd Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Fri, 4 Feb 2022 22:53:07 +0100 Subject: gnu: python-honcho: Update to 1.1.0. * gnu/packages/python-xyz.scm (python-honcho): Update to 1.1.0. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1b1dd4db32..d7e816415d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven ;;; Copyright © 2016-2022 Marius Bakke -;;; Copyright © 2016, 2017, 2021 Stefan Reichör +;;; Copyright © 2016, 2017, 2021, 2022 Stefan Reichör ;;; Copyright © 2016, 2017, 2019 Alex Vong ;;; Copyright © 2016, 2017, 2018, 2021 Arun Isaac ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Julien Lepiller @@ -7914,7 +7914,7 @@ (define-public python-gridmap (define-public python-honcho (package (name "python-honcho") - (version "1.0.1") + (version "1.1.0") (source (origin (method git-fetch) @@ -7923,7 +7923,7 @@ (define-public python-honcho (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11bd87474qpif20xdcn0ra1idj5k16ka51i658wfpxwc6nzsn92b")))) + (base32 "1y0r8dw4pqcq7r4n58ixjdg1iy60lp0gxsd7d2jmhals16ij71rj")))) (build-system python-build-system) (native-inputs (list python-pytest python-mock python-tox which)) ;for tests @@ -7942,7 +7942,8 @@ (define-public python-honcho ;; It's easier to run tests after install. ;; Make installed package available for running the tests (add-installed-pythonpath inputs outputs) - (invoke "py.test" "-v")))))) + ;; Skip failing test_export + (invoke "py.test" "-v" "-k" "not test_export")))))) (home-page "https://github.com/nickstenning/honcho") (synopsis "Manage Procfile-based applications") (description -- cgit v1.2.3 From 2b677cff7d3cbc28e9f7f5da41ae52d32da3a674 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Feb 2022 12:19:33 -0500 Subject: gnu: python-pkgconfig: Fix path to find pkg-config. * gnu/packages/python-xyz.scm (python-pkgconfig)[arguments]: Fix the substitution so the package refers to pkg-config. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d7e816415d..537a2eef35 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15488,9 +15488,8 @@ (define-public python-pkgconfig ;; Hard-code the path to pkg-config. (lambda _ (substitute* "pkgconfig/pkgconfig.py" - (("cmd = 'pkg-config") - (string-append "cmd = '" (which "pkg-config")))) - #t)) + (("'pkg-config'") + (string-append "'" (which "pkg-config") "'"))))) (replace 'check (lambda _ (invoke "nosetests" "test.py")))))) -- cgit v1.2.3 From 15168f2432302cec8e5eba7dc170bee1fa9fd9ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Feb 2022 09:19:55 +0100 Subject: gnu: python-importmagic: Fix test failure. * gnu/packages/python-xyz.scm (python-importmagic)[arguments]: Replace check phase. [native-inputs]: Add PYTHON-PYTEST. --- gnu/packages/python-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 537a2eef35..41b60325d2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8243,6 +8243,15 @@ (define-public python-importmagic (base32 "1n7qxa1snj06aw45mcfz7bxc46zp7fxj687140g2k6jcnyjmfxrz")))) (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v"))))))) + (native-inputs + (list python-pytest)) (home-page "https://github.com/alecthomas/importmagic") (synopsis "Library for adding, removing and managing Python imports") (description -- cgit v1.2.3