From 5d484f42a87d7121b6f9d50bb5f8d61e157bb186 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Sep 2019 12:27:12 +0300 Subject: gnu: python2-matplotlib: Disable tests. * gnu/packages/python-xyz.scm (python2-matplotlib)[arguments]: Skip the custom 'check phase. --- gnu/packages/python-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4541604873..66f7e176e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3937,6 +3937,11 @@ toolkits.") (sha256 (base32 "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk")))) + (arguments + (substitute-keyword-arguments (package-arguments matplotlib) + ((#:phases phases) + `(modify-phases ,phases + (delete 'check))))) ; These tests weren't run the the past. ;; Make sure to use special packages for Python 2 instead ;; of those automatically rewritten by package-with-python2. (propagated-inputs -- cgit v1.2.3 From 66a3c2db9b1d344145ded88fd5aeec4cff77137f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Sep 2019 12:29:49 +0300 Subject: gnu: python2-matplotlib: Fix jquery-ui install path. * gnu/packages/python-xyz.scm (python2-matplotlib)[arguments]: Override custom 'install-jquery-ui phase to install in the appropriate directory. --- gnu/packages/python-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 66f7e176e2..71adf82a77 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3941,6 +3941,16 @@ toolkits.") (substitute-keyword-arguments (package-arguments matplotlib) ((#:phases phases) `(modify-phases ,phases + (replace 'install-jquery-ui + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((dir (string-append (assoc-ref outputs "out") + "/lib/python2.7/site-packages/" + "matplotlib/backends/web_backend/"))) + (mkdir-p dir) + (invoke "unzip" + (assoc-ref inputs "jquery-ui") + "-d" dir)) + #t)) (delete 'check))))) ; These tests weren't run the the past. ;; Make sure to use special packages for Python 2 instead ;; of those automatically rewritten by package-with-python2. -- cgit v1.2.3 From 7380df7312cc9f3fedce553954528e574df451bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Sep 2019 12:32:31 +0300 Subject: gnu: python2-matplotlib: Update to 2.2.4. * gnu/packages/python-xyz.scm (python2-matplotlib): Update to 2.2.4. --- 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 71adf82a77..28b472c72e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3929,14 +3929,14 @@ toolkits.") (let ((matplotlib (package-with-python2 (strip-python2-variant python-matplotlib)))) (package (inherit matplotlib) - (version "2.2.3") + (version "2.2.4") (source (origin (method url-fetch) (uri (pypi-uri "matplotlib" version)) (sha256 (base32 - "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk")))) + "09i1gnrra1590brc1f8d5rh2zvnknmfgzp613ab0462qkrwj15h2")))) (arguments (substitute-keyword-arguments (package-arguments matplotlib) ((#:phases phases) -- cgit v1.2.3 From 339b582892dea157b54879884032900bf0700d72 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Sep 2019 12:36:13 +0300 Subject: gnu: python-matplotlib: Use https in home-page. * gnu/packages/python-xyz.scm (python-matplotlib)[home-page]: Update to use https. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 28b472c72e..5c261cc6fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3914,7 +3914,7 @@ tests = True~%" (assoc-ref inputs "tcl") (assoc-ref inputs "tk"))))) #t))))) - (home-page "http://matplotlib.org") + (home-page "https://matplotlib.org/") (synopsis "2D plotting library for Python") (description "Matplotlib is a Python 2D plotting library which produces publication -- cgit v1.2.3 From f315673d9e56f4f2398098590ebdc080b63ce8b1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 19 Sep 2019 10:23:47 -0700 Subject: gnu: Add python-binwalk. * gnu/packages/python-xyz (python-binwalk): New variable. * gnu/packages/diffoscope (diffoscope)[native-inputs]: Add python-binwalk for tests. --- gnu/packages/diffoscope.scm | 1 + gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 59a15205c0..17a2d212e5 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -150,6 +150,7 @@ ;; Below are modules used for tests. (native-inputs `(("python-pytest" ,python-pytest) ("python-chardet" ,python-chardet) + ("python-binwalk" ,python-binwalk) ;; test suite skips tests when tool is missing ("abootimg" ,abootimg) ("bdb" ,bdb) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5c261cc6fd..601e4b13df 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10868,6 +10868,42 @@ binary or text.") `(("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)))))) +(define-public python-binwalk + (let ((commit "64201acfb5b0a9cdd9faa58c40a36dcff8612e29") + (revision "0")) + (package + (name "python-binwalk") + (version (git-version "2.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ReFirmLabs/binwalk") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z7ca6rfp887hw5jc3sb45mm4fa0xid4lsp2z8g4r590dr7k7w15")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-pythonpath + (lambda _ + (setenv "PYTHONPATH" + (string-append + (getcwd) "/src/" + ":" (getenv "PYTHONPATH"))) + (setenv "HOME" "") + #t))))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-nose" ,python-nose))) + (home-page "https://github.com/ReFirmLabs/binwalk") + (synopsis "Firmware analysis tool") + (description "Binwalk is a tool for analyzing, reverse engineering, and extracting firmware images") + (license license:expat)))) + (define-public python-nltk (package (name "python-nltk") -- cgit v1.2.3 From af760990e9651be865ccd20b935863d85f605f2e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 8 Sep 2019 23:53:00 -0700 Subject: gnu: Add python-editorconfig. * gnu/packages/python-xyz (python-editorconfig): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 601e4b13df..44aa471bb1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -882,6 +882,27 @@ messages in color.") (define-public python2-coloredlogs (package-with-python2 python-coloredlogs)) +(define-public python-editorconfig + (package + (name "python-editorconfig") + (version "0.12.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "EditorConfig" version)) + (sha256 + (base32 + "0v55z351p9qkyp3bbspwywwn28sbcknhirngjbj779n3z52z63hv")))) + (build-system python-build-system) + (home-page "https://editorconfig.org/") + (synopsis "EditorConfig bindings for python") + (description "The EditorConfig project consists of a file format for +defining coding styles and a collection of text editor plugins that enable +editors to read the file format and adhere to defined styles. EditorConfig +files are easily readable and they work nicely with version control systems.") + ;; "fnmatch.py" and "ini.py" are licensed under psfl, the rest is bsd-2. + (license (list license:bsd-2 license:psfl)))) + (define-public python-et-xmlfile (package (name "python-et-xmlfile") -- cgit v1.2.3 From 6ec872231fdf746bd6e11b97f8a6b3a23498806c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 19 Sep 2019 13:45:41 -0700 Subject: gnu: Add python-jsbeautifier. * gnu/packages/python-xyz (python-jsbeautifier): New variable. * gnu/packages/diffoscope (diffoscope)[native-arguments]: Add python-jsbeautifier. [arguments]: Add python-jsbeautifier to add-known-tools phase. --- gnu/packages/diffoscope.scm | 4 ++++ gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index e2b2565004..fff331ac13 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -92,6 +92,9 @@ ;; Patch in support for known tools (add-after 'unpack 'add-known-tools (lambda _ + (substitute* "diffoscope/external_tools.py" + (("'arch': 'python-jsbeautifier'},") + "'arch': 'python-jsbeautifier', 'guix': 'python-jsbeautifier'},")) (substitute* "diffoscope/external_tools.py" (("'arch': 'wabt'},") "'arch': 'wabt', 'guix': 'wabt'},")))) @@ -188,6 +191,7 @@ ("openssh" ,openssh) ("pgpdump" ,pgpdump) ("poppler" ,poppler) + ("python-jsbeautifier" ,python-jsbeautifier) ("r-minimal" ,r-minimal) ("rpm" ,rpm) ("sng" ,sng) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 44aa471bb1..4e33fa575f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8035,6 +8035,45 @@ Jupyter kernels such as IJulia and IRKernel.") support for rich media output.") (license license:bsd-3))) +(define-public python-jsbeautifier + (package + (name "python-jsbeautifier") + (version "1.10.2") + (home-page "https://github.com/beautify-web/js-beautify") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wawb070ki1axb3jc9xvsrgpji52vcfif3zmjzc3z4g98m5xw4kg")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + ;; The upstream Git repository contains all the code, + ;; but this package only builds the python code. + (chdir "python") + #t)) + (add-after 'unpack 'patch-python-six-requirements + (lambda _ + (substitute* "python/setup.py" + (("six>=1.12.0") + "six>=1.11.0")) + #t))))) + (propagated-inputs + `(("python-editorconfig" ,python-editorconfig) + ("python-six" ,python-six))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (synopsis "JavaScript unobfuscator and beautifier") + (description "Beautify, unpack or deobfuscate JavaScript, leveraging +popular online obfuscators.") + (license license:expat))) + (define-public jupyter (package (name "jupyter") -- cgit v1.2.3 From c1bbef6920b1eb7e212b5e11d0385d477a53fbfb Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Mon, 16 Sep 2019 18:19:39 +0200 Subject: gnu: Add python-bibtexparser. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-bibtexparser): New variable. Signed-off-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 4e33fa575f..69c8e63ecf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -65,6 +65,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald ;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2019 Wiktor Żelazny ;;; ;;; This file is part of GNU Guix. ;;; @@ -16376,3 +16377,24 @@ ElementTree library and for the @uref{http://lxml.de, lxml.etree} library. For lxml.etree this package can be useful for providing XPath 2.0 selectors, because lxml.etree already has it's own implementation of XPath 1.0.") (license license:expat))) + +(define-public python-bibtexparser + (package + (name "python-bibtexparser") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bibtexparser" version)) + (sha256 + (base32 + "0zwhfkrzf3n5847dbnfng92k7ak199l9v6x6ax3dgdidfpm6d2fz")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pyparsing" ,python-pyparsing))) + (native-inputs + `(("python-future" ,python-future))) + (home-page "https://github.com/sciunto-org/python-bibtexparser") + (synopsis "Python library to parse BibTeX files") + (description "BibtexParser is a Python library to parse BibTeX files.") + (license (list license:bsd-3 license:lgpl3)))) -- cgit v1.2.3