From 043a51c0c2a025b84b0fb14c157add7236d7a526 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 2 Oct 2016 18:48:56 +0200 Subject: guix: python-build-system: Fix an outdated comment. --- guix/build/python-build-system.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 9109fb4ac7..e906e60699 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -137,8 +137,7 @@ installed with setuptools." #t)) (define %standard-phases - ;; 'configure' and 'build' phases are not needed. Everything is done during - ;; 'install'. + ;; 'configure' phase is not needed. (modify-phases gnu:%standard-phases (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980) (delete 'configure) -- cgit v1.2.3 From aaf75c890b5242d3ab3671766226bc53ab07049a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 10:36:45 +0200 Subject: gnu: ensure pip and setuptools are installed even for Python 2. * gnu/packages/python.scm (python-2.7): Add "--with-ensurepip=install" to configure-flags. * doc/guix.texi (Python Modules): Document it. --- doc/guix.texi | 9 ++++++--- gnu/packages/python.scm | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a3eba5811e..2691e24faf 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13579,7 +13579,6 @@ for instance, the module python-dateutil is packaged under the names starts with @code{py} (e.g. @code{pytz}), we keep it and prefix it as described above. - @subsubsection Specifying Dependencies @cindex inputs, for Python packages @@ -13595,6 +13594,11 @@ following check list to determine which dependency goes where. @itemize +@item +We currently package Python 2 with @code{setuptools} and @code{pip} +installed like Python 3.4 has per default. Thus you don't need to +specify either of these as an input. + @item Python dependencies required at run time go into @code{propagated-inputs}. They are typically defined with the @@ -13609,8 +13613,7 @@ testing---e.g., those in @code{tests_require}---go into propagated because they are not needed at run time, and (2) in a cross-compilation context, it's the ``native'' input that we'd want. -Examples are @code{setuptools}, which is usually needed only at build -time, or the @code{pytest}, @code{mock}, and @code{nose} test +Examples are the @code{pytest}, @code{mock}, and @code{nose} test frameworks. Of course if any of these packages is also required at run-time, it needs to go to @code{propagated-inputs}. diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 18e485ab2e..b6aeb8c032 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -162,6 +162,7 @@ #:configure-flags (list "--enable-shared" ;allow embedding "--with-system-ffi" ;build ctypes + "--with-ensurepip=install" ;install pip and setuptools (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.2.3 From 7db40bce58e149ecb541d295e01cfbfe953d39a3 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 10:42:35 +0200 Subject: guix: build all Python packages with --single-version-externally-managed. This requires setuptools to be installed together with python, which is the case for Python 3 anyway and which we do for our build of Python 2 (see last commit). * guix/build/python-build-system.scm (install): Add "--single-version-externally-managed" and "--root=/" to params to be passed to call-setuppy. Remove thus needless manipulation of PYTHONPATH. Remove now unused argument "inputs". --- guix/build/python-build-system.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index e906e60699..2424fed310 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2016 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,25 +61,15 @@ (major+minor (take components 2))) (string-join major+minor "."))) -(define* (install #:key outputs inputs (configure-flags '()) +(define* (install #:key outputs (configure-flags '()) #:allow-other-keys) "Install a given Python package." (let* ((out (assoc-ref outputs "out")) - (params (append (list (string-append "--prefix=" out)) - configure-flags)) - (python-version (get-python-version (assoc-ref inputs "python"))) - (old-path (getenv "PYTHONPATH")) - (add-path (string-append out "/lib/python" python-version - "/site-packages/"))) - ;; create the module installation directory and add it to PYTHONPATH - ;; to make setuptools happy - (mkdir-p add-path) - (setenv "PYTHONPATH" - (string-append (if old-path - (string-append old-path ":") - "") - add-path)) - (call-setuppy "install" params))) + (params (append (list (string-append "--prefix=" out) + "--single-version-externally-managed" + "--root=/") + configure-flags))) + (call-setuppy "install" params))) (define* (wrap #:key inputs outputs #:allow-other-keys) (define (list-of-files dir) -- cgit v1.2.3 From 46bcdcc287ecfc1db8b7a0429e72517f407b580d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 29 Sep 2016 18:41:35 +0100 Subject: guix: python-build-system: Import setuptools before calling `setup.py'. This is needed for packages using "distutils" instead of "setuptools" since the former does not understand the "--single-version-externally-managed" flag. Also export __file__ since it will be unset when setup.py is called from python "exec". * guix/build/python-build-system.scm (call-setuppy): extend "python setup.py" call to import setuptools, export __file__, and call setup.py from setuptools python environment. Co-Authored-By: Hartmut Goebel --- guix/build/python-build-system.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 2424fed310..6086df3e82 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -36,13 +36,25 @@ ;; ;; Code: +(define setuptools-shim + ;; Run setup.py with "setuptools" being imported, which will patch + ;; "distutils". This is needed for packages using "distutils" instead of + ;; "setuptools" since the former does not understand the + ;; "--single-version-externally-managed" flag. + ;; Python code taken from pip 9.0.1 pip/utils/setuptools_build.py + (string-append + "import setuptools, tokenize;__file__='setup.py';" + "f=getattr(tokenize, 'open', open)(__file__);" + "code=f.read().replace('\\r\\n', '\\n');" + "f.close();" + "exec(compile(code, __file__, 'exec'))")) (define (call-setuppy command params) (if (file-exists? "setup.py") (begin (format #t "running \"python setup.py\" with command ~s and parameters ~s~%" command params) - (zero? (apply system* "python" "setup.py" command params))) + (zero? (apply system* "python" "-c" setuptools-shim command params))) (error "no setup.py found"))) (define* (build #:rest empty) -- cgit v1.2.3 From 5f7565d190cf380b7bae2ce12dba38aff98c4eb9 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 2 Oct 2016 14:03:32 +0200 Subject: guix: python-build-system: Add option "#:use-setuptools?" (default true). * guix/build-system/python.scm (python-build): New keyword argument "#:use-setuptools?", defaulting to #t. * guix/build/python-build-system.scm (call-setup-py): New positional parameter "use-setuptools?". If false, do not use the shim-wrapper for addin setuptools. (build, check): accept keyword- parameter, and pass to call-setuppy. (install): same; if "use-setuptools?" is false, do not use options "--root" and "--single-version-externally-managed" for setup.py. * doc/guix.texi (Build Systems): Document it. --- doc/guix.texi | 5 +++++ guix/build-system/python.scm | 2 ++ guix/build/python-build-system.scm | 28 +++++++++++++++++----------- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2691e24faf..5f2807654b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3137,6 +3137,11 @@ the @code{#:python} parameter. This is a useful way to force a package to be built for a specific version of the Python interpreter, which might be necessary if the package is only compatible with a single interpreter version. + +By default guix calls @code{setup.py} under control of +@code{setuptools}, much like @command{pip} does. Some packages are not +compatible with setuptools (and pip), thus you can disable this by +setting the @code{#:use-setuptools} parameter to @code{#f}. @end defvr @defvr {Scheme Variable} perl-build-system diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index adeceb4a89..d4d3d28f2a 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -177,6 +177,7 @@ pre-defined variants." #:key (tests? #t) (test-target "test") + (use-setuptools? #t) (configure-flags ''()) (phases '(@ (guix build python-build-system) %standard-phases)) @@ -204,6 +205,7 @@ provides a 'setup.py' file as its build system." #:system ,system #:test-target ,test-target #:tests? ,tests? + #:use-setuptools? ,use-setuptools? #:phases ,phases #:outputs %outputs #:search-paths ',(map search-path-specification->sexp diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 6086df3e82..7ccc9386cf 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -49,22 +49,25 @@ "f.close();" "exec(compile(code, __file__, 'exec'))")) -(define (call-setuppy command params) +(define (call-setuppy command params use-setuptools?) (if (file-exists? "setup.py") (begin (format #t "running \"python setup.py\" with command ~s and parameters ~s~%" command params) - (zero? (apply system* "python" "-c" setuptools-shim command params))) + (if use-setuptools? + (zero? (apply system* "python" "-c" setuptools-shim + command params)) + (zero? (apply system* "python" "./setup.py" command params)))) (error "no setup.py found"))) -(define* (build #:rest empty) +(define* (build #:key use-setuptools? #:allow-other-keys) "Build a given Python package." - (call-setuppy "build" '())) + (call-setuppy "build" '() use-setuptools?)) -(define* (check #:key tests? test-target #:allow-other-keys) +(define* (check #:key tests? test-target use-setuptools? #:allow-other-keys) "Run the test suite of a given Python package." (if tests? - (call-setuppy test-target '()) + (call-setuppy test-target '() use-setuptools?) #t)) (define (get-python-version python) @@ -73,15 +76,18 @@ (major+minor (take components 2))) (string-join major+minor "."))) -(define* (install #:key outputs (configure-flags '()) +(define* (install #:key outputs (configure-flags '()) use-setuptools? #:allow-other-keys) "Install a given Python package." (let* ((out (assoc-ref outputs "out")) - (params (append (list (string-append "--prefix=" out) - "--single-version-externally-managed" - "--root=/") + (params (append (list (string-append "--prefix=" out)) + (if use-setuptools? + ;; distutils does not accept these flags + (list "--single-version-externally-managed" + "--root=/") + '()) configure-flags))) - (call-setuppy "install" params))) + (call-setuppy "install" params use-setuptools?))) (define* (wrap #:key inputs outputs #:allow-other-keys) (define (list-of-files dir) -- cgit v1.2.3 From a2ff4f0240f0fac484836bb8ffb2f86917369666 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 8 Oct 2016 12:04:20 +0200 Subject: guix: python-build-system: Add helpers for getting and setting PYTHONPATH. * guix/build/python-build-system.scm (add-installed-pythonpath, site-packages): New exported procedures. --- guix/build/python-build-system.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 7ccc9386cf..22c4f7d38a 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -28,6 +28,8 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases + add-installed-pythonpath + site-packages python-build)) ;; Commentary: @@ -76,6 +78,24 @@ (major+minor (take components 2))) (string-join major+minor "."))) +(define (site-packages inputs outputs) + "Return the path of the current output's Python site-package." + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python"))) + (string-append out "/lib/python" + (get-python-version python) + "/site-packages/"))) + +(define (add-installed-pythonpath inputs outputs) + "Prepend the Python site-package of OUTPUT to PYTHONPATH. This is useful +when running checks after installing the package." + (let ((old-path (getenv "PYTHONPATH")) + (add-path (site-packages inputs outputs))) + (setenv "PYTHONPATH" + (string-append add-path + (if old-path (string-append ":" old-path) ""))) + #t)) + (define* (install #:key outputs (configure-flags '()) use-setuptools? #:allow-other-keys) "Install a given Python package." -- cgit v1.2.3 From b002f964bb3d69c77856ea7dcadfe82383050512 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 7 Oct 2016 17:17:00 +0200 Subject: guix: python-build-system: Delete .egg-info file created in phase check. * guix/build/python-build-system.scm (check): Delete .egg-info dirs which did not exist prior to calling setup.py but afterwards. --- guix/build/python-build-system.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 22c4f7d38a..310ba8aa2e 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -69,7 +69,15 @@ (define* (check #:key tests? test-target use-setuptools? #:allow-other-keys) "Run the test suite of a given Python package." (if tests? - (call-setuppy test-target '() use-setuptools?) + ;; Running `setup.py test` creates an additional .egg-info directory in + ;; build/lib in some cases, e.g. if the source is in a sub-directory + ;; (given with `package_dir`). This will by copied to the output, too, + ;; so we need to remove. + (let ((before (find-files "build" "\\.egg-info$" #:directories? #t))) + (call-setuppy test-target '() use-setuptools?) + (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t)) + (inter (lset-difference eqv? after before))) + (for-each delete-file-recursively inter))) #t)) (define (get-python-version python) -- cgit v1.2.3 From c1019287a4aab55ebffab4710b9a85b6c9f1b7ed Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 15 Nov 2016 16:57:21 +0100 Subject: guix: python-build-system: Add background about Python installation methods. --- guix/build/python-build-system.scm | 68 +++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 310ba8aa2e..3f280b0ac0 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -36,7 +36,70 @@ ;; ;; Builder-side code of the standard Python package build procedure. ;; -;; Code: +;; +;; Backgound about the Python installation methods +;; +;; In Python there are different ways to install packages: distutils, +;; setuptools, easy_install and pip. All of these are sharing the file +;; setup.py, introduced with distutils in Python 2.0. The setup.py file can be +;; considered as a kind of Makefile accepting targets (or commands) like +;; "build" and "install". As of autumn 2016 the recommended way to install +;; Python packages is using pip. +;; +;; For both distutils and setuptools, running "python setup.py install" is the +;; way to install Python packages. With distutils the "install" command +;; basically copies all packages into /lib/pythonX.Y/site-packages. +;; +;; Some time later "setuptools" was established to enhance distutils. To use +;; setuptools, the developer imports setuptools in setup.py. When importing +;; setuptools, the original "install" command gets overwritten by setuptools' +;; "install" command. +;; +;; The command-line tools easy_install and pip are both capable of finding and +;; downloading the package source from PyPI (the Python Package Index). Both +;; of them import setuptools and execute the "setup.py" file under their +;; control. Thus the "setup.py" behaves as if the developer had imported +;; setuptools within setup.py - even is still using only distutils. +;; +;; Setuptools' "install" command (to be more precise: the "easy_install" +;; command which is called by "install") will put the path of the currently +;; installed version of each package and it's dependencies (as declared in +;; setup.py) into an "easy-install.pth" file. In Guix each packages gets its +;; own "site-packages" directory and thus an "easy-install.pth" of its own. +;; To avoid conflicts, the python build system renames the file to +;; .pth in the phase rename-pth-file. To ensure that Python will +;; process the .pth file, easy_install also creates a basic "site.py" in each +;; "site-packages" directory. The file is the same for all packages, thus +;; there is no need to rename it. For more information about .pth files and +;; the site module, please refere to +;; https://docs.python.org/3/library/site.html. +;; +;; The .pth files contain the file-system paths (pointing to the store) of all +;; dependencies. So the dependency is hidden in the .pth file but is not +;; visible in the file-system. Now if packages A and B both required packages +;; P, but in different versions, Guix will not detect this when installing +;; both A and B to a profile. (For details and example see +;; https://lists.gnu.org/archive/html/guix-devel/2016-10/msg01233.html.) +;; +;; Pip behaves a bit different then easy_install: it always executes +;; "setup.py" with the option "--single-version-externally-managed" set. This +;; makes setuptools' "install" command run the original "install" command +;; instead of the "easy_install" command, so no .pth file (and no site.py) +;; will be created. The "site-packages" directory only contains the package +;; and the related .egg-info directory. +;; +;; This is exactly what we need for Guix and this is what we mimic in the +;; install phase below. +;; +;; As a draw back, the magic of the .pth file of linking to the other required +;; packages is gone and these packages have now to be declared as +;; "propagated-inputs". +;; +;; Note: Importing setuptools also adds two sub-commands: "install_egg_info" +;; and "install_scripts". These sub-commands are executed even if +;; "--single-version-externally-managed" is set, thus the .egg-info directory +;; and the scripts defined in entry-points will always be created. + (define setuptools-shim ;; Run setup.py with "setuptools" being imported, which will patch @@ -149,6 +212,9 @@ when running checks after installing the package." (define* (rename-pth-file #:key name inputs outputs #:allow-other-keys) "Rename easy-install.pth to NAME.pth to avoid conflicts between packages installed with setuptools." + ;; Even if the "easy-install.pth" is not longer created, we kept this phase. + ;; There still may be packages creating an "easy-install.pth" manually for + ;; some good reason. (let* ((out (assoc-ref outputs "out")) (python (assoc-ref inputs "python")) (site-packages (string-append out "/lib/python" -- cgit v1.2.3 From 15e57f576291d9233ab25e1614c6218579db170a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 18 Oct 2016 00:11:05 +0200 Subject: gnu: python-2.7: Add all guix prefixes in PYTHONPATH to site-prefixes. * gnu/packages/patches/python-2.7-site-prefixes.patch: New file. * gnu/packages/python.scm (python-2)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + .../patches/python-2.7-site-prefixes.patch | 26 ++++++++++++++++++++++ gnu/packages/python.scm | 1 + 3 files changed, 28 insertions(+) create mode 100644 gnu/packages/patches/python-2.7-site-prefixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index 08f99c4836..5142f51e1b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -803,6 +803,7 @@ dist_patch_DATA = \ %D%/packages/patches/pyqt-configure.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ + %D%/packages/patches/python-2.7-site-prefixes.patch \ %D%/packages/patches/python-2.7-source-date-epoch.patch \ %D%/packages/patches/python-3-deterministic-build-info.patch \ %D%/packages/patches/python-3-search-paths.patch \ diff --git a/gnu/packages/patches/python-2.7-site-prefixes.patch b/gnu/packages/patches/python-2.7-site-prefixes.patch new file mode 100644 index 0000000000..9e3066508f --- /dev/null +++ b/gnu/packages/patches/python-2.7-site-prefixes.patch @@ -0,0 +1,26 @@ +Add all /gnu/store/ prefixes found in PYTHONPATH to the prefixes where +site-packages (and .pth files) are searched. + +*** Python-2.7.11/Lib/site.py.orig 2016-10-17 23:27:23.746149690 +0200 +--- Python-2.7.11/Lib/site.py 2016-10-17 23:44:51.930871644 +0200 +*************** +*** 65,70 **** +--- 65,82 ---- + + # Prefixes for site-packages; add additional prefixes like /usr/local here + PREFIXES = [sys.prefix, sys.exec_prefix] ++ # Guix: Add all /gnu/store-paths in PYTHONPATH--these are all ++ # "prefixes". This is required to search .pth files in all python ++ # packages contained in /gnu/store which is required to make ++ # .pth-defined namespace packages work. ++ # This is necessary if the packages are not merged into a single ++ # `site-packages` directory (like when using `guix environment`) but ++ # listed in PYTHONPATH (like when running `guix build`). ++ for p in sys.path: ++ if p.startswith('/gnu/store/'): ++ PREFIXES.append(p[:p.find('/', 44)]) # find first pathsep after hash ++ del p ++ + # Enable per user site-packages directory + # set it to False to disable the feature or True to force the feature + ENABLE_USER_SITE = None diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b6aeb8c032..ca40fe8c29 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -122,6 +122,7 @@ "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp")) (patches (search-patches "python-2.7-search-paths.patch" "python-2-deterministic-build-info.patch" + "python-2.7-site-prefixes.patch" "python-2.7-source-date-epoch.patch")) (modules '((guix build utils))) ;; suboptimal to delete failing tests here, but if we delete them in the -- cgit v1.2.3 From 891a843d5184f696618af6fcbb9791ef6b574504 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 11:36:35 +0200 Subject: guix: Add lint-checker for packages which should be no inputs at all. Also refactor some common code into a new function. Examples for these pacakges are python(2)-setuptools and python(2)-pip, which are installed together with python itself. * guix/scripts/lint.scm (warn-if-package-has-input): New procedure. (check-inputs-should-be-native package): Use it; rename and clean-up variables. (check-inputs-should-not-be-an-input-at-all): New procedure. (%checkers) Add it. * doc/guix.texi (Python Modules): Document it. * tests/lint.scm: ("inputs: python-setuptools should not be an input at all (input)", "inputs: python-setuptools should not be an input at all (native-input)" "inputs: python-setuptools should not be an input at all (propagated-input)"): Add tests. --- doc/guix.texi | 3 ++- guix/scripts/lint.scm | 63 ++++++++++++++++++++++++++++++++++++--------------- tests/lint.scm | 34 +++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 19 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5f2807654b..40a1a8760c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13602,7 +13602,8 @@ following check list to determine which dependency goes where. @item We currently package Python 2 with @code{setuptools} and @code{pip} installed like Python 3.4 has per default. Thus you don't need to -specify either of these as an input. +specify either of these as an input. @command{guix lint} will warn you +if you do. @item Python dependencies required at run time go into diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm index 6e6f550941..e68ee29e07 100644 --- a/guix/scripts/lint.scm +++ b/guix/scripts/lint.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2016 Danny Milosavljevic +;;; Copyright © 2016 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ #:export (guix-lint check-description-style check-inputs-should-be-native + check-inputs-should-not-be-an-input-at-all check-patch-file-names check-synopsis-style check-derivation @@ -228,34 +230,55 @@ by two spaces; possible infraction~p at ~{~a~^, ~}") (format #f (_ "invalid description: ~s") description) 'description)))) +(define (warn-if-package-has-input linted inputs-to-check input-names message) + ;; Emit a warning MESSAGE if some of the inputs named in INPUT-NAMES are + ;; contained in INPUTS-TO-CHECK, which are assumed to be inputs of package + ;; LINTED. + (match inputs-to-check + (((labels packages . outputs) ...) + (for-each (lambda (package output) + (when (package? package) + (let ((input (string-append + (package-name package) + (if (> (length output) 0) + (string-append ":" (car output)) + "")))) + (when (member input input-names) + (emit-warning linted + (format #f (_ message) input) + 'inputs-to-check))))) + packages outputs)))) + (define (check-inputs-should-be-native package) ;; Emit a warning if some inputs of PACKAGE are likely to belong to its ;; native inputs. - (let ((linted package) + (let ((message "'~a' should probably be a native input") (inputs (package-inputs package)) - (native-inputs + (input-names '("pkg-config" "extra-cmake-modules" "glib:bin" "intltool" "itstool" "qttools"))) - (match inputs - (((labels packages . outputs) ...) - (for-each (lambda (package output) - (when (package? package) - (let ((input (string-append - (package-name package) - (if (> (length output) 0) - (string-append ":" (car output)) - "")))) - (when (member input native-inputs) - (emit-warning linted - (format #f (_ "'~a' should probably \ -be a native input") - input) - 'inputs))))) - packages outputs))))) + (warn-if-package-has-input package inputs input-names message))) + +(define (check-inputs-should-not-be-an-input-at-all package) + ;; Emit a warning if some inputs of PACKAGE are likely to should not be + ;; an input at all. + (let ((message "'~a' should probably not be an input at all") + (inputs (package-inputs package)) + (input-names + '("python-setuptools" + "python2-setuptools" + "python-pip" + "python2-pip"))) + (warn-if-package-has-input package (package-inputs package) + input-names message) + (warn-if-package-has-input package (package-native-inputs package) + input-names message) + (warn-if-package-has-input package (package-propagated-inputs package) + input-names message))) (define (package-name-regexp package) "Return a regexp that matches PACKAGE's name as a word at the beginning of a @@ -844,6 +867,10 @@ them for PACKAGE." (name 'inputs-should-be-native) (description "Identify inputs that should be native inputs") (check check-inputs-should-be-native)) + (lint-checker + (name 'inputs-should-not-be-input) + (description "Identify inputs that should be inputs at all") + (check check-inputs-should-not-be-an-input-at-all)) (lint-checker (name 'patch-file-names) (description "Validate file names and availability of patches") diff --git a/tests/lint.scm b/tests/lint.scm index fa2d19b2a6..b66cd29312 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2016 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015, 2016 Mathieu Lirzin +;;; Copyright © 2016 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ #:use-module (gnu packages) #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (web server) #:use-module (web server http) #:use-module (web response) @@ -354,6 +356,38 @@ string) on HTTP requests." (check-inputs-should-be-native pkg))) "'glib:bin' should probably be a native input"))) +(test-assert + "inputs: python-setuptools should not be an input at all (input)" + (->bool + (string-contains + (with-warnings + (let ((pkg (dummy-package "x" + (inputs `(("python-setuptools" ,python-setuptools)))))) + (check-inputs-should-not-be-an-input-at-all pkg))) + "'python-setuptools' should probably not be an input at all"))) + +(test-assert + "inputs: python-setuptools should not be an input at all (native-input)" + (->bool + (string-contains + (with-warnings + (let ((pkg (dummy-package "x" + (native-inputs + `(("python-setuptools" ,python-setuptools)))))) + (check-inputs-should-not-be-an-input-at-all pkg))) + "'python-setuptools' should probably not be an input at all"))) + +(test-assert + "inputs: python-setuptools should not be an input at all (propagated-input)" + (->bool + (string-contains + (with-warnings + (let ((pkg (dummy-package "x" + (propagated-inputs + `(("python-setuptools" ,python-setuptools)))))) + (check-inputs-should-not-be-an-input-at-all pkg))) + "'python-setuptools' should probably not be an input at all"))) + (test-assert "patches: file names" (->bool (string-contains -- cgit v1.2.3 From e442246a2f5f73b2484adb340b53d3a0018636b1 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 6 Oct 2016 16:52:31 +0200 Subject: lint: more packages to probably be a native input. * guix/scripts/lint.scm (check-inputs-should-be-native package): Add python packages which are typically used for testing or for building the documentation. --- guix/scripts/lint.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm index e68ee29e07..be29e36ce1 100644 --- a/guix/scripts/lint.scm +++ b/guix/scripts/lint.scm @@ -260,7 +260,17 @@ by two spaces; possible infraction~p at ~{~a~^, ~}") "glib:bin" "intltool" "itstool" - "qttools"))) + "qttools" + "python-coverage" "python2-coverage" + "python-cython" "python2-cython" + "python-docutils" "python2-docutils" + "python-mock" "python2-mock" + "python-nose" "python2-nose" + "python-pbr" "python2-pbr" + "python-pytest" "python2-pytest" + "python-pytest-cov" "python2-pytest-cov" + "python-setuptools-scm" "python2-setuptools-scm" + "python-sphinx" "python2-sphinx"))) (warn-if-package-has-input package inputs input-names message))) (define (check-inputs-should-not-be-an-input-at-all package) -- cgit v1.2.3 From f54d6bacbf46f5f25d3f7a5bea578879ee865be1 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 13:07:24 +0200 Subject: gnu: Remove python-setuptools and python2-setuptools from inputs (part 1a) This patch contains the changes in python.scm where removing setuptools from the inputs could be achieved by removing complete lines. * gnu/packages/python.scm (python-psutil, python2-psutil, python-py-bcrypt, python2-py-bcrypt, python-paramiko, python2-paramiko, python-httplib2, python2-httplib2, python-ecdsa, python2-ecdsa, python-ccm, python2-ccm, python2-backport-ssl-match-hostname, python-pycrypto, python2-pycrypto, python-six, python2-six, python-dateutil, python2-dateutil, python2-mechanize, python-extras, python2-extras, python-mimeparse, python2-mimeparse, python-nose, python2-nose, python-nose2, python2-nose2, python-unittest2, python2-unittest2, python-py, python2-py, python-testresources, python2-testresources, python-fixtures-0.3.16, python-fixtures, python2-fixtures, python-coverage, python2-coverage, python-discover, python2-discover, python-exif-read, python2-exif-read, python-pyld, python2-pyld, python-certifi, python2-certifi, python-click, python2-click, python-vcversioner, python2-vcversioner, python-unidecode, python2-unidecode, python-pyyaml, python2-pyyaml, python-markupsafe, python2-markupsafe, python-pystache, python2-pystache, python-docutils, python2-docutils, python-pygments, python2-pygments, python-sphinx-rtd-theme, python2-sphinx-rtd-theme, python-blinker, python2-blinker, python-rq, python2-rq, python-numpy, python2-numpy, python-distutils-extra, python2-distutils-extra, python2-elib.intl, python-pillow, python2-pillow, python-xcffib, python2-xcffib, python-decorator, python2-decorator, python-gridmap, python2-gridmap, python-pickleshare, python2-pickleshare, python-isodate, python2-isodate, python-html5lib, python2-html5lib, python2-cssutils, python-cssselect, python2-cssselect, python-netifaces, python2-netifaces, python-sympy, python2-sympy, python-testlib, python2-testlib, python2-xlib, python-singledispatch, python2-singledispatch, python-backports-abc, python2-backports-abc, python-pep8, python2-pep8, python-pyflakes, python2-pyflakes, python-fonttools, python2-fonttools, python-ly, python-appdirs, python2-appdirs, python-netaddr, python2-netaddr, python-wrapt, python2-wrapt, python-iso8601, python2-iso8601, python-monotonic, python2-monotonic, python-prettytable, python2-prettytable, python-pyasn1-modules, python2-pyasn1-modules, python-idna, python2-idna, python-pretend, python2-pretend, python-cryptography-vectors, python2-cryptography-vectors, python-cryptography, python2-cryptography, python-pyopenssl, python2-pyopenssl, python-debian, python2-debian, python-chardet, python2-chardet, python-zope-event, python2-zope-event, python-zope-i18nmessageid, python2-zope-i18nmessageid, python-websocket-client, python2-websocket-client, python-args, python2-args, python-astor, python2-astor, python2-functools32, python2-futures, python2-promise, python-colorama, python2-colorama, python-pluggy, python2-pluggy, python-jmespath, python2-jmespath, python-botocore, python2-botocore, awscli, python-pytest-subtesthack, python2-pytest-subtesthack, python-pastedeploy, python2-pastedeploy, python-magic, python2-magic, python2-s3cmd, python2-bz2file, python-cysignals, python2-cysignals, python-py3status, python-tblib, python2-tblib, python-greenlet, python2-greenlet, python-twisted, python2-twisted, python-kazoo, python2-kazoo, python-pykafka, python2-pykafka, python2-jsonrpclib, python-chai, python2-chai, python-inflection, python2-inflection, python-pylev, python2-pylev, python-lazy-object-proxy, python2-lazy-object-proxy, python-dnspython, python2-dnspython, python-email-validator, python2-email-validator, python-ukpostcodeparser, python2-ukpostcodeparser, python-pyaml, python2-pyaml, python-flexmock, python2-flexmock, python-orator, python2-orator, python-bleach, python2-bleach, python-ipywidgets, python2-ipywidgets, python-nbconvert, python2-nbconvert, python-nbformat, python2-nbformat, python-axolotl-curve25519, python-axolotl2-curve25519, python-axolotl, python2-axolotl, python-nautilus, python-s3transfer): Remove python-setuptools and python2-setuptools from [inputs], [native-inputs] or [propagated-inputs]. Remove [inputs], [native-inputs] and [propagated-inputs] where python-setuptools or python2-setuptools were the sole entry. --- gnu/packages/python.scm | 231 +----------------------------------------------- 1 file changed, 2 insertions(+), 229 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ca40fe8c29..4afe3f4c12 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -435,8 +435,6 @@ instead of @command{python3}."))) (base32 "1w4r09fvn6kd80m5mx4ws1wz100brkaq6hzzpwrns8cgjzjpl6c6")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://www.github.com/giampaolo/psutil") (synopsis "Library for retrieving information on running processes") (description @@ -505,8 +503,6 @@ to providing full-strength password hashing for multi-user application.") (base32 "0y6smdggwi5s72v6p1nn53dg6w05hna3d264cq6kas0lap73p8az")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://code.google.com/p/py-bcrypt") (synopsis "Bcrypt password hashing and key derivation") @@ -540,8 +536,6 @@ John the Ripper).") (base32 "14k8z7ndc3zk5xivnm4d8lncchx475ll5izpf8vmfbq7rp9yp5rj")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-pycrypto" ,python-pycrypto))) (inputs @@ -570,8 +564,6 @@ Python interface around SSH networking concepts.") (base32 "126rsryvw9vhbf3qmsfw9lf4l4xm2srmgs439lgma4cpag4s3ay3")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/jcgregorio/httplib2") (synopsis "Comprehensive HTTP client library") (description @@ -597,8 +589,6 @@ other HTTP libraries.") (base32 "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (inputs `(("openssl" ,openssl))) (home-page @@ -628,8 +618,6 @@ making them easy to handle and incorporate into other protocols.") (base32 "177dfxsmk3k4cih6fh6v8d91bh4nqx7ns6pc07w7m7i3cvdx3c8n")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (inputs `(("python-pyyaml" ,python-pyyaml) ("python-six" ,python-six))) @@ -714,8 +702,6 @@ etc. ") (arguments `(#:python ,python-2 #:tests? #f)) ; no test target - (inputs - `(("python2-setuptools" ,python2-setuptools))) (home-page "https://bitbucket.org/brandon/backports.ssl_match_hostname") (synopsis "Backport of ssl.match_hostname() function from Python 3.5") (description @@ -880,8 +866,6 @@ Python 3 support.") (base32 "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (inputs `(("python" ,python) ("gmp" ,gmp))) @@ -957,8 +941,6 @@ password storage.") (base32 "0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://pypi.python.org/pypi/six/") (synopsis "Python 2 and 3 compatibility utilities") (description @@ -1014,8 +996,6 @@ datetime module, available in Python 2.3+.") (base32 "0fqfglhy5khbvsipr3x7m6bcaqljh8xl5cw33vbfxy7qhmywm2n0")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://dateutil.readthedocs.io/en/stable/") (synopsis "Extensions to the standard datetime module") (description @@ -1156,8 +1136,6 @@ Database API 2.0T.") (base32 "0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf")))) (build-system python-build-system) - (inputs - `(("python2-setuptools" ,python2-setuptools))) (arguments `(#:python ,python-2 ; apparently incompatible with Python 3 #:tests? #f)) @@ -1469,8 +1447,6 @@ software.") (base32 "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments ;; error in setup.cfg: command 'test' has no such option 'buffer' '(#:tests? #f)) @@ -1497,8 +1473,6 @@ software.") (base32 "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments '(#:tests? #f)) ; no setup.py test command (home-page @@ -1524,8 +1498,6 @@ matching them against a list of media-ranges.") (base32 "164a43k7k2wsqqk1s6vavcdamvss4mz0vd6pwzv2h9n8rgwzxgzi")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments '(#:tests? #f)) ; FIXME: test suite fails (home-page "http://readthedocs.org/docs/nose/") @@ -1550,8 +1522,6 @@ matching them against a list of media-ranges.") "1x4zjq1zlyrh8b9ba0cmafd3w94pxhid408kibyjd3s6h1lap6s7")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; 'module' object has no attribute 'collector' - (native-inputs - `(("python-setuptools" ,python-setuptools))) (inputs `(("python-cov-core" ,python-cov-core) ("python-pytest-cov" ,python-pytest-cov) @@ -1582,8 +1552,6 @@ interfaces and processes.") (base32 "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://pypi.python.org/pypi/unittest2") (synopsis "Python unit testing library") (description @@ -1604,8 +1572,6 @@ standard library.") (sha256 (base32 "0wbs4i4x3x7klr3v35ss6p9mcqz883i1xgcpkhvl7n2lyv6yhpda")))) - (inputs - `(("python2-setuptools" ,python2-setuptools))) (arguments `(#:python ,python-2 #:tests? #f)))) ; no setup.py test command @@ -1644,8 +1610,6 @@ standard library.") (base32 "0561gz2w3i825gyl42mcq14y3dcgkapfiv5zv9a2bz15qxiijl56")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://pylib.readthedocs.org/") (synopsis "Python library for parsing, I/O, instrospection, and logging") (description @@ -1979,8 +1943,6 @@ style tests.") (base32 "0cbj3plbllyz42c4b5xxgwaa7mml54lakslrn4kkhinxhdri22md")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://launchpad.net/testresources") (synopsis "Pyunit extension for managing test resources") @@ -2042,8 +2004,6 @@ protocol.") (base32 "0x9r2gwilcig5g54k60bxzg96zabizq1855lrprlb4zckalp9asc")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments '(#:tests? #f)) ; no setup.py test command (home-page "https://launchpad.net/python-fixtures") @@ -2145,7 +2105,6 @@ and sensible default behaviors into your setuptools run.") ("python-pbr-0.11" ,python-pbr-0.11))) (inputs `(("python-pip" ,python-pip) - ("python-setuptools" ,python-setuptools) ;; Tests ("python-testtools" ,python-testtools))) (arguments @@ -2203,8 +2162,6 @@ have failed since the last commit or what tests are currently failing.") (base32 "01rbr4br4lsk0lwn8fb96zwd2xr4f0mg1w7iq3j11i8f5ig2nqs1")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://nedbatchelder.com/code/coverage") (synopsis "Code coverage measurement for Python") (description @@ -2260,8 +2217,6 @@ It is useful for developing coverage plugins for these testing frameworks.") (base32 "0y8d0zwiqar51kxj8lzmkvwc3b8kazb04gk5zcb4nzg5k68zmhq5")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://pypi.python.org/pypi/discover/") (synopsis "Python test discovery for unittest") @@ -2312,8 +2267,6 @@ tests written in a natural language style, backed up by Python code.") (base32 "1b90jf6m9vxh9nanhpyvqdq7hmfx5iggw1l8kq10jrs6xgr49qkr")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments `(#:tests? #f)) ; no tests (home-page "https://github.com/ianare/exif-py") (synopsis "Python library to extract EXIF data from image files") @@ -2336,8 +2289,6 @@ files.") (base32 "0k881ffazpf8q1z8862g4bb3pzwpnz9whrci2mf311mvn1qbyqad")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments `(#:tests? #f)) ; no tests (home-page "http://github.com/digitalbazaar/pyld") (synopsis "Python implementation of the JSON-LD specification") @@ -2359,8 +2310,6 @@ files.") (base32 "06c9dcyv8ss050gkv5xjivbxhm6qm0s9vzy4r33wqabgv118lw7p")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments `(#:tests? #f)) ; no tests (home-page "http://python-requests.org/") (synopsis "Python CA certificate bundle") @@ -2395,8 +2344,6 @@ is used by the Requests library to verify HTTPS requests.") (("'locale'") (string-append "'" glibc "/bin/locale'")))) #t))))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://click.pocoo.org") (synopsis "Command line library for Python") (description @@ -2562,8 +2509,6 @@ version numbers.") (base32 "12hhblqy1ajvidm38im4171x4arg83pfmziyn53nizp29p3m14gi")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://pypi.python.org/pypi/Unidecode") (synopsis "ASCII transliterations of Unicode text") (description @@ -2684,8 +2629,6 @@ environments and back.") (build-system python-build-system) (inputs `(("libyaml" ,libyaml))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://pyyaml.org/wiki/PyYAML") (synopsis "YAML parser and emitter for Python") (description @@ -2748,8 +2691,6 @@ object.") (base32 "1hvip33wva3fnmvfp9x5klqri7hpl1hkgqmjbss18nmrb7zimv54")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://github.com/mitsuhiko/markupsafe") (synopsis "XML/HTML/XHTML markup safe string implementation for Python") (description @@ -2796,8 +2737,6 @@ written in pure Python.") (base32 "0nmqsfmiw4arjxqkmf9z66ml950pcdjk6aq4gin4sywmzdjw5fzp")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://defunkt.io/pystache/") (synopsis "Python logic-less template engine") (description @@ -2870,8 +2809,6 @@ logging and tracing of the execution.") (base32 "1ylnjnw1x4b2y7blr6x35ncdzn69k253kw4cdkv6asdb21w73ny7")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments '(#:tests? #f)) ; no setup.py test command (home-page "http://docutils.sourceforge.net/") @@ -2899,8 +2836,6 @@ reStructuredText.") (base32 "0lagrwifsgn0s8bzqahpr87p7gd38xja8f06akscinp6hj89283k")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://pygments.org/") (synopsis "Syntax highlighting") (description @@ -2959,8 +2894,6 @@ sources.") ;; before 1980' #:configure-flags '("--single-version-externally-managed" "--record=sphinx-rtd-theme.txt"))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (inputs `(("python-docutils" ,python-docutils) ("python-sphinx" ,python-sphinx))) @@ -3011,8 +2944,6 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") (base32 "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) ;; No "test" command supplied to setuptools, so unless there's another way ;; to run tests, we're skipping them! (arguments '(#:tests? #f)) @@ -3204,8 +3135,6 @@ mining and data analysis.") (propagated-inputs `(("python-click" ,python-click) ("python-redis" ,python-redis))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://python-rq.org/") (synopsis "Simple job queues for Python") (description @@ -3391,7 +3320,6 @@ association studies (GWAS) on extremely large data sets.") (outputs '("out" "doc")) (inputs `(("which" ,which) - ("python-setuptools" ,python-setuptools) ("python-matplotlib" ,python-matplotlib) ("python-sphinx" ,python-sphinx) ("python-pyparsing" ,python-pyparsing) @@ -4164,8 +4092,6 @@ SQLAlchemy Database Toolkit for Python.") (base32 "0lx15kcbby9zisx33p2h5hgakgwh2bvh0ibag8z0px4j6ifhs41x")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://launchpad.net/python-distutils-extra/") (synopsis "Enhancements to Python's distutils") (description @@ -4193,8 +4119,6 @@ Python's distutils.") (base32 "0y7vzff9xgbnaay7m0va1arl6g68ncwrvbgwl7jqlclsahzzb09d")))) (build-system python-build-system) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) (arguments ;; incompatible with Python 3 (exception syntax) `(#:python ,python-2 @@ -4234,9 +4158,7 @@ services for your Python modules and applications.") ("openjpeg" ,openjpeg) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) - (propagated-inputs - `(;; Used at runtime for pkg_resources - ("python-setuptools" ,python-setuptools))) + ;; Note: setuptools used at runtime for pkg_resources (arguments `(#:phases (modify-phases %standard-phases (add-before @@ -4382,8 +4304,6 @@ a front-end for C compilers or analysis tools.") (inputs `(("libxcb" ,libxcb) ("python-six" ,python-six))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-cffi" ,python-cffi))) ; used at run time (arguments @@ -4477,8 +4397,6 @@ PNG, PostScript, PDF, and SVG file output.") (base32 "1a5vwhflfd9sh3rfb40xlyipldgdzfff6brman57hqv3661jw0lh")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; no test target - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://pypi.python.org/pypi/decorator/") (synopsis "Python module to simplify usage of decorators") (description @@ -4540,8 +4458,6 @@ Python language binding specification.") `(("python-psutil" ,python-psutil) ("python-drmaa" ,python-drmaa) ("python-pyzmq" ,python-pyzmq))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/pygridtools/gridmap") (synopsis "Create jobs on a cluster directly from Python") (description @@ -4594,7 +4510,6 @@ child application and control it as if a human were typing commands.") (base32 "1gqr73i150yzj3mz32854vj93x07yr52kn8fdckwa41ll8wgficc")))) (build-system python-build-system) - (native-inputs `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/pypa/setuptools_scm/") (synopsis "Manage Python package versions in SCM metadata") (description @@ -4649,8 +4564,6 @@ common operations on files to be invoked on those path objects directly.") (build-system python-build-system) (propagated-inputs `(("python-pathpy" ,python-pathpy))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/vivainio/pickleshare") (synopsis "Tiny key value database with concurrency support") (description @@ -5002,8 +4915,6 @@ computing.") (base32 "0cafaiwixgpxwh9dsd28qb0dbzsj6xpxjdkyk30ns91ps10mq422")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://cheeseshop.python.org/pypi/isodate") (synopsis @@ -5030,8 +4941,6 @@ ISO 8601 dates, time and duration.") (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) ; required to "import html5lib" - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments `(#:test-target "check")) (home-page @@ -5085,7 +4994,6 @@ and written in Python.") (substitute* "urwid/tests/test_event_loops.py" (("test_remove_watch_file") "disable_remove_watch_file"))))))) - (native-inputs `(("python-setuptools" ,python-setuptools))) (home-page "http://urwid.org") (synopsis "Console user interface library for Python") (description @@ -5291,8 +5199,6 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.") (native-inputs `(("python2-mock" ,python2-mock) ; for the tests ("unzip" ,unzip))) ; for unpacking the source - (inputs - `(("python2-setuptools" ,python2-setuptools))) (arguments `(#:python ,python-2 ; Otherwise tests fail with a syntax error. #:tests? #f ; The tests apparently download an external URL. @@ -5318,8 +5224,6 @@ options.") (base32 "1xg6gbva1yswghiycmgincv6ab4bn7hpm720ndbj40h8xycmnfvi")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments ;; tests fail with message ;; AttributeError: 'module' object has no attribute 'tests' @@ -5352,8 +5256,6 @@ another XPath engine to find the matching elements in an XML or HTML document.") (base32 "1plw237a4zib4z8s62g0mrs8gm3kjfrp5sxh6bbk9nl3rdls2mln")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://bitbucket.org/al45tair/netifaces") (synopsis @@ -5406,7 +5308,6 @@ of the structure, dynamics, and functions of complex networks.") (sha256 (base32 "0fi4b63sj60hvi7rfydvmz2icl4wj74djw5sn2gl8hxd02qw4b91")))) (build-system python-build-system) - (inputs `(("python-setuptools" ,python-setuptools))) (home-page "https://bitbucket.org/johanneskoester/snakemake") (synopsis "Python-based execution environment for make-like workflows") (description @@ -5462,8 +5363,6 @@ and statistical routines from scipy and statsmodels.") (sha256 (base32 "19yp0gy4i7p4g6l3b8vaqkj9qj7yqb5kqy0qgbdagpzgkdz958yz")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://www.sympy.org/") (synopsis "Python library for symbolic mathematics") (description @@ -5517,8 +5416,6 @@ falling into the Python interpreter.") (sha256 (base32 "1mz26cxn4x8bbgv0rn0mvj2z05y31rkc8009nvdlb3lam5b4mj3y")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (native-inputs `(("unzip" ,unzip))) (arguments @@ -5556,8 +5453,6 @@ falling into the Python interpreter.") (arguments `(#:python ,python-2 ;Python 2 only #:tests? #f)) ;no tests - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://python-xlib.sourceforge.net/") (synopsis "Python X11 client library") (description @@ -5578,8 +5473,6 @@ It is written entirely in Python.") (base32 "171b7ip0hsq5qm83np40h3phlr36ym18w0lay0a8v08kvy3sy1jv")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (inputs `(("python-six" ,python-six))) (home-page @@ -5644,8 +5537,6 @@ connection to each user.") (base32 "19fh75lni9pb673n2fn505m1rckm0af0szcv5xx1qm1xpa940glb")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/cython/backports_abc") (synopsis "Backport of additions to the 'collections.abc' module") (description @@ -5734,8 +5625,6 @@ applications.") (base32 "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://pep8.readthedocs.org/") (synopsis "Python style guide checker") (description @@ -5758,8 +5647,6 @@ PEP 8.") (base32 "0qs2sgqszq7wcplis8509wk2ygqcrwzbs1ghfj3svvivq2j377pk")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/pyflakes/pyflakes") (synopsis "Passive checker of Python programs") @@ -6050,9 +5937,6 @@ term.js Javascript terminal emulator library.") "08ay3x4ijarwhl60gqx2i9jzq6pxs20p4snc2d1q5jagh4rn39lb")))) (build-system python-build-system) (arguments '(#:test-target "check")) - (propagated-inputs - ;; XXX: module not found if setuptools is not available. - `(("python-setuptools" ,python-setuptools))) (home-page "http://github.com/behdad/fonttools") (synopsis "Tools to manipulate font files") (description @@ -6082,8 +5966,6 @@ from an XML-based format.") (base32 "0g6n288l83sfwavxh1aryi0aqvsr3sp7v6f903mckwqa4scpky62")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (synopsis "Tool and library for manipulating LilyPond files") (description "This package provides a Python library to parse, manipulate or create documents in LilyPond format. A command line program ly is also @@ -6106,8 +5988,6 @@ provided that can be used to do various manipulations with LilyPond files.") (base32 "1iddva7v3fq0aqzsahkazxr7vpw28mqcrsy818z4wyiqnkplbhlg")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://github.com/ActiveState/appdirs") (synopsis "Determine platform-specific dirs, e.g. a \"user data dir\"") @@ -6207,8 +6087,6 @@ reading and writing MessagePack data.") "06dxjlbcicq7q3vqy8agq11ra01kvvd47j4mk6dmghjsyzyckxd1")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;; No tests. - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/drkjam/netaddr/") (synopsis "Pythonic manipulation of network addresses") (description @@ -6238,8 +6116,6 @@ and MAC network addresses.") ;; Tests are not included in the tarball, they are only available in the ;; git repository. `(#:tests? #f)) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/GrahamDumpleton/wrapt") (synopsis "Module for decorators, wrappers and monkey patching") (description @@ -6263,8 +6139,6 @@ and MAC network addresses.") (base32 "0c7gh3lsdjds262h0v1sqc66l7hqgfwbakn96qrhdbl0i3vm5yz8")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://bitbucket.org/micktwomey/pyiso8601") (synopsis "Module to parse ISO 8601 dates") (description @@ -6290,8 +6164,6 @@ and MAC network addresses.") (base32 "0yz0bcbwx8r2c01czzfpbrxddynxyk9k95jj8h6sgcb7xmfvl998")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/atdt/monotonic") (synopsis "Implementation of time.monotonic() for Python 2 & < 3.3") (description @@ -6371,8 +6243,6 @@ Unicode-aware. It is not intended as an end-user tool.") (base32 "0diwsicwmiq2cpzpxri7cyl5fmsvicafw6nfqf6p6p322dji2g45")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://code.google.com/p/prettytable/") (synopsis "Display tabular data in an ASCII table format") (description @@ -6476,8 +6346,6 @@ suitable for a wide range of protocols based on the ASN.1 specification.") (base32 "0drqgw81xd3fxdlg89kgd79zzrabvfncvkbybi2wr6w2y4s1jmhh")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-pyasn1" ,python-pyasn1))) (home-page "http://sourceforge.net/projects/pyasn1/") @@ -6560,8 +6428,6 @@ versions of Python.") (base32 "0frxgmgi234lr9hylg62j69j4ik5zhg0wz05w5dhyacbjfnrl68n")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/kjd/idna") (synopsis "Internationalized domain names in applications") (description @@ -6590,8 +6456,6 @@ specification.") (base32 "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/alex/pretend") (synopsis "Library for stubbing in Python") (description @@ -6616,8 +6480,6 @@ responses, rather than doing any computation.") (base32 "1bnd1bricyhxa27rhr0ljk0kacxzvysd3ar2j2hlv13a2k6zw4z5")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") (description @@ -6665,7 +6527,6 @@ responses, rather than doing any computation.") (native-inputs `(("python-cryptography-vectors" ,python-cryptography-vectors) ("python-hypothesis" ,python-hypothesis) - ("python-setuptools" ,python-setuptools) ("python-pretend" ,python-pretend) ("python-pyasn1" ,python-pyasn1) ("python-pyasn1-modules" ,python-pyasn1-modules) @@ -6711,8 +6572,6 @@ message digests and key derivation functions.") ("python-six" ,python-six))) (inputs `(("openssl" ,openssl))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/pyca/pyopenssl") (synopsis "Python wrapper module around the OpenSSL library") (description @@ -6923,8 +6782,6 @@ serve the same purpose: provide Python bindings for libmagic.") (build-system python-build-system) (inputs `(("python-six" ,python-six))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://packages.debian.org/sid/python-debian") (synopsis "Debian package related modules") (description @@ -6967,8 +6824,6 @@ Debian-related files, such as: ("python-jsonschema" ,python-jsonschema) ("python-jupyter-core" ,python-jupyter-core) ("python-traitlets" ,python-traitlets))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://jupyter.org") (synopsis "Jupyter Notebook format") (description "This package provides the reference implementation of the @@ -6992,7 +6847,6 @@ Jupyter Notebook format and Python APIs for working with notebooks.") (build-system python-build-system) (propagated-inputs `(("python-html5lib" ,python-html5lib-0.9) - ("python-setuptools" ,python-setuptools) ("python-six" ,python-six))) (native-inputs `(("python-nose" ,python-nose))) @@ -7067,7 +6921,6 @@ functions to find and load entry points.") ("python-mistune" ,python-mistune) ("python-nbformat" ,python-nbformat) ("python-pygments" ,python-pygments) - ("python-setuptools" ,python-setuptools) ("python-traitlets" ,python-traitlets))) (home-page "http://jupyter.org") (synopsis "Converting Jupyter Notebooks") @@ -7170,7 +7023,6 @@ notebooks.") (propagated-inputs `(("python-ipykernel" ,python-ipykernel) ("python-ipython" ,python-ipython) - ("python-setuptools" ,python-setuptools) ("python-traitlets" ,python-traitlets) ("python-widgetsnbextension" ,python-widgetsnbextension))) (home-page "http://ipython.org") @@ -7260,8 +7112,6 @@ simulation, statistical modeling, machine learning and much more.") (base32 "1ak87ikcw34fivcgiz2xvi938dmclh078az65l9x3rmgljrkhgp5")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/chardet/chardet") (synopsis "Universal encoding detector for Python 2 and 3") (description @@ -7320,8 +7170,6 @@ programatically with command-line parsers like @code{getopt} and (base32 "11p75zpfz3ffhz21nzx9wb23xs993ck5s6hkjcvhswwizni5jynw")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://pypi.python.org/pypi/zope.event") (synopsis "Event publishing system for Python") (description "Zope.event provides an event publishing API, intended for @@ -7469,8 +7317,6 @@ tests.") (base32 "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://pypi.python.org/pypi/zope.i18nmessageid") (synopsis "Message identifiers for internationalization") (description "Zope.i18nmessageid provides facilities for declaring @@ -7910,8 +7756,6 @@ tables.") (build-system python-build-system) (native-inputs `(("python-six" ,python-six))) ; for tests - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/liris/websocket-client") (synopsis "WebSocket client for Python") (description "The Websocket-client module provides the low level APIs for @@ -8250,8 +8094,6 @@ Blog, News or Announcements section to a Sphinx website.") (base32 "057qzi46h5dmxdqknsbrssn78lmqjlnm624iqdhrnpk26zcbi1d7")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/kennethreitz/args") (synopsis "Command-line argument parser") (description @@ -8297,8 +8139,6 @@ output, progress bar display, and pipes.") (base32 "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/berkerpeksag/astor") (synopsis "Read and write Python ASTs") (description @@ -8409,8 +8249,6 @@ authenticated session objects providing things like keep-alive.") (arguments `(#:python ,python-2 #:tests? #f)) ; no test target - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) (home-page "https://github.com/MiCHiLU/python-functools32") (synopsis "Backport of the functools module from Python 3.2.3") @@ -8432,8 +8270,6 @@ authenticated session objects providing things like keep-alive.") "1vcb34dqhzkhbq1957vdjszhhm5y3j9ba88dgwhqx2zynhmk9qig")))) (build-system python-build-system) (arguments `(#:python ,python-2)) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) (home-page "https://github.com/agronholm/pythonfutures") (synopsis "Backport of the concurrent.futures package from Python 3.2") @@ -8474,7 +8310,6 @@ concurrent.futures package from Python 3.2") (native-inputs `(("python2-futures" ,python2-futures) ("python2-pytest" ,python2-pytest) - ("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs promise)))))) (define-public python-urllib3 @@ -8525,8 +8360,6 @@ supports url redirection and retries, and also gzip and deflate decoding.") (base32 "1716z9pq1r5ys3nkg7wdrb3h2f9rmd0zdxpxzmx3bgwgf6xg48gb")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (synopsis "colored terminal text rendering for Python") (description "Colorama is a Python library for rendering colored terminal text.") @@ -8574,8 +8407,6 @@ library as well as on the command line.") (base32 "18qfzfm40bgx672lkg8q9x5hdh76n7vax99aank7vh2nw21wg70m")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (synopsis "Plugin and hook calling mechanism for Python") (description "Pluggy is an extraction of the plugin manager as used by Pytest but stripped of Pytest specific details.") @@ -8631,8 +8462,6 @@ servers.") (base32 "0g9xvl69y7nr3w7ag4fsp6sm4fqf6vrqjw7504x2hzrrsh3ampq8")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (synopsis "JSON Matching Expressions") (description "JMESPath (pronounced “james path”) is a Python library that allows one to declaratively specify how to extract elements from a JSON @@ -8660,7 +8489,6 @@ document.") ("python-docutils" ,python-docutils) ("python-mock" ,python-mock) ("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools) ("python-tox" ,python-tox) ("python-wheel" ,python-wheel) ("python-jmespath" ,python-jmespath))) @@ -8691,7 +8519,6 @@ interface to the Amazon Web Services (AWS) API.") ("python-mock" ,python-mock) ("python-nose" ,python-nose) ("python-rsa" ,python-rsa) - ("python-setuptools" ,python-setuptools) ("python-sphinx" ,python-sphinx) ("python-tox" ,python-tox) ("python-wheel" ,python-wheel) @@ -8745,9 +8572,6 @@ seamlessly into your existing Python unit testing work flow.") (base32 "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x")))) (build-system python-build-system) - (native-inputs - `(;; setuptools required for python-2 variant - ("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-pytest" ,python-pytest))) (synopsis "Set-up and tear-down fixtures for unit tests") @@ -8942,10 +8766,7 @@ and to spawn subprocesses to handle requests.") (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) - (propagated-inputs - ;; This package uses pkg_resources, part of setuptools, during runtime, - ;; hence why not a native-input. - `(("python-setuptools" ,python-setuptools))) + ;; Note: setuptools used at runtime for pkg_resources (home-page "http://pythonpaste.org/deploy/") (synopsis "Load, configure, and compose WSGI applications and servers") @@ -9864,8 +9685,6 @@ is made as zipfile like as possible.") port) (close-port port) #t)))))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (inputs ;; python-magic needs to be able to find libmagic.so. `(("file" ,file))) @@ -9900,8 +9719,6 @@ the same purpose: to provide Python bindings for libmagic.") ;; s3cmd is written for python2 only and contains no tests. `(#:python ,python-2 #:tests? #f)) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) (inputs `(("python2-dateutil" ,python2-dateutil) ;; The python-file package also provides a magic.py module. @@ -9996,8 +9813,6 @@ development version of CPython that are not available in older releases.") (strip-python2-variant python-bz2file)))) (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) (arguments `(#:python ,python-2 #:phases @@ -10054,7 +9869,6 @@ to support both Python 2 and Python 3 with minimal overhead.") (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) - ("python-setuptools" ,python-setuptools) ("python-sphinx" ,python-sphinx))) (inputs `(("pari-gp" ,pari-gp))) @@ -10116,7 +9930,6 @@ respectively.") " line += ' -L" pcre "/lib" " -L " libgc "/lib'"))) #t)))))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))) (inputs `(("pcre" ,pcre) ("libgc" ,libgc))) (home-page "https://shedskin.github.io/") @@ -10164,8 +9977,6 @@ to occurences in strings and comments.") (base32 "0i283z1pivmir61z8kbiycigc94l61v33ygzkhczf1ifq7cppyds")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/ultrabug/py3status") (synopsis "Extensible i3status wrapper written in Python") (description "py3status is an i3status wrapper which extends i3status @@ -10197,7 +10008,6 @@ own code, responding to click events and updating clock every second.") (zero? (system* "py.test" "-vv" "tests" "README.rst"))))))) (native-inputs `(("python-pytest" ,python-pytest) - ("python-setuptools" ,python-setuptools) ("python-six" ,python-six))) (home-page "https://github.com/ionelmc/python-tblib") (synopsis "Traceback serialization library") @@ -10261,8 +10071,6 @@ provides support for parsing, splitting and formatting SQL statements.") (base32 "04h0m54dyqg49vyarq26mry6kbivnpl47rnmmrk9qn8wpfxviybr")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://greenlet.readthedocs.io/") (synopsis "Lightweight in-process concurrent programming") (description @@ -10325,8 +10133,6 @@ to provide a high-level synchronous API on top of the libev event loop.") (base32 "0ydxrp9myw1mvsz3qfzx5579y5llmqa82pxvqchgp5syczffi450")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) (home-page "https://twistedmatrix.com/") @@ -10439,8 +10245,6 @@ data in Python.") "10pb864if9qi2pq9lfb9m8f7z7ss6rml80gf1d9h64lap5crjnjj")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; XXX: needs zookeeper - (native-inputs - `(("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-six" ,python-six))) (home-page "https://kazoo.readthedocs.org") @@ -10469,8 +10273,6 @@ programming errors.") "1id6sr159p6aa13bxcqyr9gln8sqg1l0ddzns5iws8kk5q1p5cfv")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; XXX: needs zookeeper, kafka, etc. - (native-inputs - `(("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-gevent" ,python-gevent) ("python-kazoo" ,python-kazoo) @@ -10532,8 +10334,6 @@ specified in POSIX.1-2001 and POSIX.1-2008.") (base32 "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z")))) (build-system python-build-system) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) (arguments `(#:tests? #f #:python ,python-2)) @@ -10557,8 +10357,6 @@ etc.") (base32 "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/agoragames/chai") (synopsis "Mocking framework for Python") (description @@ -10609,8 +10407,6 @@ datetime type.") (base32 "1jhnxgnw8y3mbzjssixh6qkc7a3afc4fygajhqrqalnilyvpzshq")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://github.com/jpvanhal/inflection") (synopsis "Python string transformation library") (description @@ -10633,8 +10429,6 @@ underscored string.") (base32 "1hz1x9blsbxya1y9nnhnwwdnqmakxi9mc0jkwj0rn6b1h44i0f86")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://github.com/toastdriven/pylev") (synopsis "Levenshtein distance implementation in Python") (description "Pure Python Levenshtein implementation, based off the @@ -10685,8 +10479,6 @@ docstring and colored output.") (base32 "0s22aqqkdscyh8sjspyyax7qa1aiz8p4midrnyf39717fhfczm6x")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/ionelmc/python-lazy-object-proxy") (synopsis "Lazy object proxy for python") (description @@ -10710,8 +10502,6 @@ until the object is actually required, and caches the result of said call.") "0jr4v2pd90i6l1xxbss2m05psbjaxvyvvvpq44wycijpfgjqln8i")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; XXX: requires internet access - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://www.dnspython.org") (synopsis "DNS toolkit for Python") (description @@ -10742,8 +10532,6 @@ It supports TSIG authenticated messages and EDNS0.") (substitute* "setup.py" (("dnspython3") "dnspython")) #t))))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-dnspython" ,python-dnspython) ("python-idna" ,python-idna))) @@ -10767,8 +10555,6 @@ It supports TSIG authenticated messages and EDNS0.") (base32 "1jwg9z4rz51mcka1821rwgycsd0mcicyp1kiwjfa2kvg8bm9p2qd")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/hamstah/ukpostcodeparser") (synopsis "UK Postcode parser for Python") (description @@ -10827,8 +10613,6 @@ addresses, and phone numbers.") (base32 "1f5m28vkh4ksq3d80d8mmd2z8wxvc3mgy2pmrv2751dm2xgznm4w")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-pyyaml" ,python-pyyaml))) (home-page "https://github.com/mk-fg/pretty-yaml") @@ -10852,8 +10636,6 @@ YAML-serialized data.") (base32 "0arc6njvs6i9v9hgvzk5m50296g7zy5m9d7pyb43vdsdgxrci5gy")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://flexmock.readthedocs.org") (synopsis "Testing library for Python") (description @@ -10876,8 +10658,6 @@ mocks, stubs and fakes.") "1li49irsqha17nrda4nsb48biyy0rarp9pphf0jpqwm5zr8hv569")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; no tests - (native-inputs - `(("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-arrow" ,python-arrow) ("python-blinker" ,python-blinker) @@ -11885,8 +11665,6 @@ with an associated set of resolve methods that know how to fetch data.") "01hwzjc1zshk4vvxrcghm398fpy4jls66dyz06g07mrwqif8878p")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; fails to import test modules - (native-inputs - `(("python-setuptools" ,python-setuptools))) (inputs `(("python-bcrypt" ,python-bcrypt) ("python-click" ,python-click) @@ -11980,7 +11758,6 @@ transfers.") (inherit base) (native-inputs `(("python2-futures" ,python2-futures) - ("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs base)))))) (define-public python-setproctitle @@ -12272,8 +12049,6 @@ PNG, JPEG, JPEG2000 and GIF files in pure Python.") `(;; Prevent creation of the egg. This works around ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 #:configure-flags '("--root=/"))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/tgalal/python-axolotl-curve25519") (synopsis "Python wrapper for curve25519 library") (description "This is a python wrapper for the curve25519 library @@ -12312,8 +12087,6 @@ python-axolotl.") ;; Prevent creation of the egg. This works around ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 #:configure-flags '("--root=/"))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-axolotl-curve25519" ,python-axolotl-curve25519) ("python-dateutil" ,python-dateutil) -- cgit v1.2.3 From 5d8549328483978bf04dd2c710ef6a06614d4776 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 13:18:19 +0200 Subject: gnu: Remove python-setuptools and python2-setuptools from inputs (part 1b) This patch contains the changes in all modules beside python.scm where removing setuptools from the inputs could be achieved by removing complete lines. * gnu/packages/admin.scm (graphios, thefuck): Remove all [inputs], [native-inputs] and [propagated-inputs] where python-setuptools or python2-setuptools are the sole entries. Remove python-setuptools and python2-setuptools listed on a line by its own from [inputs], [native-inputs] and [propagated-inputs]. * gnu/packages/backup.scm (rdiff-backup): Likewise. * gnu/packages/bioinformatics.scm (htseq, macs, python2-pbcore, rseqc, multiqc): Likewise. * gnu/packages/django.scm (python-django, python2-django, python-django-simple-math-captcha, python2-django-simple-math-captcha): Likewise. * gnu/packages/docker.scm (python-docker-py, docker-compose): Likewise. * gnu/packages/game-development.scm (python-pygame): Likewise. * gnu/packages/key-mon.scm (key-mon): Likewise. * gnu/packages/mail.scm (khard): Likewise. * gnu/packages/music.scm (beets, python2-pyechonest): Likewise. * gnu/packages/openstack.scm (python-bandit, python2-bandit, python-debtcollector, python2-debtcollector, python-mox3, python2-mox3, python-os-client-config, python2-os-client-config, python-oslo.config, python2-oslo.config, python-oslo.context, python2-oslo.context, python-oslo.i18n, python2-oslo.i18n, python-oslo.serialization, python2-oslo.serialization, python-oslosphinx, python2-oslosphinx, python-oslotest, python2-oslotest, python-oslo.utils, python2-oslo.utils, python-swiftclient, python2-swiftclient): Likewise. * gnu/packages/pdf.scm (pdfposter): Likewise. * gnu/packages/tls.scm (python-acme, python2-acme): Likewise. --- gnu/packages/admin.scm | 4 ---- gnu/packages/backup.scm | 2 -- gnu/packages/bioinformatics.scm | 8 -------- gnu/packages/django.scm | 6 ------ gnu/packages/docker.scm | 2 -- gnu/packages/game-development.scm | 2 -- gnu/packages/key-mon.scm | 2 -- gnu/packages/mail.scm | 2 -- gnu/packages/music.scm | 2 -- gnu/packages/openstack.scm | 12 ------------ gnu/packages/pdf.scm | 2 -- gnu/packages/tls.scm | 1 - 12 files changed, 45 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5adde6cc4a..b0edc69cad 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1332,8 +1332,6 @@ specified directories.") (("/usr") out) (("distro_ver = .*") "distro_ver = ''")) #t)))))) - (inputs - `(("python-setuptools" ,python2-setuptools))) (home-page "https://github.com/shawn-sterling/graphios") (synopsis "Emit Nagios metrics to Graphite, Statsd, and Librato") (description @@ -1699,8 +1697,6 @@ throughput (in the same interval).") (base32 "04q2cn8c83f6z6wn1scla1ilrpi5ssjc64987hvmwfvwvb82bvkp")))) (build-system python-build-system) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (inputs `(("python-colorama" ,python-colorama) ("python-decorator" ,python-decorator) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 203ff4c9dc..5b1706ea12 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -339,8 +339,6 @@ errors.") (base32 "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d")))) (build-system python-build-system) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) (inputs `(("python" ,python-2) ("librsync" ,librsync))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5444f0a2a1..8377e811db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2814,8 +2814,6 @@ HMMs).") `(("python-numpy" ,python2-numpy))) (inputs `(("python-pysam" ,python2-pysam))) - (native-inputs - `(("python-setuptools" ,python2-setuptools))) (home-page "http://www-huber.embl.de/users/anders/HTSeq/") (synopsis "Analysing high-throughput sequencing data with Python") (description @@ -3094,8 +3092,6 @@ data.") #:tests? #f)) ; no test target (inputs `(("python-numpy" ,python2-numpy))) - (native-inputs - `(("python-setuptools" ,python2-setuptools))) (home-page "http://github.com/taoliu/MACS/") (synopsis "Model based analysis for ChIP-Seq data") (description @@ -3521,7 +3517,6 @@ interrupted by stop codons. OrfM finds and prints these ORFs.") (native-inputs `(("python-docutils" ,python2-docutils) ("python-nose" ,python2-nose) - ("python-setuptools" ,python2-setuptools) ("python-sphinx" ,python2-sphinx))) (propagated-inputs `(("python-pyxb" ,python2-pyxb))) @@ -4028,7 +4023,6 @@ BAM and Wiggle files in both transcript-coordinate and genomic-coordinate.") `(("python-cython" ,python2-cython) ("python-pysam" ,python2-pysam) ("python-numpy" ,python2-numpy) - ("python-setuptools" ,python2-setuptools) ("zlib" ,zlib))) (native-inputs `(("python-nose" ,python2-nose))) @@ -7696,8 +7690,6 @@ replacement for strverscmp.") ("python-click" ,python-click) ("python-matplotlib" ,python-matplotlib) ("python-numpy" ,python-numpy))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "http://multiqc.info") (synopsis "Aggregate bioinformatics analysis reports") (description diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index f56ed58363..1ab2094dce 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -54,10 +54,6 @@ (string-append ".:" (getenv "PYTHONPATH"))) (zero? (system* "python" "tests/runtests.py"))))))) ;; TODO: Install extras/django_bash_completion. - (propagated-inputs - ;; Django uses 'pkg_resources' (part of setuptools) to locate templates - ;; at run-time. - `(("python-setuptools" ,python-setuptools))) (native-inputs `(("tzdata", tzdata) ;; bcrypt and argon2-cffi are extra requirements not yet in guix @@ -112,8 +108,6 @@ to the @dfn{don't repeat yourself} (DRY) principle.") (build-system python-build-system) (propagated-inputs `(("python-django" ,python-django))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/alsoicode/django-simple-math-captcha") (synopsis "Easy-to-use math field/widget captcha for Django forms") (description diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 0760001da7..3cfdb7ef55 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -42,7 +42,6 @@ (arguments '(#:tests? #f)) (inputs `(("python-requests" ,python-requests) - ("python-setuptools" ,python-setuptools) ("python-six" ,python-six) ("python-websocket-client" ,python-websocket-client))) (home-page "https://github.com/docker/docker-py/") @@ -93,7 +92,6 @@ client.") ("python-jsonschema" ,python-jsonschema) ("python-pyyaml" ,python-pyyaml) ("python-requests" ,python-requests-2.7) - ("python-setuptools" ,python-setuptools) ("python-six" ,python-six) ("python-texttable" ,python-texttable) ("python-websocket-client" ,python-websocket-client))) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 76c06ecc72..e83294d9c4 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -591,8 +591,6 @@ interface (API).") (string-append v4l-ref "/include/libv4l1-videodev.h") "linux/videodev.h") (system* "ln" "--symbolic" "Setup.in" "Setup"))))))) - (native-inputs - `(("python-setuptools" ,python-setuptools))) (inputs `(("sdl" ,sdl) ("sdl-image" ,sdl-image) diff --git a/gnu/packages/key-mon.scm b/gnu/packages/key-mon.scm index c76360ce08..6237a1765a 100644 --- a/gnu/packages/key-mon.scm +++ b/gnu/packages/key-mon.scm @@ -42,8 +42,6 @@ (arguments `(#:python ,python-2 ;uses the Python 2 'print' syntax #:tests? #f)) ;no tests - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) (inputs `(("python2-xlib" ,python2-xlib) ("python2-pygtk" ,python2-pygtk) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a485c1f5c3..a152d50c36 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1367,8 +1367,6 @@ maintained.") (let* ((out (assoc-ref outputs "out")) (doc (string-append out "/share/doc/khard"))) (copy-recursively "misc/khard" doc))))))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) (propagated-inputs `(("python2-vobject" ,python2-vobject) ("python2-pyyaml" ,python2-pyyaml) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index abcc498599..d25c9c419a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1787,7 +1787,6 @@ MusicBrainz database.") `(;; Python 3 is not supported: ;; https://github.com/echonest/pyechonest/issues/42 #:python ,python-2)) - (native-inputs `(("python2-setuptools" ,python2-setuptools))) (home-page "https://github.com/echonest/pyechonest") (synopsis "Python interface to The Echo Nest APIs") (description "Pyechonest is a Python library for the Echo Nest API. With @@ -1863,7 +1862,6 @@ websites such as Libre.fm.") (native-inputs `(("python2-beautifulsoup4" ,python2-beautifulsoup4) ("python2-flask" ,python2-flask) - ("python2-setuptools" ,python2-setuptools) ("python2-mock" ,python2-mock) ("python2-mpd2" ,python2-mpd2) ("python2-nose" ,python2-nose) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 43a6490b22..e216ed06f0 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -51,7 +51,6 @@ ("python-stevedore" ,python-stevedore))) (inputs `(("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools) ;; Tests ("python-fixtures" ,python-fixtures) ("python-mock" ,python-mock) @@ -88,7 +87,6 @@ all the files it generates a report.") (inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools) ;; Tests. ("python-oslotest" ,python-oslotest))) (home-page "http://www.openstack.org/") @@ -152,7 +150,6 @@ guidelines}.") (native-inputs `(("python-fixtures" ,python-fixtures) ("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools) ("python-six" ,python-six) ("python-testtools" ,python-testtools))) (home-page "http://www.openstack.org/") @@ -188,7 +185,6 @@ tested on Python version 3.2, 2.7 and 2.6.") ("python-pbr" ,python-pbr) ("python-pyyaml" ,python-pyyaml) ("python-testrepository" ,python-testrepository) - ("python-setuptools" ,python-setuptools) ("python-testscenarios" ,python-testscenarios) ("python-testtools" ,python-testtools))) (home-page "http://www.openstack.org/") @@ -384,7 +380,6 @@ common features used in Tempest.") ("python-stevedore" ,python-stevedore))) (inputs `(("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools) ;; Tests ("python-oslo.i18n" ,python-oslo.i18n) ("python-mock" ,python-mock) @@ -415,7 +410,6 @@ common features used in Tempest.") (inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools) ;; Tests. ("python-oslotest" ,python-oslotest))) (home-page "http://launchpad.net/oslo") @@ -446,7 +440,6 @@ pipeline and used by various modules such as logging.") ("python-six" ,python-six))) (inputs `(("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools) ;; Tests ("python-mock" ,python-mock) ("python-mox3" ,python-mox3) @@ -526,7 +519,6 @@ handlers and support for context specific logging (like resource id’s etc).") (inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools) ;; Tests. ("python-mock" ,python-mock) ("python-oslo.i18n" ,python-oslo.i18n) @@ -559,7 +551,6 @@ in transmittable and storable formats, such as JSON and MessagePack.") `(("python-pbr" ,python-pbr) ("python-docutils" ,python-docutils) ("python-hacking" ,python-hacking) - ("python-setuptools" ,python-setuptools) ("python-sphinx" ,python-sphinx))) (home-page "http://www.openstack.org/") (synopsis "OpenStack sphinx extensions and theme") @@ -594,7 +585,6 @@ from the OpenStack project.") (inputs `(("python-pbr" ,python-pbr) ("python-os-client-config" ,python-os-client-config) - ("python-setuptools" ,python-setuptools) ("python-subunit" ,python-subunit) ("python-testrepository" ,python-testrepository) ("python-testscenarios" ,python-testscenarios) @@ -638,7 +628,6 @@ and better support for mocking results.") (inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools) ;; Tests. ("python-oslotest" ,python-oslotest) ("python-mock" ,python-mock) @@ -744,7 +733,6 @@ LDAP.") (build-system python-build-system) (native-inputs `(("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools) ("python-sphinx" ,python-sphinx) ;; The folloing packages are needed for the tests. ("python-coverage" ,python-coverage) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 9c6e9a967e..171f1990f7 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -874,8 +874,6 @@ python-pypdf2 instead.") (inputs ;; pdfposter 0.6.0 still uses the old pyPdf `(("python2-pypdf" ,python2-pypdf))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))) (home-page "https://pythonhosted.org/pdftools.pdfposter/") (synopsis "Scale and tile PDF images/pages to print on multiple pages") (description "@command{pdfposter} can be used to create a large poster by diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 74cc25bb67..608fd6a080 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -462,7 +462,6 @@ security, and applying best practice development processes.") ("python-sphinx" ,python-sphinx) ("python-sphinxcontrib-programoutput" ,python-sphinxcontrib-programoutput) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) - ("python-setuptools" ,python-setuptools) ("texinfo" ,texinfo))) (propagated-inputs `(("python-ndg-httpsclient" ,python-ndg-httpsclient) -- cgit v1.2.3 From f3b98f4fec43c951a9e28c67561395992bf190a7 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 13:30:54 +0200 Subject: gnu: Remove python-setuptools and python2-setuptools from inputs (part 2) This patch contains the changes where removing setuptools from the inputs affected some code-lines beside. * gnu/packages/admin.scm (ansible): Remove all [inputs], [native-inputs] and [propagated-inputs] where python-setuptools or python2-setuptools are the sole entries. Remove python-setuptools and python2-setuptools listed on a line by its own from [inputs], [native-inputs] and [propagated-inputs]. * gnu/packages/backup.scm (duplicity): Likewise. * gnu/packages/bioinformatics.scm (bamm, python2-pybedtools, python2-bx-python, python2-dendropy, python-pysam, python2-pysam, clipper, crossmap, cutadapt, deeptools, grit, idr, python2-warpedlmm, pbtranscript-tofu, seqmagick): Likewise. * gnu/packages/docbook.scm (dblatex): Likewise. * gnu/packages/freedesktop.scm (python-pyxdg, python2-pyxdg): Likewise. * gnu/packages/lirc.scm (python2-lirc): Likewise. * gnu/packages/mp3.scm (eyed3): Likewise. * gnu/packages/nutrition.scm (gourmet): Likewise. * gnu/packages/openstack.scm (python-hacking, python2-hacking, python-os-testr, python2-os-testr, python-stevedore, python2-stevedore, python-tempest-lib, python2-tempest-lib, python-oslo.log, python2-oslo.log, python-keystoneclient, python2-keystoneclient): Likewise. * gnu/packages/password-utils.scm (assword): Likewise. * gnu/packages/python.scm (python-passlib, python2-passlib, python-babel, python2-babel, python-parse-type, python-pytest, python2-pytest, python-scripttest, python2-scripttest, python-testtools, python2-testtools, python-testscenarios, python2-testscenarios, python-subunit, python2-subunit, python-pbr-0.11, python-pbr, python2-pbr, python-testrepository, python2-testrepository, behave, python-wheel, python2-wheel, python-requests, python2-requests, python-jsonschema, python2-jsonschema, python-pyjwt, python2-pyjwt, python-virtualenv, python2-virtualenv, python-jinja2, python2-jinja2, python-joblib, python2-joblib, python-sphinx, python2-sphinx, python-feedgenerator, python2-feedgenerator, python-scikit-image, python2-scikit-image, python-redis, python2-redis, python2-fastlmm, python-numpydoc, python2-numpydoc, python-matplotlib, python2-matplotlib, python2-pysnptools, python-rpy2, python2-rpy2, python-pillow, python2-pillow, python-pycparser, python2-pycparser, python-cffi, python2-cffi, python-cairocffi, python2-cairocffi, python-drmaa, python2-drmaa, python-pathpy, python2-pathpy, python-simplegeneric, python2-simplegeneric, python-ipython, python2-ipython, python-apsw, python2-apsw, python-lxml, python2-lxml, python-networkx, python2-networkx, python-pyzmq, python2-pyzmq, python-mccabe, python2-mccabe, python-mccabe-0.2.1, python-flake8, python2-flake8, python-flake8-2.2.4, python-mistune, python2-mistune, python-ptyprocess, python2-ptyprocess, python-llfuse, python2-llfuse, python-webob, python2-webob, python-xlrd, python2-xlrd, python-tables, python2-tables, python-pip, python2-pip, python-libarchive-c, python2-libarchive-c, python-docopt, python2-docopt, python-pyrfc3339, python2-pyrfc3339, python-configobj, python2-configobj, python-clint, python2-clint, python-rply, python2-rply, python2-rpython, python-widgetsnbextension, python2-widgetsnbextension jupyter, python-jupyter-console, python2-jupyter-console, python-hy, python2-hy, python-urllib3, python2-urllib3, python-rsa, python2-rsa, python-tox, python2-tox, python2-hypothesis, python-paste, python2-paste, python-pastescript, python2-pastescript, python2-unicodecsv, python-pkgconfig, python2-pkgconfig, python2-rope, python-sqlparse, python2-sqlparse, python-gevent, python2-gevent, python-tabulate, python2-tabulate, python-arrow, python2-arrow, python-cleo, python2-cleo, python-fake-factory, python2-fake-factory, ptpython): Likewise. * gnu/packages/rdf.scm (python-rdflib, python2-rdflib): Likewise. * gnu/packages/terminals.scm (asciinema): Likewise. * gnu/packages/version-control.scm (git-annex-remote-hubic): Likewise. * gnu/packages/xdisorg.scm (arandr): Likewise. --- gnu/packages/admin.scm | 3 +- gnu/packages/backup.scm | 3 +- gnu/packages/bioinformatics.scm | 49 +++----- gnu/packages/docbook.scm | 3 +- gnu/packages/freedesktop.scm | 3 +- gnu/packages/lirc.scm | 3 +- gnu/packages/mp3.scm | 3 +- gnu/packages/nutrition.scm | 6 +- gnu/packages/openstack.scm | 18 +-- gnu/packages/password-utils.scm | 3 +- gnu/packages/python.scm | 243 +++++++++++++-------------------------- gnu/packages/rdf.scm | 3 +- gnu/packages/terminals.scm | 3 +- gnu/packages/version-control.scm | 3 +- gnu/packages/xdisorg.scm | 3 +- 15 files changed, 116 insertions(+), 233 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b0edc69cad..ee07b3be8a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1354,8 +1354,7 @@ of supported upstream metrics systems simultaneously.") "1bfc2xiplpad6f2nwi48y0kps7xqnsll85dlz63cy8k5bysl6d20")))) (build-system python-build-system) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ("python2-pycrypto" ,python2-pycrypto) + `(("python2-pycrypto" ,python2-pycrypto) ("python2-httplib2" ,python2-httplib2) ("python2-passlib" ,python2-passlib) ("python2-nose" ,python2-nose) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 5b1706ea12..94b2e82242 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -66,8 +66,7 @@ "duplicity-test_selection-tmp.patch")))) (build-system python-build-system) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ("util-linux" ,util-linux))) ;setsid command, for the tests + `(("util-linux" ,util-linux))) ;setsid command, for the tests (inputs `(("python" ,python-2) ("librsync" ,librsync) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8377e811db..e90281fb5f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -215,8 +215,7 @@ structure of the predicted RNA.") ("libtool" ,libtool) ("zlib" ,zlib) ("python-nose" ,python2-nose) - ("python-pysam" ,python2-pysam) - ("python-setuptools" ,python2-setuptools))) + ("python-pysam" ,python2-pysam))) (inputs `(("htslib" ,htslib) ("samtools" ,samtools) @@ -530,8 +529,7 @@ intended to behave exactly the same as the original BWK awk.") ("samtools" ,samtools))) (native-inputs `(("python-pyyaml" ,python2-pyyaml) - ("python-nose" ,python2-nose) - ("python-setuptools" ,python2-setuptools))) + ("python-nose" ,python2-nose))) (home-page "https://pythonhosted.org/pybedtools/") (synopsis "Python wrapper for BEDtools programs") (description @@ -1342,8 +1340,7 @@ well as many of the command line options.") `(("python-numpy" ,python2-numpy) ("zlib" ,zlib))) (native-inputs - `(("python-nose" ,python2-nose) - ("python-setuptools" ,python2-setuptools))) + `(("python-nose" ,python2-nose))) (home-page "http://bitbucket.org/james_taylor/bx-python/") (synopsis "Tools for manipulating biological data") (description @@ -1407,7 +1404,6 @@ multiple sequence alignments.") ("zlib" ,zlib))) (native-inputs `(("python-cython" ,python-cython) - ("python-setuptools" ,python-setuptools) ;; Dependencies below are are for tests only. ("samtools" ,samtools) ("bcftools" ,bcftools) @@ -1583,9 +1579,8 @@ databases.") ("python-numpy" ,python2-numpy) ("python-scipy" ,python2-scipy))) (native-inputs - `(("python-mock" ,python2-mock) ; for tests - ("python-pytz" ,python2-pytz) ; for tests - ("python-setuptools" ,python2-setuptools))) + `(("python-mock" ,python2-mock) ; for tests + ("python-pytz" ,python2-pytz))) ; for tests (home-page "https://github.com/YeoLab/clipper") (synopsis "CLIP peak enrichment recognition") (description @@ -1758,8 +1753,7 @@ time.") ("zlib" ,zlib))) (native-inputs `(("python-cython" ,python2-cython) - ("python-nose" ,python2-nose) - ("python-setuptools" ,python2-setuptools))) + ("python-nose" ,python2-nose))) (home-page "http://crossmap.sourceforge.net/") (synopsis "Convert genome coordinates between assemblies") (description @@ -1857,8 +1851,7 @@ preparation protocols.") (alist-delete 'check %standard-phases)))) (native-inputs `(("python-cython" ,python-cython) - ("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools))) + ("python-nose" ,python-nose))) (home-page "https://code.google.com/p/cutadapt/") (synopsis "Remove adapter sequences from nucleotide sequencing reads") (description @@ -2000,8 +1993,7 @@ trees (phylogenies) and characters.") ;; There is currently a test failure that only happens on some ;; systems, and only using "setup.py test" (lambda _ (zero? (system* "nosetests"))))))) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-nose" ,python2-nose) + (native-inputs `(("python2-nose" ,python2-nose) ,@(package-native-inputs base)))))) @@ -2029,9 +2021,8 @@ trees (phylogenies) and characters.") ("python-pysam" ,python2-pysam) ("python-pybigwig" ,python2-pybigwig))) (native-inputs - `(("python-mock" ,python2-mock) ;for tests - ("python-pytz" ,python2-pytz) ;for tests - ("python-setuptools" ,python2-setuptools))) + `(("python-mock" ,python2-mock) ;for tests + ("python-pytz" ,python2-pytz))) ;for tests (home-page "https://github.com/fidelram/deepTools") (synopsis "Tools for normalizing and visualizing deep-sequencing data") (description @@ -2687,8 +2678,7 @@ comment or quality sections.") ("python-pysam" ,python2-pysam) ("python-networkx" ,python2-networkx))) (native-inputs - `(("python-cython" ,python2-cython) - ("python-setuptools" ,python2-setuptools))) + `(("python-cython" ,python2-cython))) (home-page "http://grit-bio.org") (synopsis "Tool for integrative analysis of RNA-seq type assays") (description @@ -2934,8 +2924,7 @@ data. It also provides the bgzip, htsfile, and tabix utilities.") ("python-numpy" ,python-numpy) ("python-matplotlib" ,python-matplotlib))) (native-inputs - `(("python-cython" ,python-cython) - ("python-setuptools" ,python-setuptools))) + `(("python-cython" ,python-cython))) (home-page "https://github.com/nboley/idr") (synopsis "Tool to measure the irreproducible discovery rate (IDR)") (description @@ -3423,9 +3412,8 @@ linker_so='gcc -shared'); defines"))))) ("python-scipy" ,python2-scipy) ("python-matplotlib" ,python2-matplotlib))) (native-inputs - `(("python-mock" ,python2-mock) ;for tests - ("python-pytz" ,python2-pytz) ;for tests - ("python-setuptools" ,python2-setuptools))) + `(("python-mock" ,python2-mock) ;for tests + ("python-pytz" ,python2-pytz))) ;for tests (home-page "http://genes.mit.edu/burgelab/miso/index.html") (synopsis "Mixture of Isoforms model for RNA-Seq isoform quantitation") (description @@ -3562,8 +3550,7 @@ files and writing bioinformatics applications.") ("python-pandas" ,python2-pandas) ("python-pysnptools" ,python2-pysnptools))) (native-inputs - `(("python-setuptools" ,python2-setuptools) - ("python-mock" ,python2-mock) + `(("python-mock" ,python2-mock) ("python-nose" ,python2-nose) ("unzip" ,unzip))) (home-page "https://github.com/PMBio/warpedLMM") @@ -3625,8 +3612,7 @@ the phenotype as it models the data.") ("python-h5py" ,python2-h5py))) (native-inputs `(("python-cython" ,python2-cython) - ("python-nose" ,python2-nose) - ("python-setuptools" ,python2-setuptools))) + ("python-nose" ,python2-nose))) (home-page "https://github.com/PacificBiosciences/cDNA_primer") (synopsis "Analyze transcriptome data generated with the Iso-Seq protocol") (description @@ -4750,8 +4736,7 @@ bioinformatics file formats, sequence alignment, and more.") ;; should be removed. `(("python-biopython" ,python2-biopython-1.66))) (native-inputs - `(("python-setuptools" ,python2-setuptools) - ("python-nose" ,python2-nose))) + `(("python-nose" ,python2-nose))) (home-page "http://github.com/fhcrc/seqmagick") (synopsis "Tools for converting and modifying sequence files") (description diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 3d18d459bd..8efe417054 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -185,8 +185,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (build-system python-build-system) ;; TODO: Add xfig/transfig for fig2dev utility (inputs - `(("python-setuptools" ,python-setuptools) - ("texlive" ,texlive) + `(("texlive" ,texlive) ("imagemagick" ,imagemagick) ;for convert ("inkscape" ,inkscape) ;for svg conversion ("docbook" ,docbook-xml) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 456d569063..6408c41894 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -256,8 +256,7 @@ of a the system to know what users are logged in, and where.") (native-inputs `(("shared-mime-info" ,shared-mime-info) ;for tests ("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests - ("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools))) + ("python-nose" ,python-nose))) (home-page "http://freedesktop.org/wiki/Software/pyxdg") (synopsis "Implementations of freedesktop.org standards in Python") (description diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm index b8fbeb61ba..d4c2d18ccc 100644 --- a/gnu/packages/lirc.scm +++ b/gnu/packages/lirc.scm @@ -134,5 +134,4 @@ on just one button press.") (lambda _ (zero? (system* "make" "py2"))))))) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ("python2-cython" ,python2-cython)))))) + `(("python2-cython" ,python2-cython)))))) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index ceef896a13..201f9c46f6 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -472,8 +472,7 @@ compression format (.mpc files).") (arguments `(#:python ,python-2)) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ("python2-nose" ,python2-nose) + `(("python2-nose" ,python2-nose) ("python2-sphinx" ,python2-sphinx) ("python2-coverage" ,python2-coverage))) (synopsis "MP3 tag ID3 metadata editor") diff --git a/gnu/packages/nutrition.scm b/gnu/packages/nutrition.scm index 636379806c..9e0430b20a 100644 --- a/gnu/packages/nutrition.scm +++ b/gnu/packages/nutrition.scm @@ -52,11 +52,7 @@ `(("pygtk" ,python2-pygtk) ("sqlalchemy" ,python2-sqlalchemy) ("python-pillow" ,python2-pillow) - ("elib.intl" ,python2-elib.intl) - ;; XXX: This really isn't an input for gourmet but of pillow. Making - ;; it a propagated input in pillow doesn't seem to get its site path - ;; into gourmet's wrapper's PYTHONPATH however... - ("python-setuptools" ,python2-setuptools))) + ("elib.intl" ,python2-elib.intl))) (arguments `(#:python ,python-2 ;exception and print syntax #:tests? #f)) ;tests look bitrotted diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index e216ed06f0..930ce9eceb 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -121,8 +121,7 @@ manner.") ("python-pyflakes-0.8.1" ,python-pyflakes-0.8.1) ("python-six" ,python-six))) (inputs - `(("python-setuptools" ,python-setuptools) - ;; Tests + `(;; Tests ("python-testscenarios" ,python-testscenarios))) (home-page "http://github.com/openstack-dev/hacking") (synopsis "OpenStack hacking guideline enforcement") @@ -221,8 +220,7 @@ tested on Python version 3.2, 2.7 and 2.6.") ("python-subunit" ,python-subunit) ("python-testtools" ,python-testtools))) (inputs - `(("python-babel" ,python-babel) - ("python-setuptools" ,python-setuptools))) + `(("python-babel" ,python-babel))) (home-page "https://www.openstack.org/") (synopsis "Testr wrapper to provide functionality for OpenStack projects") (description @@ -291,8 +289,7 @@ portions of your testing code.") (inputs `(("python-pbr" ,python-pbr))) (native-inputs - `(("python-setuptools" ,python-setuptools) - ;; Tests + `(;; Tests ("python-docutils" ,python-docutils) ("python-mock" ,python-mock) ("python-oslotest" ,python-oslotest) @@ -346,8 +343,7 @@ extensions.") `(("python-babel" ,python-babel) ("python-mock" ,python-mock) ("python-os-testr" ,python-os-testr) - ("python-oslotest" ,python-oslotest) - ("python-setuptools" ,python-setuptools))) + ("python-oslotest" ,python-oslotest))) (home-page "https://www.openstack.org/") (synopsis "OpenStack functional testing library") (description @@ -484,8 +480,7 @@ in an application or library.") ("python-iso8601" ,python-iso8601) ("python-mock" ,python-mock) ("python-oslotest" ,python-oslotest) - ("python-pbr" ,python-pbr) - ("python-setuptools" ,python-setuptools))) + ("python-pbr" ,python-pbr))) (home-page "http://launchpad.net/oslo") (synopsis "Python logging library of the Oslo project") (description @@ -657,8 +652,7 @@ handling.") "1w4csvkah67rfpxylxnvs2s3594i0f9isy8pf4gnsqs5zirvjaa4")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-sphinx" ,python-sphinx) + `(("python-sphinx" ,python-sphinx) ;; and some packages for the tests ("openssl" ,openssl) ("python-coverage" ,python-coverage) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 55c14762e9..d6bc00c8f2 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -250,8 +250,7 @@ random passwords that pass the checks.") (native-inputs `(("help2man" ,help2man))) (inputs - `(("python-setuptools" ,python2-setuptools) - ("python2-xdo" ,python2-xdo) + `(("python2-xdo" ,python2-xdo) ("python2-pygpgme" ,python2-pygpgme) ("python2-pygtk" ,python2-pygtk))) (propagated-inputs diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4afe3f4c12..2f999b1b0f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -463,8 +463,7 @@ pidof, tty, taskset, pmap.") "1z27wdxs5rj5xhhqfzvzn3yg682irkxw6dcs5jj7mcf97psk8gd8")))) (build-system python-build-system) (native-inputs - `(("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools))) + `(("python-nose" ,python-nose))) (inputs `(("python-py-bcrypt" ,python-py-bcrypt))) (arguments @@ -667,8 +666,7 @@ using Python 2.4 or higher and provides access to the Olson timezone database.") "0k43pi0p1dwpds2w0km3fw92wixzxv2vw7p09capxmjz5cfh23lw")))) (build-system python-build-system) (inputs - `(("python-pytz" ,python-pytz) - ("python-setuptools" ,python-setuptools))) + `(("python-pytz" ,python-pytz))) (arguments `(#:tests? #f)) ; no test target (home-page "http://babel.pocoo.org/") (synopsis @@ -1371,8 +1369,7 @@ backported for previous versions of Python from 2.4 to 3.3.") "0iv1c34npr4iynwpgv1vkjx9rjd18a85ir8c01gc5f7wp8iv7l1x")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-six" ,python-six) + `(("python-six" ,python-six) ("python-parse" ,python-parse))) (arguments '(#:tests? #f)) ;TODO: tests require pytest (home-page "https://github.com/jenisys/parse_type") @@ -1641,8 +1638,7 @@ code introspection, and logging.") "@pytest.mark.xfail\n def test_remove_dir_prefix(self):"))))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-py" ,python-py) + `(("python-py" ,python-py) ("python-nose" ,python-nose) ("python-mock" ,python-mock))) (home-page "http://pytest.org") @@ -1858,8 +1854,7 @@ result back.") "0f4w84k8ck82syys7yg9maz93mqzc8p5ymis941x034v44jzq74m")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest))) (home-page "http://pythonpaste.org/scripttest/") (synopsis "Python library to test command-line scripts") (description "Scripttest is a Python helper library for testing @@ -1887,8 +1882,7 @@ subprocess and see the output as well as any file modifications.") (propagated-inputs `(("python-mimeparse" ,python-mimeparse))) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-extras" ,python-extras))) + `(("python-extras" ,python-extras))) (home-page "https://github.com/testing-cabal/testtools") (synopsis "Extensions to the Python standard library unit testing framework") @@ -1916,8 +1910,7 @@ compatibility.") "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-testtools" ,python-testtools) + `(("python-testtools" ,python-testtools) ("python-mimeparse" ,python-mimeparse))) (home-page "https://launchpad.net/testscenarios") (synopsis "Pyunit extension for dependency injection") @@ -1969,8 +1962,7 @@ use of resources by test cases.") "1nkw9wfbvizmpajbj3in8ns07g7lwkiv8hip14jjlwk3cacls6jv")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-testtools" ,python-testtools) + `(("python-testtools" ,python-testtools) ("python-mimeparse" ,python-mimeparse) ("python-testscenarios" ,python-testscenarios))) (home-page "http://launchpad.net/subunit") @@ -2033,9 +2025,7 @@ Python tests.") (arguments `(#:tests? #f)) ;; Most tests seem to use the Internet. (inputs - `(("python-fixtures-0.3.16" ,python-fixtures-0.3.16) - ("python-pip" ,python-pip) - ("python-setuptools" ,python-setuptools))) + `(("python-fixtures-0.3.16" ,python-fixtures-0.3.16))) (home-page "https://launchpad.net/pbr") (synopsis "Change the default behavior of Python’s setuptools") (description @@ -2070,8 +2060,7 @@ and sensible default behaviors into your setuptools run.") `(("python-fixtures" ,python-fixtures) ("python-mimeparse" ,python-mimeparse) ("python-mock" ,python-mock) - ("python-setuptools" ,python-setuptools) - ("python-six" ,python-six) + ("python-six" ,python-six) ("python-sphinx" ,python-sphinx) ("python-testrepository" ,python-testrepository) ("python-testresources" ,python-testresources) @@ -2137,8 +2126,7 @@ Python tests.") `(("python-fixtures-0.3.16" ,python-fixtures-0.3.16) ("python-testtools" ,python-testtools))) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-subunit" ,python-subunit) + `(("python-subunit" ,python-subunit) ("python-mimeparse" ,python-mimeparse))) (home-page "https://launchpad.net/testrepository") (synopsis "Database for Python test results") @@ -2240,8 +2228,7 @@ backported from Python 2.7 for Python 2.4+.") "1iypp6z46r19n4xmgx6m1lwmlpfjh8vapq8izigrqlaarvp2y64c")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-six" ,python-six) + `(("python-six" ,python-six) ("python-parse" ,python-parse) ("python-parse-type" ,python-parse-type))) (arguments `(#:tests? #f)) ;TODO: tests require nose>=1.3 and @@ -2369,8 +2356,7 @@ with sensible defaults out of the box.") "0j0n38hg1jvrmyy68f9ikvzq1gs9g0sx4ws7maf8wi3bwbbqmfqy")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-jsonschema" ,python-jsonschema) + `(("python-jsonschema" ,python-jsonschema) ("python-pytest-cov" ,python-pytest-cov))) (home-page "https://bitbucket.org/pypa/wheel/") (synopsis "Format for built Python packages") @@ -2405,8 +2391,7 @@ installed with a newer @code{pip} or with wheel's own command line utility.") "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-py" ,python-py) + `(("python-py" ,python-py) ("python-pytest" ,python-pytest) ("python-pytest-cov" ,python-pytest-cov) ("python-wheel" ,python-wheel))) @@ -2493,7 +2478,6 @@ version numbers.") (package (inherit jsonschema) (native-inputs `(("python2-mock" ,python2-mock) - ("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs jsonschema))) (propagated-inputs `(("python2-functools32" ,python2-functools32)))))) @@ -2535,8 +2519,7 @@ somewhat intelligeble.") "1556v2jppd8mjkkj66pxb5rcazm35jq81r233mdl8hfmz9n3icp1")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-pytest-runner" ,python-pytest-runner))) + `(("python-pytest-runner" ,python-pytest-runner))) (arguments '(#:tests? #f)) ; test suite doesn't work (home-page "http://github.com/progrium/pyjwt") @@ -2665,8 +2648,7 @@ object.") (("skipif.*") "skipif(True, reason=\"Guix\")\n")) (zero? (system* "py.test"))))))) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-mock" ,python-mock) + `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest))) (home-page "https://virtualenv.pypa.io/") (synopsis "Virtual Python environment builder") @@ -2714,8 +2696,7 @@ for Python.") "1x0v41lp5m1pjix3l46zx02b7lqp2hflgpnxwkywxynvi3zz47xw")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-markupsafe" ,python-markupsafe))) + `(("python-markupsafe" ,python-markupsafe))) (home-page "http://jinja.pocoo.org/") (synopsis "Python template engine") (description @@ -2778,8 +2759,7 @@ logic-free templating system Mustache.") (string-append "@SkipTest\n" line))) #t))))) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-nose" ,python-nose) + `(("python-nose" ,python-nose) ("python-sphinx" ,python-sphinx) ("python-docutils" ,python-docutils) ("python-numpydoc" ,python-numpydoc))) @@ -2860,8 +2840,7 @@ reStructuredText.") "011xizm3jnmf4cvs5i6kgf6c5nn046h79i8j0vd0f27yw9j3p4wl")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-jinja2" ,python-jinja2) + `(("python-jinja2" ,python-jinja2) ("python-docutils" ,python-docutils) ("python-pygments" ,python-pygments))) (home-page "http://sphinx-doc.org/") @@ -2918,8 +2897,7 @@ sources.") "0mkimp1fpdan4p3882vzcws4l594k71ich4g0wq97jbra7p602n0")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-pytz" ,python-pytz) + `(("python-pytz" ,python-pytz) ("python-six" ,python-six))) (home-page "https://github.com/getpelican/feedgenerator") (synopsis @@ -3072,8 +3050,7 @@ mining and data analysis.") ("python-six" ,python-six) ("python-pillow" ,python-pillow))) (native-inputs - `(("python-cython" ,python-cython) - ("python-setuptools" ,python-setuptools))) + `(("python-cython" ,python-cython))) (home-page "http://scikit-image.org/") (synopsis "Image processing in Python") (description @@ -3108,8 +3085,7 @@ mining and data analysis.") ;; Tests require a running Redis server (arguments '(#:tests? #f)) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/andymccurdy/redis-py") (synopsis "Redis Python client") (description @@ -3200,8 +3176,7 @@ writing C extensions for Python as easy as Python itself.") (build-system python-build-system) (arguments `(#:python ,python-2)) (native-inputs - `(("python2-pytest" ,python2-pytest) ; needed for running tests - ("python2-setuptools" ,python2-setuptools))) + `(("python2-pytest" ,python2-pytest))) ; needed for running tests (home-page "https://rpython.readthedocs.org") (synopsis "Framework for implementing interpreters and virtual machines") (description "RPython is a translation and support framework for @@ -3304,8 +3279,7 @@ capabilities.") ("python2-pysnptools" ,python2-pysnptools))) (native-inputs `(("unzip" ,unzip) - ("python2-mock" ,python2-mock) - ("python2-setuptools" ,python2-setuptools))) + ("python2-mock" ,python2-mock))) (home-page "http://research.microsoft.com/en-us/um/redmond/projects/mscompbio/fastlmm/") (synopsis "Perform genome-wide association studies on large data sets") (description @@ -3445,8 +3419,7 @@ that client code uses to construct the grammar directly in Python code.") (("3") "2")))))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-docutils" ,python-docutils) + `(("python-docutils" ,python-docutils) ("python-sphinx" ,python-sphinx) ("python-nose" ,python-nose))) (home-page "https://pypi.python.org/pypi/numpydoc") @@ -3526,8 +3499,7 @@ transcendental functions).") ("python-pycairo" ,python-pycairo) ("python-cairocffi" ,python-cairocffi))) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-dateutil" ,python-dateutil-2) + `(("python-dateutil" ,python-dateutil-2) ("python-six" ,python-six) ("python-pytz" ,python-pytz) ("python-numpy" ,python-numpy-bootstrap) @@ -3653,8 +3625,7 @@ toolkits.") ("python2-pandas" ,python2-pandas) ("python2-six" ,python2-six))) (native-inputs - `(("unzip" ,unzip) - ("python2-setuptools" ,python2-setuptools))) + `(("unzip" ,unzip))) (home-page "http://research.microsoft.com/en-us/um/redmond/projects/mscompbio/") (synopsis "Library for reading and manipulating genetic data") (description @@ -3683,8 +3654,7 @@ operators such as union, intersection, and difference.") ("pcre" ,pcre) ("r" ,r))) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("zlib" ,zlib))) + `(("zlib" ,zlib))) (home-page "http://rpy.sourceforge.net/") (synopsis "Python interface to the R language") (description "rpy2 is a redesign and rewrite of rpy. It is providing a @@ -4148,8 +4118,7 @@ services for your Python modules and applications.") "0xkv0p1d73gz0a1qaasf0ai4262g8f334j07vd60bjrxs2wr3nmj")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-nose" ,python-nose))) + `(("python-nose" ,python-nose))) (inputs `(("freetype" ,freetype) ("lcms" ,lcms) @@ -4211,8 +4180,7 @@ a general image processing tool.") (outputs '("out" "doc")) (build-system python-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("python-setuptools" ,python-setuptools))) + `(("pkg-config" ,pkg-config))) (arguments `(#:phases (alist-replace @@ -4263,8 +4231,7 @@ a front-end for C compilers or analysis tools.") (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) - ("python-pytest" ,python-pytest) - ("python-setuptools" ,python-setuptools))) + ("python-pytest" ,python-pytest))) (arguments `(#:phases (alist-cons-after @@ -4349,8 +4316,7 @@ support for Python 3 and PyPy. It is based on cffi.") (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) - ("python-docutils" ,python-docutils) - ("python-setuptools" ,python-setuptools))) + ("python-docutils" ,python-docutils))) (propagated-inputs `(("python-xcffib" ,python-xcffib))) ; used at run time (arguments @@ -4427,8 +4393,7 @@ etc. The core of this module is a decorator factory.") ;; should be set to the path of the libdrmaa library. (arguments '(#:tests? #f)) (native-inputs - `(("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools))) + `(("python-nose" ,python-nose))) (home-page "https://pypi.python.org/pypi/drmaa") (synopsis "Python bindings for the DRMAA library") (description @@ -4536,8 +4501,7 @@ them as the version argument or in a SCM managed file.") (propagated-inputs `(("python-appdirs" ,python-appdirs))) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-setuptools-scm" ,python-setuptools-scm) + `(("python-setuptools-scm" ,python-setuptools-scm) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (home-page "http://github.com/jaraco/path.py") @@ -4592,8 +4556,7 @@ PickleShare.") (base32 "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("unzip" ,unzip))) + `(("unzip" ,unzip))) (home-page "http://cheeseshop.python.org/pypi/simplegeneric") (synopsis "Python module for simple generic functions") (description @@ -4828,8 +4791,7 @@ tools for mocking system commands and recording calls to those.") ("python-nose" ,python-nose) ("python-sphinx" ,python-sphinx) ("texlive" ,texlive) - ("texinfo" ,texinfo) - ("python-setuptools" ,python-setuptools))) + ("texinfo" ,texinfo))) (arguments `(#:phases (modify-phases %standard-phases @@ -5091,8 +5053,7 @@ implementation of D-Bus.") "0w4jb0wpx785qw42r3h4fh7gl5w2968q48i7gygybsfxck8nzffs")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("sqlite" ,sqlite))) + `(("sqlite" ,sqlite))) (arguments `(#:phases ;; swap check and install phases @@ -5127,8 +5088,7 @@ translate the complete SQLite API into Python.") (build-system python-build-system) (inputs `(("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("python-setuptools" ,python-setuptools))) + ("libxslt" ,libxslt))) (home-page "http://lxml.de/") (synopsis "Python XML processing library") @@ -5283,8 +5243,7 @@ interfaces in an easy and portable manner.") (propagated-inputs `(("python-decorator" ,python-decorator))) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-nose" ,python-nose))) + `(("python-nose" ,python-nose))) (home-page "http://networkx.github.io/") (synopsis "Python module for creating and manipulating graphs and networks") (description @@ -5602,8 +5561,7 @@ applications.") `(("zeromq" ,zeromq))) (native-inputs `(("pkg-config" ,pkg-config) - ("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools))) + ("python-nose" ,python-nose))) (home-page "http://github.com/zeromq/pyzmq") (synopsis "Python bindings for 0MQ") (description @@ -5671,8 +5629,7 @@ PEP 8.") (build-system python-build-system) (inputs `(("python-pytest" ,python-pytest) - ("python-pytest-runner" ,python-pytest-runner) - ("python-setuptools" ,python-setuptools))) + ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://github.com/flintwork/mccabe") (synopsis "McCabe checker, plugin for flake8") (description @@ -5692,8 +5649,7 @@ complexity of Python source code.") (uri (pypi-uri "mccabe" version)) (sha256 (base32 - "0fi4a81kr5bcv5p4xgibqr595hyj5dafkqgsmfk96mfy8w71fajs")))) - (inputs `(("python-setuptools" ,python-setuptools))))) + "0fi4a81kr5bcv5p4xgibqr595hyj5dafkqgsmfk96mfy8w71fajs")))))) (define-public python2-mccabe-0.2.1 (package-with-python2 python-mccabe-0.2.1)) @@ -5749,8 +5705,7 @@ complexity of Python source code.") "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-pep8" ,python-pep8) + `(("python-pep8" ,python-pep8) ("python-pyflakes" ,python-pyflakes) ("python-mccabe" ,python-mccabe) ("python-mock" ,python-mock) @@ -5770,8 +5725,7 @@ complexity of Python source code.") (define-public python-flake8-2.2.4 (package (inherit python-flake8) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-pep8" ,python-pep8-1.5.7) + `(("python-pep8" ,python-pep8-1.5.7) ("python-pyflakes" ,python-pyflakes-0.8.1) ("python-mccabe" ,python-mccabe-0.2.1) ("python-mock" ,python-mock) @@ -5804,8 +5758,7 @@ complexity of Python source code.") "17zqjp9m4d1w3jf2rbbq5xshcw24q1vlcv24gkgfqqyyymajxahx")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-nose" ,python-nose) + `(("python-nose" ,python-nose) ("python-cython" ,python-cython))) (home-page "https://github.com/lepture/mistune") (synopsis "Markdown parser in pure Python") @@ -5864,8 +5817,7 @@ markdown_py is also provided to convert Markdown files to HTML.") "0nggns5kikn32yyda2zrj1xdmh49pi3v0drggcdwljbv36r8zdyw")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-nose" ,python-nose))) + `(("python-nose" ,python-nose))) (arguments `(#:phases (modify-phases %standard-phases @@ -6016,8 +5968,7 @@ should be stored on various operating systems.") `(("fuse" ,fuse) ("attr" ,attr))) (native-inputs - `(("pkg-config" ,pkg-config) - ("python-setuptools" ,python-setuptools))) + `(("pkg-config" ,pkg-config))) (synopsis "Python bindings for FUSE") (description "Python-LLFUSE is a set of Python bindings for the low level FUSE API.") @@ -6187,8 +6138,7 @@ fractional seconds) of a clock which never goes backwards.") "02bhhzijfhv8hmi1i54d4b0v43liwhnywhflvxsv4x3zax9s3afq")))) (build-system python-build-system) (inputs - `(("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools))) + `(("python-nose" ,python-nose))) (home-page "http://webob.org/") (synopsis "WSGI request and response object") (description @@ -6216,8 +6166,7 @@ object to help create WSGI responses.") ;; Current test in setup.py does not work as of 1.0.0, so use nose to ;; run tests instead for now. (replace 'check (lambda _ (zero? (system* "nosetests"))))))) - (native-inputs `(("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools))) + (native-inputs `(("python-nose" ,python-nose))) (home-page "http://www.python-excel.org/") (synopsis "Library for extracting data from Excel files") (description "This packages provides a library to extract data from @@ -6296,8 +6245,7 @@ printing of sub-tables by specifying a row range.") `(("python-numexpr" ,python-numexpr) ("python-numpy" ,python-numpy))) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-cython" ,python-cython) + `(("python-cython" ,python-cython) ("pkg-config" ,pkg-config))) (inputs `(("hdf5" ,hdf5) @@ -6595,8 +6543,7 @@ library.") "08cm8d4228fj0qnrysy3qv1a6022zr3dcs25amd14lgxil6vvx26")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-virtualenv" ,python-virtualenv) + `(("python-virtualenv" ,python-virtualenv) ;; Tests ("python-mock" ,python-mock) ("python-pytest" ,python-pytest) @@ -6712,8 +6659,7 @@ a hash value.") (close-port port) #t)))))) (inputs - `(("python-setuptools" ,python-setuptools) - ("libarchive" ,libarchive))) + `(("libarchive" ,libarchive))) (home-page "https://github.com/Changaco/python-libarchive-c") (synopsis "Python interface to libarchive") (description @@ -6995,8 +6941,7 @@ interactive computing.") (propagated-inputs `(("python-notebook" ,python-notebook))) (native-inputs - `(("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools))) + `(("python-nose" ,python-nose))) (home-page "http://ipython.org") (synopsis "IPython HTML widgets for Jupyter") (description "This package provides interactive HTML widgets for Jupyter @@ -7055,8 +7000,7 @@ in the data.") ("python-ipython" ,python-ipython) ("python-jupyter-client" ,python-jupyter-client) ("python-prompt-toolkit" ,python-prompt-toolkit) - ("python-pygments" ,python-pygments) - ("python-setuptools" ,python-setuptools))) + ("python-pygments" ,python-pygments))) (home-page "https://jupyter.org") (synopsis "Jupyter terminal console") (description "This package provides a terminal-based console frontend for @@ -7086,8 +7030,7 @@ Jupyter kernels such as IJulia and IRKernel.") ("python-ipywidgets" ,python-ipywidgets) ("python-jupyter-console" ,python-jupyter-console) ("python-nbconvert" ,python-nbconvert) - ("python-notebook" ,python-notebook) - ("python-setuptools" ,python-setuptools))) + ("python-notebook" ,python-notebook))) (home-page "http://jupyter.org") (synopsis "Web application for interactive documents") (description @@ -7139,8 +7082,7 @@ automatically detect a wide range of file encodings.") "16bf890xbdz3m30rsv2qacklh2rdn1zrfspfnwzx9g7vwz8yw4r1")))) (build-system python-build-system) (native-inputs - `(("python-pytest" ,python-pytest) - ("python-setuptools" ,python-setuptools))) + `(("python-pytest" ,python-pytest))) (arguments `(#:phases (alist-replace 'check @@ -7561,8 +7503,7 @@ This allows one to make simple text-mode user interfaces on Unix-like systems") (propagated-inputs `(("python-pytz" ,python-pytz))) (native-inputs - `(("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools))) + `(("python-nose" ,python-nose))) (home-page "https://github.com/kurtraschke/pyRFC3339") (synopsis "Python timestamp library") (description "Python library for generating and parsing RFC 3339-compliant @@ -7615,8 +7556,7 @@ addon modules.") (patches (search-patches "python-configobj-setuptools.patch")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-six" ,python-six))) + `(("python-six" ,python-six))) (synopsis "Config file reading, writing and validation") (description "ConfigObj is a simple but powerful config file reader and writer: an ini file round tripper. Its main feature is that it is very easy to @@ -8115,8 +8055,7 @@ Blog, News or Announcements section to a Sphinx website.") "1an5lkkqk1zha47198p42ji3m94xmzx1a03dn7866m87n4r4q8h5")))) (build-system python-build-system) (inputs - `(("python-args" ,python-args) - ("python-setuptools" ,python-setuptools))) + `(("python-args" ,python-args))) (home-page "https://github.com/kennethreitz/clint") (synopsis "Command-line interface tools") (description @@ -8161,8 +8100,7 @@ Abstract Syntax Tree.") "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj")))) (build-system python-build-system) (inputs - `(("python-appdirs" ,python-appdirs) - ("python-setuptools" ,python-setuptools))) + `(("python-appdirs" ,python-appdirs))) (home-page "https://github.com/alex/rply") (synopsis "Parser generator for Python") (description @@ -8188,8 +8126,7 @@ with a new public API, and RPython support.") (inputs `(("python-astor" ,python-astor) ("python-clint" ,python-clint) - ("python-rply" ,python-rply) - ("python-setuptools" ,python-setuptools))) + ("python-rply" ,python-rply))) (home-page "http://hylang.org/") (synopsis "Lisp frontend to Python") (description @@ -8326,8 +8263,7 @@ concurrent.futures package from Python 3.2") (build-system python-build-system) (arguments `(#:tests? #f)) (native-inputs - `(("python-setuptools" ,python-setuptools) - ;; some packages for tests + `(;; some packages for tests ("python-nose" ,python-nose) ("python-mock" ,python-mock) ("python-tornado" ,python-tornado))) @@ -8382,8 +8318,7 @@ text.") "1dcxvszbikgzh99ybdc7jq0zb9wspy2ds8z9mjsqiyv3q884xpr5")))) (build-system python-build-system) (inputs - `(("python-pyasn1" ,python-pyasn1) - ("python-setuptools" ,python-setuptools))) + `(("python-pyasn1" ,python-pyasn1))) (synopsis "Pure-Python RSA implementation") (description "Python-RSA is a pure-Python RSA implementation. It supports encryption and decryption, signing and verifying signatures, and key @@ -8433,8 +8368,7 @@ Pytest but stripped of Pytest specific details.") ;; pytest breaks other packages. '(#:tests? #f)) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-pluggy" ,python-pluggy) + `(("python-pluggy" ,python-pluggy) ("python-py" ,python-py) ("python-virtualenv" ,python-virtualenv) ("python-pytest" ,python-pytest))) @@ -8558,8 +8492,7 @@ seamlessly into your existing Python unit testing work flow.") (strip-python2-variant python-hypothesis)))) (package (inherit hypothesis) (native-inputs - `(("python2-enum34" ,python2-enum34) - ("python2-setuptools" ,python2-setuptools)))))) + `(("python2-enum34" ,python2-enum34)))))) (define-public python-pytest-subtesthack (package @@ -8796,10 +8729,9 @@ file.") (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) + ;; Note: setuptools used at runtime for pkg_resources (propagated-inputs - `(;; Uses pkg_resources provided by setuptools internally. - ("python-setuptools" ,python-setuptools) - ("python-six" ,python-six))) + `(("python-six" ,python-six))) (arguments '(;; Tests don't pass on Python 3, but work fine on Python 2. ;; (As of 2.0.2, Python 3 support in Paste is presently a bit broken, @@ -8840,10 +8772,9 @@ follows ideas flowing from WSGI (Web Standard Gateway Interface).") (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) + ;; Note: setuptools used at runtime for pkg_resources (propagated-inputs - `(;; Uses pkg_resources provided by setuptools internally. - ("python-setuptools" ,python-setuptools) - ("python-paste" ,python-paste) + `(("python-paste" ,python-paste) ("python-pastedeploy" ,python-pastedeploy))) (home-page "http://pythonpaste.org/script/") (arguments @@ -9456,8 +9387,7 @@ library.") "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest))) (home-page "http://bitbucket.org/mchaput/whoosh") (synopsis "Full text indexing, search, and spell checking library") (description @@ -9527,8 +9457,7 @@ anymore.") (arguments `(#:python ,python-2)) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ("python2-six" ,python2-six))) + `(("python2-six" ,python2-six))) (home-page "http://pypi.python.org/pypi/pathlib2/") (synopsis "Object-oriented file system paths - backport of standard pathlib module") @@ -9596,8 +9525,7 @@ encoding algorithms to do fuzzy string matching.") `(;; It supports Python 3, but Python 3 can already do Unicode CSV. #:python ,python-2)) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2))) + `(("python2-unittest2" ,python2-unittest2))) (home-page "https://github.com/jdunck/python-unicodecsv") (synopsis "Unicode CSV module for Python 2") (description "Unicodecsv is a drop-in replacement for Python 2.7's CSV @@ -9752,8 +9680,7 @@ CloudFront content delivery network.") "1pw0kmvc57sjmaxi6c54fqsnihqj6hvhc9y1vaz36axafzqam7bh")))) (build-system python-build-system) (native-inputs - `(("python-nose" ,python-nose) - ("python-setuptools" ,python-setuptools))) + `(("python-nose" ,python-nose))) (inputs `(("pkg-config" ,pkg-config))) (arguments @@ -9955,8 +9882,7 @@ Python. It generates C++ code and a Makefile.")) `(#:python ,python-2)) (build-system python-build-system) (native-inputs - `(("python2-unittest2" ,python2-unittest2) - ("python2-setuptools" ,python2-setuptools))) + `(("python2-unittest2" ,python2-unittest2))) (home-page "https://github.com/python-rope/rope") (synopsis "Refactoring library for Python") (description "Rope is a refactoring library for Python. It facilitates @@ -10049,8 +9975,7 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc). (system* "2to3" "--no-diff" "-wn" "sqlparse" "tests")) (zero? (system* "py.test"))))))) (native-inputs - `(("python-pytest" ,python-pytest) - ("python-setuptools" ,python-setuptools))) + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/andialbrecht/sqlparse") (synopsis "Non-validating SQL parser") (description "Sqlparse is a non-validating SQL parser for Python. It @@ -10107,8 +10032,7 @@ are synchronized with data exchanges on \"channels\".") (propagated-inputs `(("python-greenlet" ,python-greenlet))) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-six" ,python-six))) + `(("python-six" ,python-six))) (inputs `(("c-ares" ,c-ares) ("libev" ,libev))) @@ -10219,8 +10143,7 @@ It uses LR parsing and does extensive error checking.") (("from common") "from nose.tools"))))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ;; For testing + `(;; For testing ("python-nose" ,python-nose))) (home-page "https://bitbucket.org/astanin/python-tabulate") (synopsis "Pretty-print tabular data") @@ -10379,8 +10302,7 @@ objects, patterned after the Mocha library for Ruby.") "1bz7hkdgpqcjs866y58z8jywpy7al0f4rxdr00bh2l5qddyw245j")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ;; For testing + `(;; For testing ("python-chai" ,python-chai) ("python-simplejson" ,python-simplejson))) (propagated-inputs @@ -10451,8 +10373,7 @@ Wikipedia code samples at "1k2dcl6mqpn5bljyl6w42rqyd9mb3y9kh2mg7m2x3kfjwvg0rpva")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ;; For testing + `(;; For testing ("python-mock" ,python-mock) ("python-pytest" ,python-pytest))) (propagated-inputs @@ -10577,8 +10498,7 @@ parsing UK postcodes.") "0vs0dkmg0dlaxf8w6q2i3k0i03gmp56ablldv7ci9x3nbadkn71g")))) (build-system python-build-system) (native-inputs - `(("python-setuptools" ,python-setuptools) - ;; For testing + `(;; For testing ("python-email-validator" ,python-email-validator) ("python-mock" ,python-mock) ("python-ukpostcodeparser" ,python-ukpostcodeparser))) @@ -10763,8 +10683,7 @@ characters, mouse support, and auto suggestions.") `(("python-docopt" ,python-docopt) ("python-jedi" ,python-jedi) ("python-prompt-toolkit" ,python-prompt-toolkit) - ("python-pygments" ,python-pygments) - ("python-setuptools" ,python-setuptools))) + ("python-pygments" ,python-pygments))) (home-page "https://github.com/jonathanslenders/ptpython") (synopsis "Python Read-Eval-Print-Loop with nice IDE-like features") (description diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index d0a362c3a0..1a8d13369b 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -318,8 +318,7 @@ ideal (e.g. in LV2 implementations or embedded applications).") (inputs `(("python-html5lib" ,python-html5lib) ("python-isodate" ,python-isodate) - ("python-pyparsing" ,python-pyparsing) - ("python-setuptools" ,python-setuptools))) + ("python-pyparsing" ,python-pyparsing))) (home-page "https://github.com/RDFLib/rdflib") (synopsis "Python RDF library") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 97dd0a82bd..e1076c7c60 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -161,8 +161,7 @@ insert mode and command mode where keybindings have different functions.") (("'tput'") (string-append "'" ncurses "/bin/tput'")))) #t))))) - (inputs `(("ncurses" ,ncurses) - ("python-setuptools" ,python-setuptools))) + (inputs `(("ncurses" ,ncurses))) (home-page "https://asciinema.org") (synopsis "Terminal session recorder") (description diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e06a611164..5909a9f9db 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1156,8 +1156,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") (build-system python-build-system) (arguments `(#:python ,python-2)) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ;; for the tests + `(;; for the tests ("python2-six" ,python2-six))) (propagated-inputs `(("python2-dateutil" ,python2-dateutil-2) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index a26c716866..c38bf9da78 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -91,8 +91,7 @@ (inputs `(("pygtk" ,python2-pygtk) ("xrandr" ,xrandr))) (native-inputs `(("gettext" ,gettext-minimal) - ("python-docutils" ,python2-docutils) - ("python-setuptools" ,python2-setuptools))) + ("python-docutils" ,python2-docutils))) (home-page "https://christian.amsuess.com/tools/arandr/") (synopsis "Another RandR graphical user interface") ;; TRANSLATORS: "X11 resize-and-rotate" should not be translated. -- cgit v1.2.3 From 00e10c6e674f0f292d5821bc4a513d48f4d1d164 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 13:31:42 +0200 Subject: gnu: Remove python-setuptools and python2-setuptools from inputs (part 3) This patch contains the changes where setuptools are used in an inherited package and removing this input keeps the need for inheriting the package. * gnu/packages/bioinformatics.scm (python2-biom-format): Remove python-setuptools respective python2-setuptools from [inputs], [native-inputs] and [propagated-inputs] in Python 2 packages inheriting from a Python 3 package. * gnu/packages/python.scm (python2-pytest-mock, python2-oauthlib, python2-seaborn, python2-tornado, python2-terminado, python2-rauth, python2-anyjson, python2-amqp, python2-kombu, python2-billiard, python2-celery, python2-jellyfish, python2-binaryornot, python2-natsort, python2-graphene): Likewise. * gnu/packages/statistics.scm (python2-statsmodels): Likewise. --- gnu/packages/bioinformatics.scm | 4 +--- gnu/packages/python.scm | 51 +++++++++++------------------------------ gnu/packages/statistics.scm | 5 +--- 3 files changed, 15 insertions(+), 45 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e90281fb5f..a552686328 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -584,9 +584,7 @@ e.g. microbiome samples, genomes, metagenomes.") (substitute* "setup.py" (("install_requires.append\\(\"pyqi\"\\)") "pass")) #t))) - ,@(package-arguments base))) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + ,@(package-arguments base)))))) (define-public bioperl-minimal (let* ((inputs `(("perl-module-build" ,perl-module-build) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2f999b1b0f..66c01d1dd9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1782,9 +1782,6 @@ same arguments.") (let ((base (package-with-python2 (strip-python2-variant python-pytest-mock)))) (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base))) (inputs `(("python2-mock" ,python2-mock) ,@(package-inputs base)))))) @@ -2562,8 +2559,7 @@ OAuth request-signing logic.") (let ((base (package-with-python2 (strip-python2-variant python-oauthlib)))) (package (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2) + (native-inputs `(("python2-unittest2" ,python2-unittest2) ,@(package-native-inputs base)))))) (define-public python-itsdangerous @@ -5305,9 +5301,7 @@ and statistical routines from scipy and statsmodels.") (package (inherit base) (propagated-inputs `(("python2-pytz" ,python2-pytz) - ,@(package-propagated-inputs base))) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + ,@(package-propagated-inputs base)))))) (define-public python-sympy (package @@ -5478,10 +5472,7 @@ connection to each user.") `(("python2-backport-ssl-match-hostname" ,python2-backport-ssl-match-hostname) ("python2-singledispatch" ,python2-singledispatch) - ,@(package-inputs tornado))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs tornado)))))) + ,@(package-inputs tornado)))))) ;; the python- version can be removed with python-3.5 (define-public python-backports-abc @@ -5870,10 +5861,7 @@ term.js Javascript terminal emulator library.") (propagated-inputs `(("python2-backport-ssl-match-hostname" ,python2-backport-ssl-match-hostname) - ,@(package-propagated-inputs terminado))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs terminado)))))) + ,@(package-propagated-inputs terminado)))))) (define-public python-fonttools (package @@ -8167,8 +8155,7 @@ authenticated session objects providing things like keep-alive.") (let ((base (package-with-python2 (strip-python2-variant python-rauth)))) (package (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2) + (native-inputs `(("python2-unittest2" ,python2-unittest2) ,@(package-native-inputs base)))))) (define-public python2-functools32 @@ -8918,8 +8905,7 @@ and provides a uniform API regardless of which JSON implementation is used.") (arguments `(;; Unlike the python 3 variant, we do run tests. See above! #:tests? #t ,@(package-arguments anyjson))) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-nose" ,python2-nose)))))) + (native-inputs `(("python2-nose" ,python2-nose)))))) (define-public python-amqp (package @@ -8955,9 +8941,7 @@ alternative when librabbitmq is not available.") ;; unmaintained. Weirdly, does not do this on the python 3 ;; version? #:tests? #f - ,@(package-arguments amqp))) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs amqp)))))) + ,@(package-arguments amqp)))))) (define-public python-kombu (package @@ -8994,8 +8978,7 @@ RabbitMQ messaging server is the most popular implementation.") (strip-python2-variant python-kombu)))) (package (inherit kombu) - (inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2) + (inputs `(("python2-unittest2" ,python2-unittest2) ,@(package-inputs kombu)))))) (define-public python-billiard @@ -9028,8 +9011,7 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.") (strip-python2-variant python-billiard)))) (package (inherit billiard) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2) + (native-inputs `(("python2-unittest2" ,python2-unittest2) ("python2-mock" ,python2-mock) ,@(package-native-inputs billiard)))))) @@ -9078,8 +9060,7 @@ synchronously (wait until ready).") (strip-python2-variant python-celery)))) (package (inherit celery) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2) + (native-inputs `(("python2-unittest2" ,python2-unittest2) ("python2-mock" ,python2-mock) ,@(package-native-inputs celery)))))) @@ -9502,8 +9483,7 @@ encoding algorithms to do fuzzy string matching.") (let ((jellyfish (package-with-python2 (strip-python2-variant python-jellyfish)))) (package (inherit jellyfish) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unicodecsv" ,python2-unicodecsv) + (native-inputs `(("python2-unicodecsv" ,python2-unicodecsv) ,@(package-native-inputs jellyfish)))))) (define-public python2-unicodecsv @@ -10896,9 +10876,6 @@ binary or text.") (define-public python2-binaryornot (let ((base (package-with-python2 (strip-python2-variant python-binaryornot)))) (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base))) (inputs `(("python2-enum34" ,python2-enum34) ,@(package-inputs base)))))) @@ -11407,8 +11384,7 @@ functionality in the command line.") (let ((base (package-with-python2 (strip-python2-variant python-natsort)))) (package (inherit base) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ("python2-pathlib" ,python2-pathlib) + `(("python2-pathlib" ,python2-pathlib) ("python2-mock" ,python2-mock) ("python2-enum34" ,python2-enum34) ,@(package-native-inputs base)))))) @@ -11567,8 +11543,7 @@ with an associated set of resolve methods that know how to fetch data.") (strip-python2-variant python-graphene)))) (package (inherit base) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ("python2-sqlalchemy" ,python2-sqlalchemy) + `(("python2-sqlalchemy" ,python2-sqlalchemy) ,@(package-native-inputs base)))))) (define-public python-nautilus diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 700a8957cc..a19d6000d4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1487,10 +1487,7 @@ inference for statistical models.") ("python2-scipy" ,python2-scipy) ("python2-pandas" ,python2-pandas) ("python2-patsy" ,python2-patsy) - ("python2-matplotlib" ,python2-matplotlib))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs stats)))))) + ("python2-matplotlib" ,python2-matplotlib)))))) (define-public r-coda (package -- cgit v1.2.3 From 5c31f4aa7c11fcf720c0ce0e26d55788e2df1044 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 13:57:21 +0200 Subject: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a) This patch contains the changes for all modules beside python.scm where setuptools are used in an inherited package and removing this input also removes the need for inheriting the package. This is the case if adding setuptools in the inherited package was the only change. Change this to not inherit and remove the new needless call to "strip-python2-variant (if applicable). * gnu/packages/bioinformatics.scm (python-biopython, python2-biopython, python-twobitreader, python2-twobitreader, python-plastid, python2-plastid, python2-pybigwig, python2-screed, sra-tools): No longer "inherit" Python 2 packages inheriting from a Python 3 package if the sole reason for inheriting was adding python-setuptools respective python2-setuptools to [inputs], [native-inputs] or [propagated-inputs]. Remove now needless [properties] "python2-variant" where applicable. * gnu/packages/django.scm (python-pytest-django, python2-pytest-django, python-django-filter, python2-django-filter): Likewise. * gnu/packages/gnupg.scm (python2-pygpgme): Likewise. * gnu/packages/mail.scm (python-mailmanclient, python2-mailmanclient): Likewise. * gnu/packages/mpd.scm (python-msp, python2-mpd2): Likewise. * gnu/packages/music.scm (python-pylast, python2-pylast): Likewise. * gnu/packages/openstack.scm (python-requests-mock, python2-requests-mock, python2-git-review): Likewise. * gnu/packages/password-utils.scm (python2-bcrypt): Likewise. * gnu/packages/protobuf.scm (python-protobuf, python2-protobuf): Likewise. * gnu/packages/statistics.scm (python-patsy, python2-patsy): Likewise. * gnu/packages/web.scm (python2-feedparser): Likewise. --- gnu/packages/bioinformatics.scm | 35 ++++++----------------------------- gnu/packages/django.scm | 16 ++-------------- gnu/packages/gnupg.scm | 7 +------ gnu/packages/mail.scm | 7 +------ gnu/packages/mpd.scm | 9 ++------- gnu/packages/music.scm | 10 ++-------- gnu/packages/openstack.scm | 16 +++------------- gnu/packages/password-utils.scm | 6 +----- gnu/packages/protobuf.scm | 7 ++----- gnu/packages/statistics.scm | 9 ++------- gnu/packages/web.scm | 6 +----- 11 files changed, 23 insertions(+), 105 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a552686328..481a2a3bcb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -680,15 +680,10 @@ bioinformatics programs; a standard sequence class and tools for performing common operations on them; code to perform data classification; code for dealing with alignments; code making it easy to split up parallelizable tasks into separate processes; and more.") - (license (license:non-copyleft "http://www.biopython.org/DIST/LICENSE")) - (properties `((python2-variant . ,(delay python2-biopython)))))) + (license (license:non-copyleft "http://www.biopython.org/DIST/LICENSE")))) (define-public python2-biopython - (let ((base (package-with-python2 (strip-python2-variant python-biopython)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-biopython)) ;; An outdated version of biopython is required for seqmagick, see ;; https://github.com/fhcrc/seqmagick/issues/59 @@ -1427,7 +1422,6 @@ also includes an interface for tabix.") (sha256 (base32 "1q8wnj2kga9nz1lwc4w7qv52smfm536hp6mc8w6s53lhyj0mpi22")))) - (properties `((python2-variant . ,(delay python2-twobitreader)))) (build-system python-build-system) (arguments '(;; Tests are not distributed in the PyPi release. @@ -1444,11 +1438,7 @@ UCSC genome browser.") (license license:artistic2.0))) (define-public python2-twobitreader - (let ((base (package-with-python2 (strip-python2-variant python-twobitreader)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-twobitreader)) (define-public python-plastid (package @@ -1460,7 +1450,6 @@ UCSC genome browser.") (sha256 (base32 "1sqkz5d3b9kf688mp7k771c87ins42j7j0whmkb49cb3fsg8s8lj")))) - (properties `((python2-variant . ,(delay python2-plastid)))) (build-system python-build-system) (arguments ;; Some test files are not included. @@ -1485,12 +1474,7 @@ high-throughput sequencing data – with an emphasis on simplicity.") (license license:bsd-3))) (define-public python2-plastid - (let ((base (package-with-python2 (strip-python2-variant python-plastid)))) - (package - (inherit base) - ;; setuptools is required at runtime - (propagated-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-propagated-inputs base)))))) + (package-with-python2 python-plastid)) (define-public cd-hit (package @@ -1939,10 +1923,7 @@ accessing bigWig files.") (license license:expat))) (define-public python2-pybigwig - (let ((pybigwig (package-with-python2 python-pybigwig))) - (package (inherit pybigwig) - (native-inputs - `(("python-setuptools" ,python2-setuptools)))))) + (package-with-python2 python-pybigwig)) (define-public python-dendropy (package @@ -4568,11 +4549,7 @@ sequence itself can be retrieved from these databases.") (license license:bsd-3))) (define-public python2-screed - (let ((base (package-with-python2 (strip-python2-variant python-screed)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-screed)) (define-public sra-tools (package diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 1ab2094dce..804f681e59 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -148,16 +148,10 @@ with arguments to the field constructor.") (synopsis "Django plugin for py.test") (description "Pytest-django is a plugin for py.test that provides a set of useful tools for testing Django applications and projects.") - (properties `((python2-variant . ,(delay python2-pytest-django)))) (license license:bsd-3))) (define-public python2-pytest-django - (let ((base (package-with-python2 - (strip-python2-variant python-pytest-django)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pytest-django)) (define-public python-django-filter (package @@ -180,13 +174,7 @@ useful tools for testing Django applications and projects.") some of the more mundane bits of view code. Specifically, it allows users to filter down a queryset based on a model’s fields, displaying the form to let them do this.") - (properties `((python2-variant . ,(delay python2-django-filter)))) (license license:bsd-3))) (define-public python2-django-filter - (let ((base (package-with-python2 - (strip-python2-variant python-django-filter)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-django-filter)) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 82932489de..b160d04ff7 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -417,12 +417,7 @@ decrypt messages using the OpenPGP format by making use of GPGME.") (license license:lgpl2.1+))) (define-public python2-pygpgme - (let ((base (package-with-python2 python-pygpgme))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pygpgme)) (define-public python-gnupg (package diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a152d50c36..b44555c04d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1741,12 +1741,7 @@ for OpenSMTPD to extend its functionality.") (description "The mailmanclient library provides official Python bindings for the GNU Mailman 3 REST API.") - (properties `((python2-variant . ,(delay python2-mailmanclient)))) (license lgpl3+))) (define-public python2-mailmanclient - (let ((base (package-with-python2 - (strip-python2-variant python-mailmanclient)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools)))))) + (package-with-python2 python-mailmanclient)) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index ec0861db11..83d99778ed 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -257,15 +257,10 @@ information about tracks being played to a scrobbler, such as Libre.FM.") (synopsis "Python MPD client library") (description "Python-mpd2 is a Python library which provides a client interface for the Music Player Daemon.") - (license license:lgpl3+) - (properties `((python2-variant . ,(delay python2-mpd2)))))) + (license license:lgpl3+))) (define-public python2-mpd2 - (let ((mpd2 (package-with-python2 - (strip-python2-variant python-mpd2)))) - (package (inherit mpd2) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs mpd2)))))) + (package-with-python2 python-mpd2)) (define-public sonata (package diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index d25c9c419a..61bcd3785b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1829,16 +1829,10 @@ detailed track info including timbre, pitch, rhythm and loudness information. (synopsis "Python interface to Last.fm and Libre.fm") (description "A Python interface to Last.fm and other API-compatible websites such as Libre.fm.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-pylast)))))) + (license license:asl2.0))) (define-public python2-pylast - (let ((pylast (package-with-python2 - (strip-python2-variant python-pylast)))) - (package (inherit pylast) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs pylast)))))) + (package-with-python2 python-pylast)) (define-public beets (package diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 930ce9eceb..8cf3b957a7 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -261,16 +261,10 @@ tested on Python version 3.2, 2.7 and 2.6.") (description "This module provides a building block to stub out the HTTP requests portions of your testing code.") - (license asl2.0) - (properties `((python2-variant . ,(delay python2-requests-mock)))))) + (license asl2.0))) (define-public python2-requests-mock - (let ((base (package-with-python2 - (strip-python2-variant python-requests-mock)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-requests-mock)) (define-public python-stevedore (package @@ -808,8 +802,4 @@ Gerrit for review, or fetching existing ones.") (license asl2.0))) (define-public python2-git-review - (let ((base (package-with-python2 (strip-python2-variant python-git-review)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-git-review)) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index d6bc00c8f2..2e3c3b0632 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -375,8 +375,4 @@ Password Scheme\"} by Niels Provos and David Mazieres.") (license license:asl2.0))) (define-public python2-bcrypt - (let ((bcrypt (package-with-python2 python-bcrypt))) - (package (inherit bcrypt) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs bcrypt)))))) + (package-with-python2 python-bcrypt)) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 586e532746..f4e9e88233 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -70,10 +70,7 @@ internal RPC protocols and file formats.") (description "Protocol buffers are a language-neutral, platform-neutral extensible mechanism for serializing structured data.") - (license bsd-3) - (properties `((python2-variant . ,(delay python2-protobuf)))))) + (license bsd-3))) (define-public python2-protobuf - (package (inherit (package-with-python2 - (strip-python2-variant python-protobuf))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-protobuf)) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a19d6000d4..950c3ec64f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1416,15 +1416,10 @@ building design matrices.") ;; The majority of the code is distributed under BSD-2. The module ;; patsy.compat contains code derived from the Python standard library, ;; and is covered by the PSFL. - (license (list license:bsd-2 license:psfl)) - (properties `((python2-variant . ,(delay python2-patsy)))))) + (license (list license:bsd-2 license:psfl)))) (define-public python2-patsy - (let ((patsy (package-with-python2 (strip-python2-variant python-patsy)))) - (package (inherit patsy) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs patsy)))))) + (package-with-python2 python-patsy)) (define-public python-statsmodels (package diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 81f861a905..e0c09ed396 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3172,11 +3172,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") l:freebsd-doc)))) ; documentation (define-public python2-feedparser - (let ((base (package-with-python2 - (strip-python2-variant python-feedparser)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools)))))) + (package-with-python2 python-feedparser)) (define-public r-httpuv (package -- cgit v1.2.3 From f210e94432fcb8d6c03589287833f7594f270522 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 14:54:59 +0200 Subject: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4b) This patch contains the changes in python.scm where setuptools are used in an inherited package and removing this input also removes the need for inheriting the package. This is the case if adding setuptools in the inherited packge was the only change. Change this to not inherit and remove the new needless call to "strip-python2-variant (where applicable). * gnu/packages/python.scm.scm: Remove inheriting Python 2 packages inheriting from a Python 3 package if adding python-setuptools respective python2-setuptools to [inputs], [native-inputs] and [propagated-inputs] have been the sole reason for inheriting. Remove now needless [properties] "python2-variant" where applicable. (python2-lockfile, python2-keyring, python2-dateutil-2, python2-parsedatetime, python2-pandas, python2-pyicu, python2-pytest-cov, python2-pytest-runner, python2-pytest-xdist, python2-cov-core, python2-itsdangerous, python2-numexpr, python2-q, python2-sqlalchemy-utils, python2-alembic, python2-beautifulsoup4, python2-msgpack, python2-ipaddress, python2-atomicwrites, python2-apipkg, python2-execnet, python2-pytest-cache, python2-wtforms, python2-mako, python2-waitress, python2-wsgiproxy2, python2-pyquery, python2-webtest, python2-translitcodec, python2-editor, python2-sphinxcontrib-programoutput, python2-psycopg2, python2-vobject, python2-flask, python2-cookies, python2-responses, python2-future, python2-ply, python2-wcwidth, python2-prompt-toolkit, python2-jedi, python2-requests-oauthlib, python2-pyserial, python2-nltk, python2-pymongo, python2-sh, python2-schematics, python2-publicsuffix, python2-publicsuffix2, python2-url, python2-freezegun, python2-cachecontrol, python2-lit, python2-pytest-pep8, python2-pytest-flakes, python2-glances, python2-betamax, python2-file, python2-flask-babel, python2-furl, python2-imagesize python2-orderedmultidict, python2-pycodestyle, python2-vcversioner, python2-graphql-core, python2-graphql-relay, python2-validictory): Remove neesless input "python2-setuptools", don't inherit, don't call strip-python2-variant. (python-lockfile, python-keyring, python-dateutil-2, python-parsedatetime, python-pandas, python-pyicu, python-pytest-cov, python-pytest-runner, python-pytest-xdist, python-cov-core, python-itsdangerous, python-numexpr, python-q, python-sqlalchemy-utils, python-alembic, python-beautifulsoup4, python-msgpack, python-ipaddress, python-atomicwrites, python-apipkg, python-execnet, python-pytest-cache, python-wtforms, python-mako, python-waitress, python-wsgiproxy2, python-pyquery, python-webtest, python-translitcodec, python-editor, python-sphinxcontrib-programoutput, python-psycopg2, python-vobject, python-flask, python-cookies, python-responses, python-future, python-ply, python-wcwidth, python-prompt-toolkit, python-jedi, python-requests-oauthlib, python-pyserial, python-nltk, python-pymongo, python-sh, python-schematics, python-nltk, python-publicsuffix2, python-cachecontrol, python-lit, python-pytest-pep8, python-pytest-flakes, python-glances, python-betamax, python-file, python-flask-babel, python-furl, python-imagesize, python-orderedmultidict, python-pycodestyle, python-vcversioner, python-graphql-core, python-graphql-relay, python-validictory): Remove "python2-variant" property. --- gnu/packages/python.scm | 604 +++++++++++------------------------------------- 1 file changed, 130 insertions(+), 474 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 66c01d1dd9..02e2900d2c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -780,15 +780,10 @@ concepts.") (description "The lockfile package exports a LockFile class which provides a simple API for locking files.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-lockfile)))))) + (license license:expat))) (define-public python2-lockfile - (let ((base (package-with-python2 (strip-python2-variant python-lockfile)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-lockfile)) (define-public python-mock (package @@ -917,15 +912,10 @@ etc.). The package is structured to make adding new modules easy.") service from python. It can be used in any application that needs safe password storage.") ;; "MIT" and PSF dual license - (license license:x11) - (properties `((python2-variant . ,(delay python2-keyring)))))) + (license license:x11))) (define-public python2-keyring - (let ((base (package-with-python2 (strip-python2-variant python-keyring)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-keyring)) (define-public python-six (package @@ -971,15 +961,10 @@ Python file, so it can be easily copied into your project.") (description "The dateutil module provides powerful extensions to the standard datetime module, available in Python 2.3+.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-dateutil-2)))))) + (license license:bsd-3))) (define-public python2-dateutil-2 - (let ((base (package-with-python2 (strip-python2-variant python-dateutil-2)))) - (package - (inherit base) - (inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-inputs base)))))) + (package-with-python2 python-dateutil-2)) (define-public python-dateutil (package @@ -1024,15 +1009,10 @@ datetime module, available in Python 2.3+.") "Parse human-readable date/time text") (description "Parse human-readable date/time text.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-parsedatetime)))))) + (license license:asl2.0))) (define-public python2-parsedatetime - (let ((base (package-with-python2 (strip-python2-variant python-parsedatetime)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-parsedatetime)) (define-public python-pandas (package @@ -1063,15 +1043,10 @@ structures designed to make working with structured (tabular, multidimensional, potentially heterogeneous) and time series data both easy and intuitive. It aims to be the fundamental high-level building block for doing practical, real world data analysis in Python.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-pandas)))))) + (license license:bsd-3))) (define-public python2-pandas - (let ((base (package-with-python2 (strip-python2-variant python-pandas)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pandas)) (define-public python-tzlocal (package @@ -1206,14 +1181,10 @@ Python 3.3+.") (synopsis "Python extension wrapping the ICU C++ API") (description "PyICU is a python extension wrapping the ICU C++ API.") - (license license:x11) - (properties `((python2-variant . ,(delay python2-pyicu)))))) + (license license:x11))) (define-public python2-pyicu - (package - (inherit (package-with-python2 - (strip-python2-variant python-pyicu))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-pyicu)) (define-public python2-dogtail ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and @@ -1698,15 +1669,10 @@ and many external plugins.") "Pytest-cov produces coverage reports. It supports centralised testing and distributed testing in both @code{load} and @code{each} modes. It also supports coverage of subprocesses.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-pytest-cov)))))) + (license license:expat))) (define-public python2-pytest-cov - (let ((base (package-with-python2 (strip-python2-variant python-pytest-cov)))) - (package - (inherit base) - (inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-inputs base)))))) + (package-with-python2 python-pytest-cov)) (define-public python-pytest-runner (package @@ -1739,16 +1705,10 @@ supports coverage of subprocesses.") (description "This package provides a @command{pytest-runner} command that @file{setup.py} files can use to run tests.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-pytest-runner)))))) + (license license:expat))) (define-public python2-pytest-runner - (let ((base (package-with-python2 - (strip-python2-variant python-pytest-runner)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pytest-runner)) (define-public python-pytest-mock (package @@ -1825,16 +1785,10 @@ to run tests repeatedly when failed, and the ability to run tests on multiple Python interpreters or platforms. It uses rsync to copy the existing program code to a remote location, executes there, and then syncs the result back.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-pytest-xdist)))))) + (license license:expat))) (define-public python2-pytest-xdist - (let ((base (package-with-python2 - (strip-python2-variant python-pytest-xdist)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pytest-xdist)) (define-public python-scripttest (package @@ -2178,15 +2132,10 @@ executed.") (description "This is a library package for use by pytest-cov, nose-cov and nose2-cov. It is useful for developing coverage plugins for these testing frameworks.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-cov-core)))))) + (license license:expat))) (define-public python2-cov-core - (let ((cov-core (package-with-python2 (strip-python2-variant python-cov-core)))) - (package (inherit cov-core) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs cov-core)))))) + (package-with-python2 python-cov-core)) (define-public python-discover (package @@ -2431,15 +2380,10 @@ than Python’s urllib2 library.") information in a variety of version control systems in order to discover version numbers.") (home-page "https://github.com/habnabit/vcversioner") - (license license:isc) - (properties `((python2-variant . ,(delay python2-vcversioner)))))) + (license license:isc))) (define-public python2-vcversioner - (let ((vcversioner (package-with-python2 - (strip-python2-variant python-vcversioner)))) - (package (inherit vcversioner) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs vcversioner)))))) + (package-with-python2 python-vcversioner)) (define-public python-jsonschema (package @@ -2581,16 +2525,10 @@ OAuth request-signing logic.") (description "Itsdangerous provides various helpers to pass trusted data to untrusted environments and back.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-itsdangerous)))))) + (license license:bsd-3))) (define-public python2-itsdangerous - (let ((base (package-with-python2 - (strip-python2-variant python-itsdangerous)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-itsdangerous)) (define-public python-pyyaml (package @@ -3452,11 +3390,10 @@ doing the same calculation in Python. In addition, its multi-threaded capabilities can make use of all your cores, which may accelerate computations, most specially if they are not memory-bounded (e.g. those using transcendental functions).") - (license license:expat) - (properties `((python2-variant . ,(delay python2-numexpr)))))) + (license license:expat))) (define-public python2-numexpr - (package-with-python2 (strip-python2-variant python-numexpr))) + (package-with-python2 python-numexpr)) (define-public python-matplotlib (package @@ -3845,16 +3782,10 @@ simple and Pythonic domain language.") (description "@code{pycodestyle} (formerly pep8) is a tool to check Python code against some of the style conventions in @url{http://www.python.org/dev/peps/pep-0008/,PEP 8}.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-pycodestyle)))))) + (license license:expat))) (define-public python2-pycodestyle - (let ((base (package-with-python2 (strip-python2-variant - python-pycodestyle)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pycodestyle)) (define-public python-orderedmultidict (package @@ -3887,16 +3818,10 @@ Python code against some of the style conventions in dictionaries. A multivalue dictionary is a dictionary that can store multiple values for the same key. An ordered multivalue dictionary is a multivalue dictionary that retains the order of insertions and deletions.") - (license license:unlicense) - (properties `((python2-variant . ,(delay python2-orderedmultidict)))))) + (license license:unlicense))) (define-public python2-orderedmultidict - (let ((base (package-with-python2 (strip-python2-variant - python-orderedmultidict)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-orderedmultidict)) (define-public python-furl (package @@ -3919,16 +3844,10 @@ multivalue dictionary that retains the order of insertions and deletions.") (synopsis "URL manipulation in Python") (description "Furl provides an easy-to-use alternative to the @code{urllib} and @code{urlparse} modules for manipulating URLs.") - (license license:unlicense) - (properties `((python2-variant . ,(delay python2-furl)))))) + (license license:unlicense))) (define-public python2-furl - (let ((base (package-with-python2 (strip-python2-variant - python-furl)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-furl)) (define-public python-flask-babel (package @@ -3952,16 +3871,10 @@ multivalue dictionary that retains the order of insertions and deletions.") (description "This package implements internationalization and localization support for Flask. This is based on the Python babel module as well as pytz - both of which are installed automatically if you install this library.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-flask-babel)))))) + (license license:bsd-3))) (define-public python2-flask-babel - (let ((base (package-with-python2 (strip-python2-variant - python-flask-babel)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-flask-babel)) (define-public python-sqlalchemy-utils (package @@ -3997,16 +3910,10 @@ You might also want to install the following optional dependencies: @item @code{python-flask-babel} @end enumerate ") - (properties `((python2-variant . ,(delay python2-sqlalchemy-utils)))) (license license:bsd-3))) (define-public python2-sqlalchemy-utils - (let ((base (package-with-python2 - (strip-python2-variant python-sqlalchemy-utils)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-sqlalchemy-utils)) (define-public python-alembic (package @@ -4033,16 +3940,10 @@ You might also want to install the following optional dependencies: (description "Alembic is a lightweight database migration tool for usage with the SQLAlchemy Database Toolkit for Python.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-alembic)))))) + (license license:expat))) (define-public python2-alembic - (let ((alembic (package-with-python2 - (strip-python2-variant python-alembic)))) - (package - (inherit alembic) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs alembic)))))) + (package-with-python2 python-alembic)) (define-public python-distutils-extra (package @@ -5130,14 +5031,12 @@ screen-scraping projects. It offers Pythonic idioms for navigating, searching, and modifying a parse tree, providing a toolkit for dissecting a document and extracting what you need. It automatically converts incoming documents to Unicode and outgoing documents to UTF-8.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-beautifulsoup4)))))) + (license license:expat))) (define-public python2-beautifulsoup4 (package (inherit (package-with-python2 (strip-python2-variant python-beautifulsoup4))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))) (arguments `(#:python ,python-2)))) (define-public python2-cssutils @@ -5345,16 +5244,10 @@ as possible in order to be comprehensible and easily extensible.") "q is a Python module for \"print\" style of debugging Python code. It provides convenient short API for print out of values, tracebacks, and falling into the Python interpreter.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-q)))))) + (license license:asl2.0))) (define-public python2-q - (let ((base (package-with-python2 (strip-python2-variant python-q)))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-q)) (define-public python-testlib (package @@ -6001,14 +5894,10 @@ should be stored on various operating systems.") suitable for similar data to JSON. This package provides CPython bindings for reading and writing MessagePack data.") (home-page "https://pypi.python.org/pypi/msgpack-python/") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-msgpack)))))) + (license license:asl2.0))) (define-public python2-msgpack - (package (inherit (package-with-python2 - (strip-python2-variant python-msgpack))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-msgpack)) (define-public python-netaddr (package @@ -6312,15 +6201,10 @@ implementations of ASN.1-based codecs and protocols.") in Python. This library is used to create, poke at, and manipulate IPv4 and IPv6 addresses and networks. This is a port of the Python 3.3 ipaddress module to older versions of Python.") - (license license:psfl) - (properties `((python2-variant . ,(delay python2-ipaddress)))))) + (license license:psfl))) (define-public python2-ipaddress - (let ((base (package-with-python2 (strip-python2-variant python-ipaddress)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-ipaddress)) (define-public python2-ipaddr (package @@ -6688,17 +6572,10 @@ Python's @code{ctypes} foreign function interface (FFI).") (synopsis "Python bindings to the libmagic file type guesser. Note that this module and the python-magic module both provide a \"magic.py\" file; these two modules, which are different and were developed separately, both -serve the same purpose: provide Python bindings for libmagic.") - (properties `((python2-variant . ,(delay python2-file)))))) +serve the same purpose: provide Python bindings for libmagic."))) (define-public python2-file - (let ((base (package-with-python2 (strip-python2-variant python-file)))) - (package - (inherit base) - (source (package-source file)) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-file)) (define-public python-debian (package @@ -7708,14 +7585,10 @@ WebSocket usage in Python programs.") (description "Library for atomic file writes using platform dependent tools for atomic file system operations.") (home-page "https://github.com/untitaker/python-atomicwrites") - (license license:expat) - (properties `((python2-variant . ,(delay python2-atomicwrites)))))) + (license license:expat))) (define-public python2-atomicwrites - (package (inherit (package-with-python2 - (strip-python2-variant python-atomicwrites))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-atomicwrites)) (define-public python-requests-toolbelt (package @@ -7802,15 +7675,10 @@ applications.") package and greatly reduce the number of imports for your users. It is a small pure Python module that works on virtually all Python versions.") (home-page "https://bitbucket.org/hpk42/apipkg") - (license license:expat) - (properties `((python2-variant . ,(delay python2-apipkg)))))) + (license license:expat))) (define-public python2-apipkg - (package - (inherit (package-with-python2 - (strip-python2-variant python-apipkg))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-apipkg)) (define-public python-execnet (package @@ -7844,17 +7712,10 @@ minimal and fast API targetting the following uses: @item write scripts to administer multiple environments @end enumerate") (home-page "http://codespeak.net/execnet/") - (license license:expat) - (properties `((python2-variant . ,(delay python2-execnet)))))) + (license license:expat))) (define-public python2-execnet - (let ((execnet (package-with-python2 - (strip-python2-variant python-execnet)))) - (package - (inherit execnet) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs execnet)))))) + (package-with-python2 python-execnet)) ;;; The software provided by this package was integrated into pytest 2.8. (define-public python-pytest-cache @@ -7877,17 +7738,10 @@ minimal and fast API targetting the following uses: (description "The pytest-cache plugin provides tools to rerun failures from the last py.test invocation.") (home-page "https://bitbucket.org/hpk42/pytest-cache/") - (license license:expat) - (properties `((python2-variant . ,(delay python2-pytest-cache)))))) + (license license:expat))) (define-public python2-pytest-cache - (let ((pytest-cache (package-with-python2 - (strip-python2-variant python-pytest-cache)))) - (package - (inherit pytest-cache) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs pytest-cache)))))) + (package-with-python2 python-pytest-cache)) (define-public python-pytest-localserver (package @@ -8564,14 +8418,10 @@ python-xdo for newer bindings.)") "WTForms is a flexible forms validation and rendering library for Python web development. It is very similar to the web form API available in Django, but is a standalone package.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-wtforms)))))) + (license license:bsd-3))) (define-public python2-wtforms - (package - (inherit (package-with-python2 - (strip-python2-variant python-wtforms))) - (inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-wtforms)) (define-public python-mako (package @@ -8593,17 +8443,10 @@ available in Django, but is a standalone package.") (synopsis "Templating language for Python") (description "Mako is a templating language for Python that compiles templates into Python modules.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-mako)))))) + (license license:expat))) (define-public python2-mako - (let ((base (package-with-python2 - (strip-python2-variant python-mako)))) - (package - (inherit base) - (native-inputs - (cons `("python2-setuptools" ,python2-setuptools) - (package-native-inputs base)))))) + (package-with-python2 python-mako)) (define-public python-waitress (package @@ -8621,14 +8464,10 @@ templates into Python modules.") (synopsis "Waitress WSGI server") (description "Waitress is meant to be a production-quality pure-Python WSGI server with very acceptable performance.") - (license license:zpl2.1) - (properties `((python2-variant . ,(delay python2-waitress)))))) + (license license:zpl2.1))) (define-public python2-waitress - (package - (inherit (package-with-python2 - (strip-python2-variant python-waitress))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-waitress)) (define-public python-wsgiproxy2 (package @@ -8661,16 +8500,10 @@ server with very acceptable performance.") WSGIProxy turns WSGI function calls into HTTP requests. It also includes code to sign requests and pass private data, and to spawn subprocesses to handle requests.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-wsgiproxy2)))))) + (license license:expat))) (define-public python2-wsgiproxy2 - (let ((wsgiproxy2 (package-with-python2 - (strip-python2-variant python-wsgiproxy2)))) - (package - (inherit wsgiproxy2) - (inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-inputs wsgiproxy2)))))) + (package-with-python2 python-wsgiproxy2)) (define-public python-pastedeploy (package @@ -8805,16 +8638,10 @@ layouts.") (description "pyquery allows you to make jQuery queries on xml documents. The API is as much as possible the similar to jQuery. pyquery uses lxml for fast xml and html manipulation.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-pyquery)))))) + (license license:bsd-3))) (define-public python2-pyquery - (let ((pyquery (package-with-python2 - (strip-python2-variant python-pyquery)))) - (package - (inherit pyquery) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs pyquery)))))) + (package-with-python2 python-pyquery)) (define-public python-webtest (package @@ -8857,16 +8684,10 @@ fast xml and html manipulation.") (description "Webtest allows you to test your Python web applications without starting an HTTP server. It supports anything that supports the minimum of WSGI.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-webtest)))))) + (license license:expat))) (define-public python2-webtest - (let ((webtest (package-with-python2 - (strip-python2-variant python-webtest)))) - (package - (inherit webtest) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs webtest)))))) + (package-with-python2 python-webtest)) (define-public python-anyjson (package @@ -9086,14 +8907,10 @@ synchronously (wait until ready).") "This package contains codecs for transliterating ISO 10646 texts into best-effort representations using smaller coded character sets (ASCII, ISO 8859, etc.).") - (license license:expat) - (properties `((python2-variant . ,(delay python2-translitcodec)))))) + (license license:expat))) (define-public python2-translitcodec - (package - (inherit (package-with-python2 - (strip-python2-variant python-translitcodec))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-translitcodec)) (define-public python-editor (package @@ -9114,14 +8931,10 @@ ISO 8859, etc.).") (description "python-editor is a library that provides the editor module for programmatically interfacing with your system's $EDITOR.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-editor)))))) + (license license:asl2.0))) (define-public python2-editor - (package - (inherit (package-with-python2 - (strip-python2-variant python-editor))) - (inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-editor)) (define-public python-sphinxcontrib-programoutput (package @@ -9141,14 +8954,10 @@ programmatically interfacing with your system's $EDITOR.") (description "A Sphinx extension to literally insert the output of arbitrary commands into documents, helping you to keep your command examples up to date.") (home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput") - (license license:bsd-2) - (properties `((python2-variant . ,(delay python2-sphinxcontrib-programoutput)))))) + (license license:bsd-2))) (define-public python2-sphinxcontrib-programoutput - (package - (inherit (package-with-python2 - (strip-python2-variant python-sphinxcontrib-programoutput))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-sphinxcontrib-programoutput)) (define-public python-sphinx-repoze-autointerface (package @@ -9197,14 +9006,10 @@ introspection of @code{zope.interface} instances in code.") (synopsis "Python PostgreSQL adapter") (description "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API 2.0. ") - (license license:lgpl3+) - (properties `((python2-variant . ,(delay python2-psycopg2)))))) + (license license:lgpl3+))) (define-public python2-psycopg2 - (package - (inherit (package-with-python2 - (strip-python2-variant python-psycopg2))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-psycopg2)) (define-public python-vobject (package @@ -9230,14 +9035,10 @@ are supported and well tested. vCard 3.0 files are supported, and all data should be imported, but only a few components are understood in a sophisticated way.") (home-page "http://eventable.github.io/vobject/") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-vobject)))))) + (license license:asl2.0))) (define-public python2-vobject - (package - (inherit (package-with-python2 - (strip-python2-variant python-vobject))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-vobject)) (define-public python-munkres (package @@ -9282,13 +9083,10 @@ useful for solving the Assignment Problem.") (description "Flask is a micro web framework based on the Werkzeug toolkit and Jinja2 template engine. It is called a micro framework because it does not presume or force a developer to use a particular tool or library.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-flask)))))) + (license license:bsd-3))) (define-public python2-flask - (package (inherit (package-with-python2 - (strip-python2-variant python-flask))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-flask)) (define-public python-cookies (package @@ -9310,15 +9108,10 @@ presume or force a developer to use a particular tool or library.") (description "A RFC 6265-compliant HTTP cookie parser and renderer in Python.") (home-page "https://gitlab.com/sashahart/cookies") - (license license:expat) - (properties `((python2-variant . ,(delay python2-cookies)))))) + (license license:expat))) (define-public python2-cookies - (let ((cookies (package-with-python2 - (strip-python2-variant python-cookies)))) - (package (inherit cookies) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs cookies)))))) + (package-with-python2 python-cookies)) (define-public python-responses (package @@ -9345,15 +9138,10 @@ Python.") (synopsis "Utility for mocking out the `requests` Python library") (description "A utility library for mocking out the `requests` Python library.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-responses)))))) + (license license:asl2.0))) (define-public python2-responses - (let ((responses (package-with-python2 - (strip-python2-variant python-responses)))) - (package (inherit responses) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs responses)))))) + (package-with-python2 python-responses)) (define-public python-whoosh (package @@ -9752,15 +9540,10 @@ development version of CPython that are not available in older releases.") "@code{python-future} is the missing compatibility layer between Python 2 and Python 3. It allows you to use a single, clean Python 3.x-compatible codebase to support both Python 2 and Python 3 with minimal overhead.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-future)))))) + (license license:expat))) (define-public python2-future - (let ((base (package-with-python2 - (strip-python2-variant python-future)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools)))))) + (package-with-python2 python-future)) (define-public python-cysignals (package @@ -10095,14 +9878,10 @@ network support library.") (synopsis "Python Lex & Yacc") (description "PLY is a @code{lex}/@code{yacc} implemented purely in Python. It uses LR parsing and does extensive error checking.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-ply)))))) + (license license:bsd-3))) (define-public python2-ply - (package - (inherit (package-with-python2 - (strip-python2-variant python-ply))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-ply)) (define-public python-tabulate (package @@ -10215,14 +9994,10 @@ wide-character codes. It is useful for those implementing a terminal emulator, or programs that carefully produce output to be interpreted by one. It is a Python implementation of the @code{wcwidth} and @code{wcswidth} C functions specified in POSIX.1-2001 and POSIX.1-2008.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-wcwidth)))))) + (license license:expat))) (define-public python2-wcwidth - (package - (inherit (package-with-python2 - (strip-python2-variant python-wcwidth))) - (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (package-with-python2 python-wcwidth)) (define-public python2-jsonrpclib (package @@ -10609,16 +10384,10 @@ interfaces in Python. It's like GNU Readline but it also features syntax highlighting while typing, out-of-the-box multi-line input editing, advanced code completion, incremental search, support for Chinese double-width characters, mouse support, and auto suggestions.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-prompt-toolkit)))))) + (license license:bsd-3))) (define-public python2-prompt-toolkit - (let ((base (package-with-python2 (strip-python2-variant python-prompt-toolkit)))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-prompt-toolkit)) (define-public python-jedi (package @@ -10637,16 +10406,10 @@ characters, mouse support, and auto suggestions.") "Autocompletion for Python that can be used for text editors") (description "Jedi is an autocompletion tool for Python that can be used for text editors.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-jedi)))))) + (license license:expat))) (define-public python2-jedi - (let ((base (package-with-python2 (strip-python2-variant python-jedi)))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-jedi)) (define-public ptpython (package @@ -10713,15 +10476,10 @@ etc.") (description "Requests-OAuthlib uses the Python Requests and OAuthlib libraries to provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients.") - (license license:isc) - (properties `((python2-variant . ,(delay python2-requests-oauthlib)))))) + (license license:isc))) (define-public python2-requests-oauthlib - (let ((base (package-with-python2 (strip-python2-variant python-requests-oauthlib)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-requests-oauthlib)) (define-public python-stem (package @@ -10777,16 +10535,10 @@ relays publish about themselves.") (description "@code{pyserial} provide serial port bindings for Python. It supports different byte sizes, stop bits, parity and flow control with RTS/CTS and/or Xon/Xoff. The port is accessed in RAW mode.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-pyserial)))))) + (license license:bsd-3))) (define-public python2-pyserial - (let ((base (package-with-python2 (strip-python2-variant python-pyserial)))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pyserial)) (define-public python-kivy (package @@ -10901,15 +10653,10 @@ binary or text.") resources such as WordNet, along with a suite of text processing libraries for classification, tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for natural language processing libraries.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-nltk)))))) + (license license:asl2.0))) (define-public python2-nltk - (let ((base (package-with-python2 (strip-python2-variant python-nltk)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-nltk)) (define-public python-pymongo (package @@ -10927,15 +10674,10 @@ reasoning, wrappers for natural language processing libraries.") (home-page "http://github.com/mongodb/mongo-python-driver") (synopsis "Python driver for MongoDB") (description "Python driver for MongoDB.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-pymongo)))))) + (license license:asl2.0))) (define-public python2-pymongo - (let ((base (package-with-python2 (strip-python2-variant python-pymongo)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pymongo)) (define-public python-sh (package @@ -10954,15 +10696,10 @@ reasoning, wrappers for natural language processing libraries.") (synopsis "Python subprocess interface") (description "Abstracts process invocation by providing a function interface for programs.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-sh)))))) + (license license:expat))) (define-public python2-sh - (let ((base (package-with-python2 (strip-python2-variant python-sh)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-sh)) (define-public python-consul (package @@ -10988,11 +10725,7 @@ discovery, monitoring and configuration.") (license license:expat))) (define-public python2-consul - (let ((consul (package-with-python2 python-consul))) - (package (inherit consul) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs consul)))))) + (package-with-python2 python-consul)) (define-public python-schematics (package @@ -11016,15 +10749,10 @@ discovery, monitoring and configuration.") (home-page "https://github.com/schematics/schematics") (synopsis "Python Data Structures for Humans") (description "Python Data Structures for Humans.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-schematics)))))) + (license license:bsd-3))) (define-public python2-schematics - (let ((base (package-with-python2 (strip-python2-variant python-schematics)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-schematics)) (define-public python-publicsuffix (package @@ -11043,15 +10771,10 @@ discovery, monitoring and configuration.") (synopsis "Get suffix for a domain name") (description "Get a public suffix for a domain name using the Public Suffix List.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-nltk)))))) + (license license:expat))) (define-public python2-publicsuffix - (let ((base (package-with-python2 (strip-python2-variant python-publicsuffix)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-publicsuffix)) (define-public python-publicsuffix2 (package @@ -11071,15 +10794,10 @@ List.") (synopsis "Get a public suffix for a domain name using the Public Suffix List") (description "Get a public suffix for a domain name using the Public Suffix List. Forked from and using the same API as the publicsuffix package.") - (license (list license:expat license:mpl2.0)) - (properties `((python2-variant . ,(delay python2-publicsuffix2)))))) + (license (list license:expat license:mpl2.0)))) (define-public python2-publicsuffix2 - (let ((base (package-with-python2 (strip-python2-variant python-publicsuffix2)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-publicsuffix2)) (define-public python-url (package @@ -11109,10 +10827,7 @@ List. Forked from and using the same API as the publicsuffix package.") (let ((base (package-with-python2 (strip-python2-variant python-url)))) (package (inherit base) (inputs - `(("python2-publicsuffix" ,python2-publicsuffix))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + `(("python2-publicsuffix" ,python2-publicsuffix)))))) (define-public python-freezegun (package @@ -11148,11 +10863,8 @@ time by mocking the datetime module.") (license license:asl2.0))) (define-public python2-freezegun - (let ((base (package-with-python2 (strip-python2-variant python-freezegun)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-freezegun)) + (define-public python-odfpy (package @@ -11229,15 +10941,10 @@ Python to manipulate OpenDocument 1.2 files.") (synopsis "The httplib2 caching algorithms for use with requests") (description "CacheControl is a port of the caching algorithms in @code{httplib2} for use with @code{requests} session objects.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-cachecontrol)))))) + (license license:asl2.0))) (define-public python2-cachecontrol - (let ((base (package-with-python2 (strip-python2-variant python-cachecontrol)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-cachecontrol)) (define-public python-lit (package @@ -11256,16 +10963,10 @@ Python to manipulate OpenDocument 1.2 files.") (description "@code{lit} is a portable tool for executing LLVM and Clang style test suites, summarizing their results, and providing indication of failures.") - (license license:ncsa) - (properties `((python2-variant . ,(delay python2-lit)))))) + (license license:ncsa))) (define-public python2-lit - (let ((base (package-with-python2 (strip-python2-variant python-lit)))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-lit)) (define-public python-pytest-pep8 (package @@ -11290,15 +10991,10 @@ failures.") (home-page "https://bitbucket.org/pytest-dev/pytest-pep8") (synopsis "Py.test plugin to check PEP8 requirements") (description "Pytest plugin for checking PEP8 compliance.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-pytest-pep8)))))) + (license license:expat))) (define-public python2-pytest-pep8 - (let ((base (package-with-python2 (strip-python2-variant python-pytest-pep8)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pytest-pep8)) (define-public python-pytest-flakes (package @@ -11331,15 +11027,10 @@ failures.") (home-page "https://github.com/fschulze/pytest-flakes") (synopsis "Py.test plugin to check source code with pyflakes") (description "Pytest plugin for checking Python source code with pyflakes.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-pytest-flakes)))))) + (license license:expat))) (define-public python2-pytest-flakes - (let ((base (package-with-python2 (strip-python2-variant python-pytest-flakes)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pytest-flakes)) (define-public python-natsort (package @@ -11411,16 +11102,10 @@ functionality in the command line.") "Glances is a curses-based monitoring tool for a wide variety of platforms. Glances uses the PsUtil library to get information from your system. It monitors CPU, load, memory, network bandwidth, disk I/O, disk use, and more.") - (license license:lgpl3+) - (properties `((python2-variant . ,(delay python2-glances)))))) + (license license:lgpl3+))) (define-public python2-glances - (let ((base (package-with-python2 (strip-python2-variant python-glances)))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-glances)) (define-public python-graphql-core (package @@ -11457,16 +11142,10 @@ CPU, load, memory, network bandwidth, disk I/O, disk use, and more.") runtime designed and used to request and deliver data to mobile and web apps. This library is a port of @url{https://github.com/graphql/graphql-js,graphql-js} to Python.") - (properties `((python2-variant . ,(delay python2-graphql-core)))) (license license:expat))) (define-public python2-graphql-core - (let ((base (package-with-python2 - (strip-python2-variant python-graphql-core)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-graphql-core)) (define-public python-graphql-relay (package @@ -11494,16 +11173,10 @@ using the GraphQL Python reference implementation of a GraphQL server. It should be noted that the code is a exact port of the original @url{https://github.com/graphql/graphql-relay-js,graphql-relay js implementation} from Facebook.") - (properties `((python2-variant . ,(delay python2-graphql-relay)))) (license license:expat))) (define-public python2-graphql-relay - (let ((base (package-with-python2 - (strip-python2-variant python-graphql-relay)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-graphql-relay)) (define-public python-graphene (package @@ -11603,16 +11276,10 @@ focus on building massively scalable web applications.") (synopsis "Record HTTP interactions with python-requests") (description "Betamax will record your test suite's HTTP interactions and replay them during future tests. It is designed to work with python-requests.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-betamax)))))) + (license license:expat))) (define-public python2-betamax - (let ((base (package-with-python2 (strip-python2-variant python-betamax)))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-betamax)) (define-public python-s3transfer (package @@ -11751,16 +11418,10 @@ is used by PostgreSQL and the OpenSSH Server for example.") The schema format is based on the JSON Schema proposal (http://json-schema.org), so combined with json the library is also useful as a validator for JSON data.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-validictory)))))) + (license license:expat))) (define-public python2-validictory - (let ((base (package-with-python2 - (strip-python2-variant python-validictory)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-validictory)) (define-public python-aniso8601 (package @@ -11914,15 +11575,10 @@ useful as a validator for JSON data.") (description "This package allows determination of image size from PNG, JPEG, JPEG2000 and GIF files in pure Python.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-imagesize)))))) + (license license:expat))) (define-public python2-imagesize - (let ((base (package-with-python2 (strip-python2-variant python-imagesize)))) - (package - (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-imagesize)) (define-public python-axolotl-curve25519 (package -- cgit v1.2.3 From d8013ee221bd599474340899ffb5974796091955 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 14:36:46 +0200 Subject: gnu: Remove needless inputs python-pip and python2-pip. This is installed together with Python 3 anyway and for our build of Python 2. * gnu/packages/python.scm (python2-fixtures): [inputs] remove "python-pip". * gnu/packages/pdf.scm (python2-reportlab): [native-inputs] remove "python2-pip". (python-reportlab)[properties]: remove "python2-variant". --- gnu/packages/pdf.scm | 8 ++------ gnu/packages/python.scm | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 171f1990f7..e447ef1603 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -650,14 +650,10 @@ using a stylus.") (description "This is the ReportLab PDF Toolkit. It allows rapid creation of rich PDF documents, and also creation of charts in a variety of bitmap and vector formats.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-reportlab)))))) + (license license:bsd-3))) (define-public python2-reportlab - (package - (inherit (package-with-python2 - (strip-python2-variant python-reportlab))) - (native-inputs `(("python2-pip" ,python2-pip))))) + (package-with-python2 python-reportlab)) (define-public impressive (package diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 02e2900d2c..f103706533 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2044,8 +2044,7 @@ and sensible default behaviors into your setuptools run.") `(("python-six" ,python-six) ("python-pbr-0.11" ,python-pbr-0.11))) (inputs - `(("python-pip" ,python-pip) - ;; Tests + `(;; Tests ("python-testtools" ,python-testtools))) (arguments '(#:tests? #f)) ; no setup.py test command -- cgit v1.2.3 From b41a05ce497d5ecc682cf46ce61aa2215193f9f6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 15:23:10 +0200 Subject: gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs). Bug 20765 is solved since we build all Python packages using option "--single-version-externally-managed". * gnu/packages/bioinformatics.scm (pbtranscript-tofu): Remove configure-flags. (pepr): remove phase "disable-egg-generation". * gnu/packages/pdf.scm (reportlab): Remove configure-flags. * gnu/packages/python.scm (python-sphinx-rtd-theme, python2-elib.intl, python-pkgconfig, python-pytest-pep8, python-pytest-flakes): Remove configure-flags. (python-pillow) remove phase "disable-egg-generation". (python-libarchive-c) Remove patching setup.cfg. * gnu/packages/statistics.scm (python-patsy): remove phase "prevent-generation-of-egg-archive". * gnu/packages/tls.scm (python-acme): remove phase "disable-egg-compression". * gnu/packages/tor.scm (onionshare): Remove configure-flags. --- gnu/packages/bioinformatics.scm | 19 +---------------- gnu/packages/pdf.scm | 5 ----- gnu/packages/python.scm | 47 ++++------------------------------------- gnu/packages/statistics.scm | 8 +------ gnu/packages/tls.scm | 9 -------- gnu/packages/tor.scm | 6 +----- 6 files changed, 7 insertions(+), 87 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 481a2a3bcb..9872933693 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3563,11 +3563,6 @@ the phenotype as it models the data.") (build-system python-build-system) (arguments `(#:python ,python-2 - ;; With standard flags, the install phase attempts to create a zip'd - ;; egg file, and fails with an error: 'ZIP does not support timestamps - ;; before 1980' - #:configure-flags '("--single-version-externally-managed" - "--record=pbtranscript-tofu.txt") #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-directory @@ -7576,19 +7571,7 @@ may optionally be provided to further inform the peak-calling process.") (build-system python-build-system) (arguments `(#:python ,python-2 ; python2 only - #:tests? #f ; no tests included - #:phases - (modify-phases %standard-phases - ;; When setuptools is used a ".egg" archive is generated and - ;; installed. This makes it hard to actually run PePr. This issue - ;; has been reported upstream: - ;; https://github.com/shawnzhangyx/PePr/issues/9 - (add-after 'unpack 'disable-egg-generation - (lambda _ - (substitute* "setup.py" - (("from setuptools import setup") - "from distutils.core import setup")) - #t))))) + #:tests? #f)) ; no tests included (propagated-inputs `(("python2-numpy" ,python2-numpy) ("python2-scipy" ,python2-scipy) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e447ef1603..b86f5efbfa 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -638,11 +638,6 @@ using a stylus.") (base32 "0rz2pg04wnzjjm2f5a8ik9v8s54mv4xrjhv5liqjijqv6awh12gl")))) (build-system python-build-system) - (arguments - ;; Prevent creation of the egg. Without this flag, various artifacts - ;; from the build inputs end up in the final python3 output. It also - ;; works around https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 . - `(#:configure-flags '("--single-version-externally-managed" "--root=/"))) (propagated-inputs `(("python-pillow" ,python-pillow))) (home-page "http://www.reportlab.com") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f103706533..3fcd92dc83 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2800,12 +2800,6 @@ sources.") (base32 "19nw3rn7awplcdrz63kg1njqwkbymfg9lwn7l2grhdyhyr2gaa8g")))) (build-system python-build-system) - (arguments - `(;; With standard flags, the install phase attempts to create a zip'd - ;; egg file, and fails with an error: 'ZIP does not support timestamps - ;; before 1980' - #:configure-flags '("--single-version-externally-managed" - "--record=sphinx-rtd-theme.txt"))) (inputs `(("python-docutils" ,python-docutils) ("python-sphinx" ,python-sphinx))) @@ -3988,12 +3982,7 @@ Python's distutils.") (arguments ;; incompatible with Python 3 (exception syntax) `(#:python ,python-2 - #:tests? #f - ;; With standard flags, the install phase attempts to create a zip'd - ;; egg file, and fails with an error: 'ZIP does not support timestamps - ;; before 1980' - #:configure-flags '("--single-version-externally-managed" - "--record=elib.txt"))) + #:tests? #f)) (home-page "https://github.com/dieterv/elib.intl") (synopsis "Enhanced internationalization for Python") (description @@ -4026,17 +4015,6 @@ services for your Python modules and applications.") ;; Note: setuptools used at runtime for pkg_resources (arguments `(#:phases (modify-phases %standard-phases - (add-before - 'install 'disable-egg-compression - (lambda _ - ;; Leave the .egg uncompressed since compressing it would - ;; prevent the GC from identifying run-time dependencies. - ;; See . - (let ((port (open-file "setup.cfg" "a"))) - (display "\n[easy_install]\nzip_ok = 0\n" - port) - (close-port port) - #t))) (add-after 'install 'check-installed (lambda _ @@ -6520,15 +6498,7 @@ a hash value.") (substitute* "libarchive/ffi.py" (("find_library\\('archive'\\)") (string-append "'" libarchive - "/lib/libarchive.so'")))) - - ;; Do not make a compressed egg (see - ;; ). - (let ((port (open-file "setup.cfg" "a"))) - (display "\n[easy_install]\nzip_ok = 0\n" - port) - (close-port port) - #t)))))) + "/lib/libarchive.so'"))))))))) (inputs `(("libarchive" ,libarchive))) (home-page "https://github.com/Changaco/python-libarchive-c") @@ -9454,9 +9424,6 @@ CloudFront content delivery network.") `(;; Tests fail with "ValueError: _type_ 'v' not supported" on Python 3, ;; and on Python 2 they need the dl module deprecated since Python 2.6. #:tests? #f - ;; Prevent creation of the egg. This works around - ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 . - #:configure-flags '("--single-version-externally-managed" "--root=/") ;; Hard-code the path to pkg-config. #:phases (modify-phases %standard-phases @@ -10979,10 +10946,7 @@ failures.") "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3")))) (build-system python-build-system) (arguments - `(#:tests? #f ; Fails with recent pytest and pep8. See upstream issues #8 and #12. - ;; Prevent creation of the egg. This works around - ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 . - #:configure-flags '("--single-version-externally-managed" "--root=/"))) + `(#:tests? #f)) ; Fails with recent pytest and pep8. See upstream issues #8 and #12. (native-inputs `(("python-pytest" ,python-pytest))) (propagated-inputs @@ -11007,10 +10971,7 @@ failures.") "0flag3n33kbhyjrhzmq990rvg4yb8hhhl0i48q9hw0ll89jp28lw")))) (build-system python-build-system) (arguments - `(;; Prevent creation of the egg. This works around - ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 . - #:configure-flags '("--single-version-externally-managed" "--root=/") - #:phases + `(#:phases (modify-phases %standard-phases (delete 'check) (add-after 'install 'check diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 950c3ec64f..cca08d26a8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1394,13 +1394,7 @@ and fast file reading.") (arguments `(#:phases (modify-phases %standard-phases - (replace 'check (lambda _ (zero? (system* "nosetests" "-v")))) - (add-after 'unpack 'prevent-generation-of-egg-archive - (lambda _ - (substitute* "setup.py" - (("from setuptools import setup") - "from distutils.core import setup")) - #t))))) + (replace 'check (lambda _ (zero? (system* "nosetests" "-v"))))))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-scipy" ,python-scipy) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 608fd6a080..607fa33b27 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -437,15 +437,6 @@ security, and applying best practice development processes.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'install 'disable-egg-compression - (lambda _ - ;; Do not compress the egg. - ;; See . - (let ((port (open-file "setup.cfg" "a"))) - (display "\n[easy_install]\nzip_ok = 0\n" - port) - (close-port port) - #t))) (add-after 'install 'docs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index e6fbf6e005..fe079fb104 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -208,11 +208,7 @@ networks.") ;; After all the patching we run the tests after installing. ;; This is also a known issue: ;; https://github.com/micahflee/onionshare/issues/284 - (lambda _ (zero? (system* "nosetests" "test"))))) - ;; can't compress the egg because it expects to find all the resources - ;; inside the egg as though it were a folder. - #:configure-flags '("--single-version-externally-managed" "--root=/") - )) + (lambda _ (zero? (system* "nosetests" "test"))))))) (native-inputs `(("python-nose" ,python-nose))) (inputs -- cgit v1.2.3 From f22efa0152356da4755241de3726b6a254b49d11 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 13:33:43 +0200 Subject: gnu: Fix python inputs, part 1: all inputs become propagated-inputs. This patch contains the changes where all [inputs] are changed to [propagated-inputs] * gnu/packages/python.scm (python-passlib, python-paramiko, python-ccm, python-babel, python-keyring python-pandas, python-tzlocal, python-parse-type, python-nose2, python-pytest, python-pytest-mock, python-pytest-xdist, python-scripttest, python-testtools, python-pytest-cov, python-testscenarios, python-pbr-0.11, python-oauthlib, python-jinja2, python-sphinx, python-tzlocal, python-bugz, python2-pytest-mock, behave, pelican, sqlalchemy-utils, python-pygridtools, python-urwidtrees, python-tornado, python2-tornado, python-debian, python-execnet, python-pytest-cache, pytest-localserver, python-clint, python-rply, python-hy, python-rauth, python-rsa, python-celery, python-vobject, s3cmd, python-prompt-toolkit, ptpython, python-requests-oauthlib, python-stem, python-binaryornot, python2-binaryornot, python-nltk, python-pymongo, python-schematics, python-url, python2-url, python-freezegun, python-glances, python-graphql-core, python-graphql-relay, python-graphene, python-nautilus, python-s3transfer): All [inputs] become [propagated-inputs]. * gnu/packages/bioinformatics.scm (python-biopython): Likewise. * gnu/packages/django.scm (pytest-django): Likewise. * gnu/packages/mail.scm (python-mailmanclient): Likewise. * gnu/packages/password-utils.scm (python-bcrypt): Likewise. * gnu/packages/propbuf.scm (python-protobuf): Likewise. * gnu/packages/rdf.scm (python-rdflib): Likewise. SQACH all become propagated --- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/django.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/password-utils.scm | 2 +- gnu/packages/protobuf.scm | 2 +- gnu/packages/python.scm | 136 ++++++++++++++++++++-------------------- gnu/packages/rdf.scm | 2 +- 7 files changed, 74 insertions(+), 74 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9872933693..9cfb30023f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -669,7 +669,7 @@ provide a coordinated and extensible framework to do computational biology.") (add-before 'check 'set-home ;; Some tests require a home directory to be set. (lambda _ (setenv "HOME" "/tmp") #t))))) - (inputs + (propagated-inputs `(("python-numpy" ,python-numpy))) (home-page "http://biopython.org/") (synopsis "Tools for biological computation in Python") diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 804f681e59..2de80353f8 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -141,7 +141,7 @@ with arguments to the field constructor.") (native-inputs `(("python-django" ,python-django) ("python-setuptools-scm" ,python-setuptools-scm))) - (inputs + (propagated-inputs `(("python-py" ,python-py) ("python-pytest" ,python-pytest))) (home-page "http://pytest-django.readthedocs.org/") diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b44555c04d..bb7d16ce27 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1733,7 +1733,7 @@ for OpenSMTPD to extend its functionality.") (build-system python-build-system) (arguments `(#:tests? #f)) ; Requires mailman running - (inputs + (propagated-inputs `(("python-six" ,python-six) ("python-httplib2" ,python-httplib2))) (home-page "https://launchpad.net/mailman.client") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 2e3c3b0632..cf030ecc82 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -361,7 +361,7 @@ winner of the 2015 Password Hashing Competition.") (native-inputs `(("python-pycparser" ,python-pycparser) ("python-pytest" ,python-pytest))) - (inputs + (propagated-inputs `(("python-cffi" ,python-cffi) ("python-six" ,python-six))) (home-page "https://github.com/pyca/bcrypt/") diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index f4e9e88233..12f6f70521 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -63,7 +63,7 @@ internal RPC protocols and file formats.") (base32 "1xbgbfg4g43bihkyw1a2giqa2gxmqc5wkh0fzqcb90qi1z1hpi7c")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-six" ,python-six))) (home-page "https://github.com/google/protobuf") (synopsis "Protocol buffers is a data interchange format") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3fcd92dc83..3de73c76a5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -464,7 +464,7 @@ pidof, tty, taskset, pmap.") (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) - (inputs + (propagated-inputs `(("python-py-bcrypt" ,python-py-bcrypt))) (arguments `(#:phases @@ -536,9 +536,8 @@ John the Ripper).") "14k8z7ndc3zk5xivnm4d8lncchx475ll5izpf8vmfbq7rp9yp5rj")))) (build-system python-build-system) (propagated-inputs - `(("python-pycrypto" ,python-pycrypto))) - (inputs - `(("python-ecdsa" ,python-ecdsa))) + `(("python-pycrypto" ,python-pycrypto) + ("python-ecdsa" ,python-ecdsa))) (home-page "http://www.paramiko.org/") (synopsis "SSHv2 protocol library") (description "Paramiko is a python implementation of the SSHv2 protocol, @@ -617,7 +616,7 @@ making them easy to handle and incorporate into other protocols.") (base32 "177dfxsmk3k4cih6fh6v8d91bh4nqx7ns6pc07w7m7i3cvdx3c8n")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-pyyaml" ,python-pyyaml) ("python-six" ,python-six))) (home-page "https://github.com/pcmanus/ccm") @@ -665,7 +664,7 @@ using Python 2.4 or higher and provides access to the Olson timezone database.") (base32 "0k43pi0p1dwpds2w0km3fw92wixzxv2vw7p09capxmjz5cfh23lw")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-pytz" ,python-pytz))) (arguments `(#:tests? #f)) ; no test target (home-page "http://babel.pocoo.org/") @@ -901,7 +900,7 @@ etc.). The package is structured to make adding new modules easy.") (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) - (inputs + (propagated-inputs `(("python-pycrypto" ,python-pycrypto))) (arguments `(#:tests? #f)) ;TODO: tests require pytest @@ -954,7 +953,7 @@ Python file, so it can be easily copied into your project.") (base32 "0jrfpcgvgya6hs45dhrd9yiqgdgz9qp9aa07zsw8gqgn8zphff86")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-six" ,python-six))) (home-page "https://dateutil.readthedocs.io/en/stable/") (synopsis "Extensions to the standard datetime module") @@ -1029,9 +1028,8 @@ datetime module, available in Python 2.3+.") (base32 "1ckpxrvvjj6zxmn68icd9hib8qcpx9b35f6izxnr25br5ilq7r6j")))) (build-system python-build-system) (propagated-inputs - `(("python-numpy" ,python-numpy))) - (inputs - `(("python-pytz" ,python-pytz) + `(("python-numpy" ,python-numpy) + ("python-pytz" ,python-pytz) ("python-dateutil" ,python-dateutil-2))) (native-inputs `(("python-nose" ,python-nose))) @@ -1060,7 +1058,8 @@ doing practical, real world data analysis in Python.") (base32 "0paj7vlsb0np8b5sp4bv64wxv7qk2piyp7xg29pkhdjwsbls9fnb")))) (build-system python-build-system) - (inputs `(("python-pytz" ,python-pytz))) + (propagated-inputs + `(("python-pytz" ,python-pytz))) (home-page "https://github.com/regebro/tzlocal") (synopsis "Local timezone information for Python") @@ -1289,7 +1288,8 @@ commands.") (arguments `(#:python ,python-2 ; SyntaxError with Python 3 #:tests? #f)) ; no 'test' sub-command - (inputs `(("element-tree" ,python2-element-tree))) + (propagated-inputs + `(("element-tree" ,python2-element-tree))) (synopsis "Python and command-line interface to Bugzilla") (description "PyBugz is a Python library and command-line tool to query the Bugzilla @@ -1339,7 +1339,7 @@ backported for previous versions of Python from 2.4 to 3.3.") (base32 "0iv1c34npr4iynwpgv1vkjx9rjd18a85ir8c01gc5f7wp8iv7l1x")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-six" ,python-six) ("python-parse" ,python-parse))) (arguments '(#:tests? #f)) ;TODO: tests require pytest @@ -1490,7 +1490,7 @@ matching them against a list of media-ranges.") "1x4zjq1zlyrh8b9ba0cmafd3w94pxhid408kibyjd3s6h1lap6s7")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; 'module' object has no attribute 'collector' - (inputs + (propagated-inputs `(("python-cov-core" ,python-cov-core) ("python-pytest-cov" ,python-pytest-cov) ("python-six" ,python-six))) @@ -1660,7 +1660,7 @@ and many external plugins.") (base32 "1yl4nbhzfgsxqlsyk4clafgp9x11zvgrkprm9i2p3fgkwx9jxcm8")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-coverage" ,python-coverage) ("python-pytest" ,python-pytest))) (home-page "https://github.com/pytest-dev/pytest-cov") @@ -1724,7 +1724,7 @@ supports coverage of subprocesses.") (build-system python-build-system) (native-inputs `(("unzip" ,unzip))) - (inputs + (propagated-inputs `(("python-py" ,python-py) ("python-pytest" ,python-pytest))) (home-page "https://github.com/pytest-dev/pytest-mock/") @@ -1742,9 +1742,9 @@ same arguments.") (let ((base (package-with-python2 (strip-python2-variant python-pytest-mock)))) (package (inherit base) - (inputs + (propagated-inputs `(("python2-mock" ,python2-mock) - ,@(package-inputs base)))))) + ,@(package-propagated-inputs base)))))) (define-public python-pytest-xdist (package @@ -1769,7 +1769,7 @@ same arguments.") (native-inputs `(("unzip" ,unzip) ("python-setuptools-scm" ,python-setuptools-scm))) - (inputs + (propagated-inputs `(("python-apipkg" ,python-apipkg) ("python-execnet" ,python-execnet) ("python-pytest" ,python-pytest) @@ -1804,7 +1804,7 @@ result back.") (base32 "0f4w84k8ck82syys7yg9maz93mqzc8p5ymis941x034v44jzq74m")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-pytest" ,python-pytest))) (home-page "http://pythonpaste.org/scripttest/") (synopsis "Python library to test command-line scripts") @@ -1831,9 +1831,8 @@ subprocess and see the output as well as any file modifications.") "1dyml28ykpl5jb9khdmcdvhy1cxqingys6qvj2k04fzlaj6z3bbx")))) (build-system python-build-system) (propagated-inputs - `(("python-mimeparse" ,python-mimeparse))) - (inputs - `(("python-extras" ,python-extras))) + `(("python-mimeparse" ,python-mimeparse) + ("python-extras" ,python-extras))) (home-page "https://github.com/testing-cabal/testtools") (synopsis "Extensions to the Python standard library unit testing framework") @@ -1860,7 +1859,7 @@ compatibility.") (base32 "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-testtools" ,python-testtools) ("python-mimeparse" ,python-mimeparse))) (home-page "https://launchpad.net/testscenarios") @@ -1912,7 +1911,7 @@ use of resources by test cases.") (base32 "1nkw9wfbvizmpajbj3in8ns07g7lwkiv8hip14jjlwk3cacls6jv")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-testtools" ,python-testtools) ("python-mimeparse" ,python-mimeparse) ("python-testscenarios" ,python-testscenarios))) @@ -1975,7 +1974,7 @@ Python tests.") (build-system python-build-system) (arguments `(#:tests? #f)) ;; Most tests seem to use the Internet. - (inputs + (propagated-inputs `(("python-fixtures-0.3.16" ,python-fixtures-0.3.16))) (home-page "https://launchpad.net/pbr") (synopsis "Change the default behavior of Python’s setuptools") @@ -2172,7 +2171,7 @@ backported from Python 2.7 for Python 2.4+.") (base32 "1iypp6z46r19n4xmgx6m1lwmlpfjh8vapq8izigrqlaarvp2y64c")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-six" ,python-six) ("python-parse" ,python-parse) ("python-parse-type" ,python-parse-type))) @@ -2486,7 +2485,7 @@ somewhat intelligeble.") `(("python-coverage" ,python-coverage) ("python-nose" ,python-nose) ("python-mock" ,python-mock))) - (inputs + (propagated-inputs `(("python-blinker" ,python-blinker) ("python-cryptography" ,python-cryptography) ("python-pyjwt" ,python-pyjwt))) @@ -2628,7 +2627,7 @@ for Python.") (base32 "1x0v41lp5m1pjix3l46zx02b7lqp2hflgpnxwkywxynvi3zz47xw")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) (home-page "http://jinja.pocoo.org/") (synopsis "Python template engine") @@ -2772,7 +2771,7 @@ reStructuredText.") (base32 "011xizm3jnmf4cvs5i6kgf6c5nn046h79i8j0vd0f27yw9j3p4wl")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-jinja2" ,python-jinja2) ("python-docutils" ,python-docutils) ("python-pygments" ,python-pygments))) @@ -2874,7 +2873,7 @@ interested parties to subscribe to events, or \"signals\".") (base32 "1hn94rb4q3zmcq16in055xikal4dba5hfx3zznq7warllcgc9f8k")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-feedgenerator" ,python-feedgenerator) ("python-jinja2" ,python-jinja2) ("python-pygments" ,python-pygments) @@ -4293,7 +4292,7 @@ Python language binding specification.") (sha256 (base32 "1gzjg2k6f14i1msm2b0ax8d9ds1hvk6qd5nlaivg8m4cxqp4cp1x")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-psutil" ,python-psutil) ("python-drmaa" ,python-drmaa) ("python-pyzmq" ,python-pyzmq))) @@ -4858,7 +4857,7 @@ features useful for text console applications.") (build-system python-build-system) (arguments '(#:tests? #f)) ; no tests - (inputs `(("python-urwid" ,python-urwid))) + (propagated-inputs `(("python-urwid" ,python-urwid))) (home-page "https://github.com/pazz/urwidtrees") (synopsis "Tree widgets for urwid") (description "Urwidtrees is a Widget Container API for the @code{urwid} @@ -5322,7 +5321,7 @@ It is written entirely in Python.") (build-system python-build-system) (native-inputs `(("python-certifi" ,python-certifi))) - (inputs + (propagated-inputs `(("python-backports-abc" ,python-backports-abc))) (home-page "http://www.tornadoweb.org/") (synopsis "Python web framework and asynchronous networking library") @@ -5338,11 +5337,11 @@ connection to each user.") (define-public python2-tornado (let ((tornado (package-with-python2 (strip-python2-variant python-tornado)))) (package (inherit tornado) - (inputs + (propagated-inputs `(("python2-backport-ssl-match-hostname" ,python2-backport-ssl-match-hostname) ("python2-singledispatch" ,python2-singledispatch) - ,@(package-inputs tornado)))))) + ,@(package-propagated-inputs tornado)))))) ;; the python- version can be removed with python-3.5 (define-public python-backports-abc @@ -6560,7 +6559,7 @@ serve the same purpose: provide Python bindings for libmagic."))) (base32 "193faznwnjc3n5991wyzim6h9gyq1zxifmfrnpm3avgkh7ahyynh")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-six" ,python-six))) (home-page "http://packages.debian.org/sid/python-debian") (synopsis "Debian package related modules") @@ -7668,7 +7667,7 @@ pure Python module that works on virtually all Python versions.") (native-inputs `(("python-pytest" ,python-pytest) ("python-setuptools-scm" ,python-setuptools-scm))) - (inputs + (propagated-inputs `(("python-apipkg" ,python-apipkg))) (synopsis "Rapid multi-Python deployment") (description "Execnet provides a share-nothing model with @@ -7698,7 +7697,7 @@ minimal and fast API targetting the following uses: (base32 "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-apipkg" ,python-apipkg) ("python-execnet" ,python-execnet) ("python-py" ,python-py) @@ -7733,7 +7732,7 @@ the last py.test invocation.") `(("python-pytest" ,python-pytest) ("python-requests" ,python-requests) ("python-six" ,python-six))) - (inputs + (propagated-inputs `(("python-werkzeug" ,python-werkzeug))) (synopsis "Py.test plugin to test server connections locally") (description "Pytest-localserver is a plugin for the pytest testing @@ -7865,7 +7864,7 @@ Blog, News or Announcements section to a Sphinx website.") (base32 "1an5lkkqk1zha47198p42ji3m94xmzx1a03dn7866m87n4r4q8h5")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-args" ,python-args))) (home-page "https://github.com/kennethreitz/clint") (synopsis "Command-line interface tools") @@ -7910,7 +7909,7 @@ Abstract Syntax Tree.") (base32 "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-appdirs" ,python-appdirs))) (home-page "https://github.com/alex/rply") (synopsis "Parser generator for Python") @@ -7934,7 +7933,7 @@ with a new public API, and RPython support.") (base32 "1msqv747iz12r73mz4qvsmlwkddwjvrahlrk7ysrcz07h7dsscxs")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-astor" ,python-astor) ("python-clint" ,python-clint) ("python-rply" ,python-rply))) @@ -7963,7 +7962,7 @@ Python at your fingertips, in Lisp form.") (build-system python-build-system) (arguments `(#:test-target "check")) - (inputs + (propagated-inputs `(("python-requests" ,python-requests))) (home-page "https://github.com/litl/rauth") (synopsis "Python library for OAuth 1.0/a, 2.0, and Ofly") @@ -8127,7 +8126,7 @@ text.") (base32 "1dcxvszbikgzh99ybdc7jq0zb9wspy2ds8z9mjsqiyv3q884xpr5")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-pyasn1" ,python-pyasn1))) (synopsis "Pure-Python RSA implementation") (description "Python-RSA is a pure-Python RSA implementation. It supports @@ -8828,7 +8827,7 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.") (system* "nosetests" "--exclude=^test_safe_to_remove.*"))))))) (native-inputs `(("python-nose" ,python-nose))) - (inputs + (propagated-inputs `(("python-pytz" ,python-pytz) ("python-amqp" ,python-amqp) ("python-anyjson" ,python-anyjson) @@ -8994,7 +8993,7 @@ introspection of @code{zope.interface} instances in code.") (arguments '(;; The test suite relies on some non-portable Windows interfaces. #:tests? #f)) - (inputs + (propagated-inputs `(("python-dateutil-2" ,python-dateutil-2) ("python-pyicu" ,python-pyicu))) (synopsis "Parse and generate vCard and vCalendar files") @@ -9384,7 +9383,7 @@ the same purpose: to provide Python bindings for libmagic.") ;; s3cmd is written for python2 only and contains no tests. `(#:python ,python-2 #:tests? #f)) - (inputs + (propagated-inputs `(("python2-dateutil" ,python2-dateutil) ;; The python-file package also provides a magic.py module. ;; This is an unfortunate state of affairs; however, s3cmd @@ -10339,8 +10338,9 @@ implementation for Python.") (build-system python-build-system) (arguments '(#:tests? #f)) ; The test suite uses some Windows-specific data types. - (inputs `(("python-wcwidth" ,python-wcwidth) - ("python-pygments" ,python-pygments))) + (propagated-inputs + `(("python-wcwidth" ,python-wcwidth) + ("python-pygments" ,python-pygments))) (native-inputs `(("python-six" ,python-six))) (home-page "https://github.com/jonathanslenders/python-prompt-toolkit") (synopsis "Library for building command line interfaces in Python") @@ -10388,7 +10388,7 @@ characters, mouse support, and auto suggestions.") (base32 "1mmbiyzf0n8hm7z2a562x7w5cbl6jc0zsk6vp40q1z4cyblv1k13")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-docopt" ,python-docopt) ("python-jedi" ,python-jedi) ("python-prompt-toolkit" ,python-prompt-toolkit) @@ -10432,7 +10432,7 @@ etc.") (native-inputs `(("python-requests-mock" ,python-requests-mock) ("python-mock" ,python-mock))) - (inputs + (propagated-inputs `(("python-oauthlib" ,python-oauthlib) ("python-requests" ,python-requests))) (home-page @@ -10469,7 +10469,7 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients." `(("python-mock" ,python-mock) ("python-pep8" ,python-pep8) ("python-pyflakes" ,python-pyflakes))) - (inputs + (propagated-inputs `(("python-pycrypto" ,python-pycrypto))) (home-page "https://stem.torproject.org/") (synopsis @@ -10581,7 +10581,7 @@ hardware-accelerated multitouch applications.") (base32 "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-chardet" ,python-chardet) ("python-hypothesis" ,python-hypothesis))) (home-page "https://github.com/audreyr/binaryornot") @@ -10594,9 +10594,9 @@ binary or text.") (define-public python2-binaryornot (let ((base (package-with-python2 (strip-python2-variant python-binaryornot)))) (package (inherit base) - (inputs + (propagated-inputs `(("python2-enum34" ,python2-enum34) - ,@(package-inputs base)))))) + ,@(package-propagated-inputs base)))))) (define-public python-nltk (package @@ -10635,7 +10635,7 @@ reasoning, wrappers for natural language processing libraries.") (base32 "07mra6w86wjqy4lx5fvimidjhhfzd562gfjn8grsnbv2q8pk0i9x")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-certifi" ,python-certifi))) (home-page "http://github.com/mongodb/mongo-python-driver") (synopsis "Python driver for MongoDB") @@ -10707,7 +10707,7 @@ discovery, monitoring and configuration.") (base32 "19v1i69bf3bzarfxmbv0v6ivpcn758x3shvbiy9l2hy0lvqwnp6l")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-six" ,python-six))) (arguments `(#:tests? #f)) ; requires a bunch of not very nice packages with fixed @@ -10776,7 +10776,7 @@ List. Forked from and using the same API as the publicsuffix package.") (base32 "0v879yadcz9qxfl41ak6wkga1kimp9cflla9ddz03hjjvgkqy5ki")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-publicsuffix" ,python-publicsuffix))) (native-inputs `(("python-coverage" ,python-coverage) @@ -10792,7 +10792,7 @@ List. Forked from and using the same API as the publicsuffix package.") (define-public python2-url (let ((base (package-with-python2 (strip-python2-variant python-url)))) (package (inherit base) - (inputs + (propagated-inputs `(("python2-publicsuffix" ,python2-publicsuffix)))))) (define-public python-freezegun @@ -10812,7 +10812,7 @@ List. Forked from and using the same API as the publicsuffix package.") ("python-nose" ,python-nose) ("python-coverage" ,python-coverage) ("python-dateutil-2" ,python-dateutil-2))) - (inputs + (propagated-inputs `(("python-six" ,python-six))) (arguments `(#:phases (modify-phases %standard-phases @@ -11052,7 +11052,7 @@ functionality in the command line.") (base32 "11jbq40g8alsbirnd4kiagznqg270247i0m8qhi48ldf2i5xppxg")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-psutil" ,python-psutil))) (home-page "https://github.com/nicolargo/glances") @@ -11092,7 +11092,7 @@ CPU, load, memory, network bandwidth, disk I/O, disk use, and more.") `(("python-gevent" ,python-gevent) ("python-mock" ,python-mock) ("python-pytest-mock" ,python-pytest-mock))) - (inputs + (propagated-inputs `(("python-promise" ,python-promise) ("python-six" ,python-six))) (home-page "https://github.com/graphql-python/graphql-core") @@ -11121,7 +11121,7 @@ to Python.") (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) - (inputs + (propagated-inputs `(("python-graphql-core" ,python-graphql-core) ("python-promise" ,python-promise) ("python-six" ,python-six))) @@ -11156,7 +11156,7 @@ from Facebook.") ("python-psycopg2" ,python-psycopg2) ("python-pytest-django" ,python-pytest-django) ("python-sqlalchemy-utils" ,python-sqlalchemy-utils))) - (inputs + (propagated-inputs `(("python-graphql-core" ,python-graphql-core) ("python-graphql-relay" ,python-graphql-relay) ("python-iso8601" ,python-iso8601) @@ -11192,7 +11192,7 @@ with an associated set of resolve methods that know how to fetch data.") "01hwzjc1zshk4vvxrcghm398fpy4jls66dyz06g07mrwqif8878p")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; fails to import test modules - (inputs + (propagated-inputs `(("python-bcrypt" ,python-bcrypt) ("python-click" ,python-click) ("python-consul" ,python-consul) @@ -11264,7 +11264,7 @@ replay them during future tests. It is designed to work with python-requests.") `(("python-docutils" ,python-docutils) ("python-mock" ,python-mock) ("python-nose" ,python-nose))) - (inputs + (propagated-inputs `(("python-botocore" ,python-botocore))) (synopsis "Amazon S3 Transfer Manager") (description "S3transfer is a Python library for managing Amazon S3 diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 1a8d13369b..1dd23c28e3 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -315,7 +315,7 @@ ideal (e.g. in LV2 implementations or embedded applications).") (base32 "0kvaf332cqbi47rqzlpdx4mbkvw12mkrzkj8n9l19wk713d4py9w")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-html5lib" ,python-html5lib) ("python-isodate" ,python-isodate) ("python-pyparsing" ,python-pyparsing))) -- cgit v1.2.3 From e7881f3db4dfddf46c3cd61ee684a2efd629ce1b Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 13:35:55 +0200 Subject: gnu: Fix python inputs, part 2: all inputs become native-inputs. This patch contains the changes where all [inputs] are changed to [native-inputs]. * gnu/packages/python.scm (python-pytest, python-fixtures, python-testrepository, python-virtualenv): All [inputs] are changed to [native-inputs]. * gnu/packages/openstack.scm (python-bandit, python-debtcollector, python-hacking, python-tempest-lib, python-oslo.config, python-oslo.context, python-oslo.i18n, python-oslo.log, python-oslo.serialization, python-oslosphinx, python-oslotest, python-oslo.utils): Likewise. --- gnu/packages/openstack.scm | 24 ++++++++++++------------ gnu/packages/python.scm | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 8cf3b957a7..327c4f984e 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -49,7 +49,7 @@ ("python-pyyaml" ,python-pyyaml) ("python-six" ,python-six) ("python-stevedore" ,python-stevedore))) - (inputs + (native-inputs `(("python-pbr" ,python-pbr) ;; Tests ("python-fixtures" ,python-fixtures) @@ -84,7 +84,7 @@ all the files it generates a report.") (propagated-inputs `(("python-six" ,python-six) ("python-wrapt" ,python-wrapt))) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) ;; Tests. @@ -120,7 +120,7 @@ manner.") ("python-pep8-1.5.7" ,python-pep8-1.5.7) ("python-pyflakes-0.8.1" ,python-pyflakes-0.8.1) ("python-six" ,python-six))) - (inputs + (native-inputs `(;; Tests ("python-testscenarios" ,python-testscenarios))) (home-page "http://github.com/openstack-dev/hacking") @@ -333,7 +333,7 @@ extensions.") ("python-paramiko" ,python-paramiko) ("python-pbr" ,python-pbr) ("python-six" ,python-six))) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-mock" ,python-mock) ("python-os-testr" ,python-os-testr) @@ -368,7 +368,7 @@ common features used in Tempest.") `(("python-netaddr" ,python-netaddr) ("python-six" ,python-six) ("python-stevedore" ,python-stevedore))) - (inputs + (native-inputs `(("python-pbr" ,python-pbr) ;; Tests ("python-oslo.i18n" ,python-oslo.i18n) @@ -397,7 +397,7 @@ common features used in Tempest.") (base32 "0kvha0rs9295njyl2z6n6zm5dapi5mrl5zwjm0m6ldqrvccyf8c3")))) (build-system python-build-system) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) ;; Tests. @@ -428,7 +428,7 @@ pipeline and used by various modules such as logging.") (propagated-inputs `(("python-babel" ,python-babel) ("python-six" ,python-six))) - (inputs + (native-inputs `(("python-pbr" ,python-pbr) ;; Tests ("python-mock" ,python-mock) @@ -469,7 +469,7 @@ in an application or library.") ("python-oslo.utils" ,python-oslo.utils) ("python-oslo.serialization" ,python-oslo.serialization) ("python-six" ,python-six))) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-iso8601" ,python-iso8601) ("python-mock" ,python-mock) @@ -505,7 +505,7 @@ handlers and support for context specific logging (like resource id’s etc).") ("python-simplejson" ,python-simplejson) ("python-six" ,python-six) ("python-pytz" ,python-pytz))) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) ;; Tests. @@ -536,7 +536,7 @@ in transmittable and storable formats, such as JSON and MessagePack.") (build-system python-build-system) (propagated-inputs `(("python-requests" ,python-requests))) - (inputs + (native-inputs `(("python-pbr" ,python-pbr) ("python-docutils" ,python-docutils) ("python-hacking" ,python-hacking) @@ -571,7 +571,7 @@ from the OpenStack project.") ("python-mock" ,python-mock) ("python-mox3" ,python-mox3) ("python-six" ,python-six))) - (inputs + (native-inputs `(("python-pbr" ,python-pbr) ("python-os-client-config" ,python-os-client-config) ("python-subunit" ,python-subunit) @@ -614,7 +614,7 @@ and better support for mocking results.") ("python-netifaces" ,python-netifaces) ("python-pytz" ,python-pytz) ("python-six" ,python-six))) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) ;; Tests. diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3de73c76a5..8714cc1d31 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1608,7 +1608,7 @@ code introspection, and logging.") (("def test_remove_dir_prefix\\(self\\):") "@pytest.mark.xfail\n def test_remove_dir_prefix(self):"))))) (build-system python-build-system) - (inputs + (native-inputs `(("python-py" ,python-py) ("python-nose" ,python-nose) ("python-mock" ,python-mock))) @@ -2042,7 +2042,7 @@ and sensible default behaviors into your setuptools run.") (propagated-inputs `(("python-six" ,python-six) ("python-pbr-0.11" ,python-pbr-0.11))) - (inputs + (native-inputs `(;; Tests ("python-testtools" ,python-testtools))) (arguments @@ -2074,7 +2074,7 @@ Python tests.") (propagated-inputs `(("python-fixtures-0.3.16" ,python-fixtures-0.3.16) ("python-testtools" ,python-testtools))) - (inputs + (native-inputs `(("python-subunit" ,python-subunit) ("python-mimeparse" ,python-mimeparse))) (home-page "https://launchpad.net/testrepository") @@ -2579,7 +2579,7 @@ object.") (substitute* "tests/test_virtualenv.py" (("skipif.*") "skipif(True, reason=\"Guix\")\n")) (zero? (system* "py.test"))))))) - (inputs + (native-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest))) (home-page "https://virtualenv.pypa.io/") -- cgit v1.2.3 From dae73d9b9a4db932e8c7c1b7607981dc6cb401a5 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 13:36:55 +0200 Subject: gnu: Fix python inputs, part 3: all native-inputs become propagated-inputs. This patch contains the changes in python.scm where all [native-inputs] are changed to [propagated-inputs]. * gnu/packages/python.scm.scm (python-feedgenerator): All [native-inputs] are changed to [propagated-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8714cc1d31..ace0ac3aaf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2822,7 +2822,7 @@ sources.") (base32 "0mkimp1fpdan4p3882vzcws4l594k71ich4g0wq97jbra7p602n0")))) (build-system python-build-system) - (native-inputs + (propagated-inputs `(("python-pytz" ,python-pytz) ("python-six" ,python-six))) (home-page "https://github.com/getpelican/feedgenerator") -- cgit v1.2.3 From 482d95918e2a9de05ee224d979c15759e54febf0 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 14:05:11 +0200 Subject: gnu: Fix python inputs, part 5: some inputs become propagated-inputs * gnu/packages/openstack.scm (python-os-client-config)[inputs] change to [native-inputs]. [propagated-inputs]: New element, move python-appdirs, python-pyyaml here. (python-git-review)[propagated-inputs]: New element, move python-requests here. * gnu/packages/python.scm (python-rpy2)[propagated-inputs]: New element, move python-six here. (python-xcffib)[inputs] move python-six to [propagated-inputs]. (python-flake8)[propagated-inputs]: New element, move python-pep8, python-pyflakes, python-mccabe here. (python-flake8-2.2.4)[propagated-inputs]: New element, move python-pep8, python-pyflakes, python-mccabe here. (python-pytest)[propagated-inputs]: New element, move python-py here. (python-tox)[propagated-inputs]: New element, move all inputs except of python-pytest here. (python-botocore)[propagated-inputs]: New element, move python-dateutil, python-docutils, python-jmespath here. (awscli)[propagated-inputs]: New element, move python-colorama, python-botocore, python-s3transfer, python-docutils, python-rsa here. (python-mako)[propagated-inputs]: New element, move python-markupsafe here. * gnu/packages/qemu.scm(python-libvirt)[propagated-inputs]: New element, move python-lxml here. --- gnu/packages/openstack.scm | 12 +++++---- gnu/packages/python.scm | 67 ++++++++++++++++++++++++++-------------------- gnu/packages/qemu.scm | 5 ++-- 3 files changed, 48 insertions(+), 36 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 327c4f984e..55fd005f9b 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -177,12 +177,13 @@ tested on Python version 3.2, 2.7 and 2.6.") (build-system python-build-system) (arguments `(#:tests? #f)) ;; Circular dependency with python-oslotest - (inputs + (propagated-inputs `(("python-appdirs" ,python-appdirs) + ("python-pyyaml" ,python-pyyaml))) + (native-inputs + `(("python-pbr" ,python-pbr) ("python-fixtures" ,python-fixtures) ("python-mimeparse" ,python-mimeparse) - ("python-pbr" ,python-pbr) - ("python-pyyaml" ,python-pyyaml) ("python-testrepository" ,python-testrepository) ("python-testscenarios" ,python-testscenarios) ("python-testtools" ,python-testtools))) @@ -790,9 +791,10 @@ permanence.") (list git openssh)))))))))) (native-inputs `(("python-pbr" ,python-pbr))) + (propagated-inputs + `(("python-requests" ,python-requests))) (inputs - `(("python-requests" ,python-requests) - ("git" ,git) + `(("git" ,git) ("openssh" ,openssh))) (home-page "http://docs.openstack.org/infra/git-review/") (synopsis "Command-line tool for Gerrit") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ace0ac3aaf..0ac7db9265 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1608,9 +1608,10 @@ code introspection, and logging.") (("def test_remove_dir_prefix\\(self\\):") "@pytest.mark.xfail\n def test_remove_dir_prefix(self):"))))) (build-system python-build-system) + (propagated-inputs + `(("python-py" ,python-py))) (native-inputs - `(("python-py" ,python-py) - ("python-nose" ,python-nose) + `(("python-nose" ,python-nose) ("python-mock" ,python-mock))) (home-page "http://pytest.org") (synopsis "Python testing library") @@ -3572,9 +3573,10 @@ operators such as union, intersection, and difference.") (base32 "0nhan2qvrw7b7gg5zddwa22kybdv3x1g26vkd7q8lvnkgzrs4dga")))) (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six))) (inputs - `(("python-six" ,python-six) - ("readline" ,readline) + `(("readline" ,readline) ("icu4c" ,icu4c) ("pcre" ,pcre) ("r" ,r))) @@ -4142,10 +4144,10 @@ a front-end for C compilers or analysis tools.") "0655hzxv57h1a9ja9kwp0ichbkhf3djw32k33d66xp0q37dq2y81")))) (build-system python-build-system) (inputs - `(("libxcb" ,libxcb) - ("python-six" ,python-six))) + `(("libxcb" ,libxcb))) (propagated-inputs - `(("python-cffi" ,python-cffi))) ; used at run time + `(("python-cffi" ,python-cffi) ; used at run time + ("python-six" ,python-six))) (arguments `(#:phases (alist-cons-after @@ -5564,11 +5566,12 @@ complexity of Python source code.") (base32 "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-pep8" ,python-pep8) ("python-pyflakes" ,python-pyflakes) - ("python-mccabe" ,python-mccabe) - ("python-mock" ,python-mock) + ("python-mccabe" ,python-mccabe))) + (inputs + `(("python-mock" ,python-mock) ("python-nose" ,python-nose))) (home-page "https://gitlab.com/pycqa/flake8") (synopsis @@ -5584,11 +5587,12 @@ complexity of Python source code.") ;; necessary once python-hacking > 0.10.2 is released. (define-public python-flake8-2.2.4 (package (inherit python-flake8) - (inputs + (propagated-inputs `(("python-pep8" ,python-pep8-1.5.7) ("python-pyflakes" ,python-pyflakes-0.8.1) - ("python-mccabe" ,python-mccabe-0.2.1) - ("python-mock" ,python-mock) + ("python-mccabe" ,python-mccabe-0.2.1))) + (inputs + `(("python-mock" ,python-mock) ("python-nose" ,python-nose))) (version "2.2.4") (source @@ -8176,11 +8180,12 @@ Pytest but stripped of Pytest specific details.") ;; FIXME: Tests require a newer version of pytest, but upgrading our ;; pytest breaks other packages. '(#:tests? #f)) - (inputs - `(("python-pluggy" ,python-pluggy) + (propagated-inputs + `(("python-pluggy" ,python-pluggy) ; >=0.3.0,<0.4.0 ("python-py" ,python-py) - ("python-virtualenv" ,python-virtualenv) - ("python-pytest" ,python-pytest))) + ("python-virtualenv" ,python-virtualenv))) + (inputs + `(("python-pytest" ,python-pytest))) (home-page "http://tox.testrun.org/") (synopsis "Virtualenv-based automation of test activities") (description "Tox is a generic virtualenv management and test command line @@ -8227,14 +8232,16 @@ document.") (base32 "1zxczlwqy9bl27d9bc5x99mb5mcsxm350240lp5nx7014xb311lj")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-dateutil" ,python-dateutil-2) ("python-docutils" ,python-docutils) - ("python-mock" ,python-mock) + ("python-jmespath" ,python-jmespath))) + (inputs + `(("python-mock" ,python-mock) ("python-nose" ,python-nose) + ("behave" ,behave) ("python-tox" ,python-tox) - ("python-wheel" ,python-wheel) - ("python-jmespath" ,python-jmespath))) + ("python-wheel" ,python-wheel))) (home-page "https://github.com/boto/botocore") (synopsis "Low-level interface to AWS") (description "Botocore is a Python library that provides a low-level @@ -8256,17 +8263,18 @@ interface to the Amazon Web Services (AWS) API.") (base32 "0lclasm0wnayd3b8zl9l91i32nbgrhh0ncf9lksss4cv0myfwmfg")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-colorama" ,python-colorama) + ("python-botocore" ,python-botocore) + ("python-s3transfer" ,python-s3transfer) ("python-docutils" ,python-docutils) - ("python-mock" ,python-mock) + ("python-rsa" ,python-rsa))) + (inputs + `(("python-mock" ,python-mock) ("python-nose" ,python-nose) - ("python-rsa" ,python-rsa) ("python-sphinx" ,python-sphinx) ("python-tox" ,python-tox) - ("python-wheel" ,python-wheel) - ("python-botocore" ,python-botocore) - ("python-s3transfer" ,python-s3transfer))) + ("python-wheel" ,python-wheel))) (home-page "http://aws.amazon.com/cli/") (synopsis "Command line client for AWS") (description "AWS CLI provides a unified command line interface to the @@ -8403,9 +8411,10 @@ available in Django, but is a standalone package.") (base32 "136kcjbs0s98qkx8a418b05dfblqp0kiiqyx8vhx4rarwc7bqi3n")))) (build-system python-build-system) + (propagated-inputs + `(("python-markupsafe" ,python-markupsafe))) (native-inputs - `(("python-markupsafe" ,python-markupsafe) - ("python-mock" ,python-mock) + `(("python-mock" ,python-mock) ("python-nose" ,python-nose))) (home-page "http://www.makotemplates.org/") (synopsis "Templating language for Python") diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index f6e34cace4..332e2ad0ef 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -395,8 +395,9 @@ three libraries: (which "nosetests") "\""))) #t))))) (inputs - `(("libvirt" ,libvirt) - ("python-lxml" ,python-lxml))) + `(("libvirt" ,libvirt))) + (propagated-inputs + `(("python-lxml" ,python-lxml))) (native-inputs `(("pkg-config" ,pkg-config) ("python-nose" ,python-nose))) -- cgit v1.2.3 From 328bb95d3507682f5e06fb2880c632252f59ee57 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 7 Oct 2016 21:27:08 +0200 Subject: gnu: Fix python inputs, part 6: some inputs become native-inputs. This patch handles the inputs which are native-inputs almost always like nose, sphinx, and pytest. * gnu/packages/python.scm (python-jsonschema, python-numpydoc, python-mccabe, python-mistune, python-ptyprocess, python-webob, python-apipkg, python-flake8-2.2.4)[inputs] change to [native-inputs]. (python-flake8, tox) Likewise, add a comment. (python-scikit-learn, python-numpy)[native-inputs] New element, move python-nose here. (python2-kombu)[inputs] change to [native-inputs], use python-kombu's package-native-inputs. --- gnu/packages/python.scm | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0ac7db9265..3442488d29 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2940,8 +2940,9 @@ and is very extensible.") (system* "nosetests" "-v" "sklearn"))) (alist-delete 'check %standard-phases))))) (inputs - `(("openblas" ,openblas) - ("python-nose" ,python-nose))) + `(("openblas" ,openblas))) + (native-inputs + `(("python-nose" ,python-nose))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-scipy" ,python-scipy))) @@ -3126,9 +3127,10 @@ between language specification and implementation aspects.") (base32 "1bjjhvncraka5s6i4lg644jrxij6bvycxy7an20gcz3a0m11iygp")))) (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) (inputs - `(("python-nose" ,python-nose) - ("openblas" ,openblas) + `(("openblas" ,openblas) ("lapack" ,lapack))) (native-inputs `(("gfortran" ,gfortran))) @@ -3345,7 +3347,7 @@ that client code uses to construct the grammar directly in Python code.") (substitute* "numpydoc/tests/test_plot_directive.py" (("3") "2")))))) (build-system python-build-system) - (inputs + (native-inputs `(("python-docutils" ,python-docutils) ("python-sphinx" ,python-sphinx) ("python-nose" ,python-nose))) @@ -5489,7 +5491,7 @@ PEP 8.") (base32 "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws")))) (build-system python-build-system) - (inputs + (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://github.com/flintwork/mccabe") @@ -5570,8 +5572,8 @@ complexity of Python source code.") `(("python-pep8" ,python-pep8) ("python-pyflakes" ,python-pyflakes) ("python-mccabe" ,python-mccabe))) - (inputs - `(("python-mock" ,python-mock) + (native-inputs + `(("python-mock" ,python-mock) ; TODO: only required for < 3.3 ("python-nose" ,python-nose))) (home-page "https://gitlab.com/pycqa/flake8") (synopsis @@ -5591,7 +5593,7 @@ complexity of Python source code.") `(("python-pep8" ,python-pep8-1.5.7) ("python-pyflakes" ,python-pyflakes-0.8.1) ("python-mccabe" ,python-mccabe-0.2.1))) - (inputs + (native-inputs `(("python-mock" ,python-mock) ("python-nose" ,python-nose))) (version "2.2.4") @@ -5621,7 +5623,7 @@ complexity of Python source code.") (base32 "17zqjp9m4d1w3jf2rbbq5xshcw24q1vlcv24gkgfqqyyymajxahx")))) (build-system python-build-system) - (inputs + (native-inputs `(("python-nose" ,python-nose) ("python-cython" ,python-cython))) (home-page "https://github.com/lepture/mistune") @@ -5680,7 +5682,7 @@ markdown_py is also provided to convert Markdown files to HTML.") (base32 "0nggns5kikn32yyda2zrj1xdmh49pi3v0drggcdwljbv36r8zdyw")))) (build-system python-build-system) - (inputs + (native-inputs `(("python-nose" ,python-nose))) (arguments `(#:phases @@ -5994,7 +5996,7 @@ fractional seconds) of a clock which never goes backwards.") (base32 "02bhhzijfhv8hmi1i54d4b0v43liwhnywhflvxsv4x3zax9s3afq")))) (build-system python-build-system) - (inputs + (native-inputs `(("python-nose" ,python-nose))) (home-page "http://webob.org/") (synopsis "WSGI request and response object") @@ -7640,7 +7642,7 @@ applications.") (base32 "1iks5701qnp3dlr3q1d9qm68y2plp2m029irhpz92a44psfkjf1f")))) (build-system python-build-system) - (inputs + (native-inputs `(("python-pytest" ,python-pytest))) (synopsis "Namespace control and lazy-import mechanism") (description "With apipkg you can control the exported namespace of a Python @@ -8184,8 +8186,8 @@ Pytest but stripped of Pytest specific details.") `(("python-pluggy" ,python-pluggy) ; >=0.3.0,<0.4.0 ("python-py" ,python-py) ("python-virtualenv" ,python-virtualenv))) - (inputs - `(("python-pytest" ,python-pytest))) + (native-inputs + `(("python-pytest" ,python-pytest))) ; >= 2.3.5 (home-page "http://tox.testrun.org/") (synopsis "Virtualenv-based automation of test activities") (description "Tox is a generic virtualenv management and test command line @@ -8776,8 +8778,8 @@ RabbitMQ messaging server is the most popular implementation.") (strip-python2-variant python-kombu)))) (package (inherit kombu) - (inputs `(("python2-unittest2" ,python2-unittest2) - ,@(package-inputs kombu)))))) + (native-inputs `(("python2-unittest2" ,python2-unittest2) + ,@(package-native-inputs kombu)))))) (define-public python-billiard (package -- cgit v1.2.3 From f2516de2fc7459d8ceed1779f0f24840075d08d6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 14:33:55 +0200 Subject: gnu: Fix python inputs, part 7: Ensure python-cython is a native-input. * gnu/packages/audio.scm (python-pyliblo): [inputs] Move python-cyton to [native-inputs]. * gnu/packages/bioinformatics.scm (python2-pybedtools): dito. * gnu/packages/music.scm (beast, python-pyportmidi): dito. * gnu/packages/python.scm (python2-fastlmm, python-kivy): dito. --- gnu/packages/audio.scm | 5 +++-- gnu/packages/bioinformatics.scm | 6 +++--- gnu/packages/music.scm | 8 ++++---- gnu/packages/python.scm | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7d2e2d2a4b..5e32081293 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1434,9 +1434,10 @@ implementation of the Open Sound Control (OSC) protocol.") "13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;no tests + (native-inputs + `(("python-cython" ,python-cython))) (inputs - `(("python-cython" ,python-cython) - ("liblo" ,liblo))) + `(("liblo" ,liblo))) (home-page "http://das.nasophon.de/pyliblo/") (synopsis "Python bindings for liblo") (description diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9cfb30023f..9b47dc3d51 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -522,13 +522,13 @@ intended to behave exactly the same as the original BWK awk.") (build-system python-build-system) (arguments `(#:python ,python-2)) ; no Python 3 support (inputs - `(("python-cython" ,python2-cython) - ("python-matplotlib" ,python2-matplotlib))) + `(("python-matplotlib" ,python2-matplotlib))) (propagated-inputs `(("bedtools" ,bedtools) ("samtools" ,samtools))) (native-inputs - `(("python-pyyaml" ,python2-pyyaml) + `(("python-cython" ,python2-cython) + ("python-pyyaml" ,python2-pyyaml) ("python-nose" ,python2-nose))) (home-page "https://pythonhosted.org/pybedtools/") (synopsis "Python wrapper for BEDtools programs") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 61bcd3785b..caebe70dd6 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1022,7 +1022,6 @@ Laurens Hammond and Don Leslie.") `(("rapicorn" ,rapicorn) ("guile" ,guile-1.8) ("python" ,python-2) - ("cython" ,python2-cython) ("libgnomecanvas" ,libgnomecanvas) ("libogg" ,libogg) ("libmad" ,libmad) @@ -1033,6 +1032,7 @@ Laurens Hammond and Don Leslie.") (native-inputs `(("pkg-config" ,pkg-config) ("glib:bin" ,glib "bin") + ("cython" ,python2-cython) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser))) (home-page "https://testbit.eu/wiki/Beast_Home") @@ -1315,10 +1315,10 @@ using a system-independent interface.") #t))))) (inputs `(("portmidi" ,portmidi) - ("alsa-lib" ,alsa-lib) - ("python-cython" ,python-cython))) + ("alsa-lib" ,alsa-lib))) (native-inputs - `(("unzip" ,unzip))) + `(("python-cython" ,python-cython) + ("unzip" ,unzip))) (home-page "http://portmedia.sourceforge.net/portmidi/") (synopsis "Python bindings to PortMidi") (description diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3442488d29..35d9021165 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10542,10 +10542,10 @@ and/or Xon/Xoff. The port is accessed in RAW mode.") "/include/SDL2")) #t))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("python-cython" ,python-cython))) (inputs - `(("python-cython" ,python-cython) - ("gstreamer" ,gstreamer) + `(("gstreamer" ,gstreamer) ("mesa" ,mesa) ("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))))) -- cgit v1.2.3 From b3e8b4bd0f390784c710944c9962a0e13b25ed02 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 2 Oct 2016 14:13:56 +0200 Subject: gnu: scons: Do not use setuptools for building. * gnu/packages/python.scm (scons): Set "#:use-setuptools" to #f. --- gnu/packages/python.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 35d9021165..2f7ae95fa4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1390,6 +1390,7 @@ syntax.") (arguments ;; With Python 3.x, fails to build with a syntax error. `(#:python ,python-2 + #:use-setuptools? #f ; still relies on distutils #:tests? #f)) ; no 'python setup.py test' command (home-page "http://scons.org/") (synopsis "Software construction tool written in Python") -- cgit v1.2.3 From ce40b3839535c4858bec61ac23a557fca4c79cc0 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 2 Oct 2016 23:15:14 +0200 Subject: gnu: python-pytest-cov: Use upstream options for testing. * gnu/packages/python.scm (python-pytest-cov): Replace phase "check" by one passing the options found in upstream's tox.ini-file to "python setup.py check". --- gnu/packages/python.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2f7ae95fa4..b0c1411c22 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1662,6 +1662,16 @@ and many external plugins.") (base32 "1yl4nbhzfgsxqlsyk4clafgp9x11zvgrkprm9i2p3fgkwx9jxcm8")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; options taken from tox.ini + ;; TODO: make "--restructuredtext" tests pass. They currently fail + ;; with "Duplicate implicit target name" + (zero? (system* "python" "./setup.py" "check" + "--strict" "--metadata"))))))) (propagated-inputs `(("python-coverage" ,python-coverage) ("python-pytest" ,python-pytest))) -- cgit v1.2.3 From ef7451131a13b48adf8eea5d402caee8a5e5c344 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 4 Oct 2016 00:33:14 +0200 Subject: gnu: python-sphinx-rtd-theme: Remove inputs. This package is a plugin for python-sphinx, it does not require python-sphinx nor docutils, but is an add-on for python-sphinx and should not be installed by it's own. * gnu/packages/python/.scm (python-sphinx-rtd-theme)[inputs]: Remove. --- gnu/packages/python.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b0c1411c22..77e4298d49 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2811,9 +2811,6 @@ sources.") (base32 "19nw3rn7awplcdrz63kg1njqwkbymfg9lwn7l2grhdyhyr2gaa8g")))) (build-system python-build-system) - (inputs - `(("python-docutils" ,python-docutils) - ("python-sphinx" ,python-sphinx))) (home-page "https://github.com/snide/sphinx_rtd_theme/") (synopsis "ReadTheDocs.org theme for Sphinx") (description "A theme for Sphinx used by ReadTheDocs.org.") -- cgit v1.2.3 From e165f137d8f5ace7bcfa03dc096b0793a1e45267 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 14:54:38 +0200 Subject: gnu: python-ccm: Add missing input python-psutil. * gnu/packages/python.scm (python-ccm) [propagated-inouts]: Add python-psutil. --- gnu/packages/python.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 77e4298d49..578207920a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -618,6 +618,9 @@ making them easy to handle and incorporate into other protocols.") (build-system python-build-system) (propagated-inputs `(("python-pyyaml" ,python-pyyaml) + ;; Not listed in setup.py, but used in ccmlib/node.py for full + ;; functionality + ("python-psutil" ,python-psutil) ("python-six" ,python-six))) (home-page "https://github.com/pcmanus/ccm") (synopsis "Cassandra Cluster Manager") -- cgit v1.2.3 From d9a6e221e2082248c46a145422f36d21529c6716 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 15:01:18 +0200 Subject: gnu: python-ccm: Update synopsis and description. * gnu/packages/python.scm (python-ccm): Update synopsis and description. --- gnu/packages/python.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 578207920a..bdcd1e39aa 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -623,9 +623,11 @@ making them easy to handle and incorporate into other protocols.") ("python-psutil" ,python-psutil) ("python-six" ,python-six))) (home-page "https://github.com/pcmanus/ccm") - (synopsis "Cassandra Cluster Manager") - (description "A script/library to create, launch and remove an Apache -Cassandra cluster on localhost.") + (synopsis "Cassandra Cluster Manager for Apache Cassandra clusters on +localhost") + (description "Cassandra Cluster Manager is a development tool for testing +local Cassandra clusters. It creates, launches and removes Cassandra clusters +on localhost.") (license license:asl2.0))) (define-public python2-ccm -- cgit v1.2.3 From 9820a02858840d6f0aef6d13541aaf7148e50651 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 14:38:54 +0200 Subject: gnu: python-h5py: Remove needless "python2-variant" property. * gnu/packages/python.scm (python-h5py) [python2-variant]: Remove property. (python2-h5py): Don't strip property "strip-python2-variant". --- gnu/packages/python.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bdcd1e39aa..defec4963f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -757,11 +757,10 @@ HDF5 library from Python. The low-level interface is intended to be a complete wrapping of the HDF5 API, while the high-level component supports access to HDF5 files, datasets and groups using established Python and NumPy concepts.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-h5py)))))) + (license license:bsd-3))) (define-public python2-h5py - (package-with-python2 (strip-python2-variant python-h5py))) + (package-with-python2 python-h5py)) (define-public python-lockfile (package -- cgit v1.2.3 From 69866690128615bea022080138d91da4789948db Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 6 Oct 2016 15:38:20 +0200 Subject: gnu: python-hdf5: Correct inputs. According to setup.py python-six is requried at run-time, thus has to be a propagated input. * gnu/packages/python.scm (python-hdf5) [inputs]: Move `python-six` to [propagated-inputs]. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index defec4963f..13bc5ff43b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -742,10 +742,10 @@ and verifies that it matches the intended target hostname.") (string-append "['" prefix "/lib" "']"))) #t)))))) (propagated-inputs - `(("python-numpy" ,python-numpy))) + `(("python-six" ,python-six) + ("python-numpy" ,python-numpy))) (inputs - `(("hdf5" ,hdf5) - ("python-six" ,python-six))) + `(("hdf5" ,hdf5))) (native-inputs `(("python-cython" ,python-cython) ("python-pkgconfig" ,python-pkgconfig))) -- cgit v1.2.3 From ae92caddc5a292b31bb7fc6e4e7c974880f482c0 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 14:43:57 +0200 Subject: gnu: python-fixture: Correct inputs. python-pbr is required only for building. * gnu/packages/python.scm (python-fixtures) [propagated-inputs] move python-pbr-0.11 to [native-inputs]. --- gnu/packages/python.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 13bc5ff43b..8d1acb343b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2056,10 +2056,9 @@ and sensible default behaviors into your setuptools run.") "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y")))) (build-system python-build-system) (propagated-inputs - `(("python-six" ,python-six) - ("python-pbr-0.11" ,python-pbr-0.11))) + `(("python-six" ,python-six))) (native-inputs - `(;; Tests + `(("python-pbr-0.11" ,python-pbr-0.11) ("python-testtools" ,python-testtools))) (arguments '(#:tests? #f)) ; no setup.py test command -- cgit v1.2.3 From 424f0a41756486c10ec285f34daaa2f9a2ce04ce Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 14:44:53 +0200 Subject: gnu: python-fixture: Enable tests. * gnu/packages/python.scm (python-fixtures) [arguments] remove keyword `#:tests?`. --- gnu/packages/python.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8d1acb343b..ecaf537d72 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2060,8 +2060,6 @@ and sensible default behaviors into your setuptools run.") (native-inputs `(("python-pbr-0.11" ,python-pbr-0.11) ("python-testtools" ,python-testtools))) - (arguments - '(#:tests? #f)) ; no setup.py test command (home-page "https://launchpad.net/python-fixtures") (synopsis "Python test fixture library") (description -- cgit v1.2.3 From b2e66edf52c75e845b982c91c849141d11f86b2d Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 14:46:12 +0200 Subject: gnu: python-testrepositoryfixture: Correct inputs. python-fixtures is required only for building. * gnu/packages/python.scm (python-testrepository) [propagated-inputs] move python-fixtures to [native-inputs]. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ecaf537d72..d01b13a644 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2085,10 +2085,10 @@ Python tests.") "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m")))) (build-system python-build-system) (propagated-inputs - `(("python-fixtures-0.3.16" ,python-fixtures-0.3.16) - ("python-testtools" ,python-testtools))) + `(("python-testtools" ,python-testtools))) (native-inputs - `(("python-subunit" ,python-subunit) + `(("python-fixtures" ,python-fixtures) + ("python-subunit" ,python-subunit) ("python-mimeparse" ,python-mimeparse))) (home-page "https://launchpad.net/testrepository") (synopsis "Database for Python test results") -- cgit v1.2.3 From d2a8db92feb6ee2864ee3c6981dd43055ea91339 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 14:46:35 +0200 Subject: gnu: python-pbr: Rework bootstrapping. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For breaking the cyclic build, formerly a separate (older) version was used for bootstrapping. Now we use the same version just without tests and without test dependencies. * gnu/packages/python.scm (python-pbr-0.11, python2-pbr-0.11): replace by … (python-pbr-minimal, python2-pbr-minimal). (python-pbr) inherit from python-pbr-minimal, adding the requirements for testing and building the documentation. (python-fixtures) [native-inputs] Use python-pbr-minimal here. (python-testrepository): [native-inputs] Add it here, it was a missing dependency. --- gnu/packages/python.scm | 106 ++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 72 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d01b13a644..40e6ac9c08 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1941,104 +1941,65 @@ protocol.") (define-public python2-subunit (package-with-python2 python-subunit)) -;; Recent versions of python-fixtures need a recent version of python-pbr, -;; which needs a recent version of python-fixtures. To fix this circular -;; dependency, we keep old versions of python-fixtures and python-pbr to -;; bootstrap the whole thing: -;; - python-fixtures-0.3.16 is used to build python-pbr-0.11 -;; - python-pbr-0.11 is used to build python-fixtures -;; - python-fixtures is used to build python-pbr -(define-public python-fixtures-0.3.16 - (package - (name "python-fixtures") - (version "0.3.16") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/f/fixtures/fixtures-" - version ".tar.gz")) - (sha256 - (base32 - "0x9r2gwilcig5g54k60bxzg96zabizq1855lrprlb4zckalp9asc")))) - (build-system python-build-system) - (arguments - '(#:tests? #f)) ; no setup.py test command - (home-page "https://launchpad.net/python-fixtures") - (synopsis "Python test fixture library") - (description - "Fixtures provides a way to create reusable state, useful when writing -Python tests.") - (license (list license:bsd-3 license:asl2.0)))) ; at user's option - -(define-public python2-fixtures-0.3.16 - (package-with-python2 python-fixtures-0.3.16)) - -(define-public python-pbr-0.11 - (package - (name "python-pbr") - (version "0.11.0") +;; Recent versions of python-fixtures and python-testrepository need +;; python-pbr for packaging, which itself needs these two packages for +;; testing. +;; To fix this circular dependency, we use a build of python-pbr, based on the +;; same source, just without any test dependencies and with tests disabled. +;; python-pbr-minmal is then used to package python-fixtures and +;; python-testrepository. +;; Strictly speaking we currently could remove the test-requirements from the +;; normal python-pbr package (and save this package) since test are disabled +;; there anyway. But this may change in future. +(define python-pbr-minimal + (package + (name "python-pbr-minimal") + (version "1.8.1") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/pbr/pbr-" - version ".tar.gz")) + (uri (pypi-uri "pbr" version)) (sha256 (base32 - "0v9gb7gyqf7q9s99l0nnjj9ww9b0jvyqlwm4d56pcyinxydddw6p")))) + "0jcny36cf3s8ar5r4a575npz080hndnrfs4np1fqhv0ym4k7c4p2")))) (build-system python-build-system) (arguments - `(#:tests? #f)) ;; Most tests seem to use the Internet. - (propagated-inputs - `(("python-fixtures-0.3.16" ,python-fixtures-0.3.16))) - (home-page "https://launchpad.net/pbr") - (synopsis "Change the default behavior of Python’s setuptools") + `(#:tests? #f)) + (home-page "http://docs.openstack.org/developer/pbr/") + (synopsis "Minimal build of python-pbr used for bootstrapping") (description - "Python Build Reasonableness (PBR) is a library that injects some useful -and sensible default behaviors into your setuptools run.") + "Used only for bootstrapping python2-pbr, you should not need this.") (license license:asl2.0))) -(define-public python2-pbr-0.11 - (package-with-python2 python-pbr-0.11)) +(define python2-pbr-minimal + (package-with-python2 python-pbr-minimal)) (define-public python-pbr (package + (inherit python-pbr-minimal) (name "python-pbr") - (version "1.8.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/pbr/pbr-" - version - ".tar.gz")) - (sha256 - (base32 - "0jcny36cf3s8ar5r4a575npz080hndnrfs4np1fqhv0ym4k7c4p2")))) - (build-system python-build-system) (arguments `(#:tests? #f)) ;; Most tests seem to use the Internet. (propagated-inputs - `(("python-testrepository" ,python-testrepository) - ("git" ,git))) ;; pbr actually uses the "git" binary. - (inputs + `(("git" ,git))) ;; pbr actually uses the "git" binary. + (native-inputs `(("python-fixtures" ,python-fixtures) - ("python-mimeparse" ,python-mimeparse) + ;; discover, coverage, hacking, subunit ("python-mock" ,python-mock) - ("python-six" ,python-six) + ("python-six" ,python-six) ("python-sphinx" ,python-sphinx) ("python-testrepository" ,python-testrepository) ("python-testresources" ,python-testresources) ("python-testscenarios" ,python-testscenarios) ("python-testtools" ,python-testtools) ("python-virtualenv" ,python-virtualenv))) - (home-page "https://launchpad.net/pbr") - (synopsis "Change the default behavior of Python’s setuptools") + (synopsis "Enhance the default behavior of Python’s setuptools") (description "Python Build Reasonableness (PBR) is a library that injects some useful -and sensible default behaviors into your setuptools run.") - (license license:asl2.0))) +and sensible default behaviors into your setuptools run. It will set +versions, process requirements files and generate AUTHORS and ChangeLog file +from git information. +"))) (define-public python2-pbr (package-with-python2 python-pbr)) @@ -2058,7 +2019,7 @@ and sensible default behaviors into your setuptools run.") (propagated-inputs `(("python-six" ,python-six))) (native-inputs - `(("python-pbr-0.11" ,python-pbr-0.11) + `(("python-pbr-minimal" ,python-pbr-minimal) ("python-testtools" ,python-testtools))) (home-page "https://launchpad.net/python-fixtures") (synopsis "Python test fixture library") @@ -2088,6 +2049,7 @@ Python tests.") `(("python-testtools" ,python-testtools))) (native-inputs `(("python-fixtures" ,python-fixtures) + ("python-pbr-minimal" ,python-pbr-minimal) ;; same as for building fixture ("python-subunit" ,python-subunit) ("python-mimeparse" ,python-mimeparse))) (home-page "https://launchpad.net/testrepository") -- cgit v1.2.3 From 5e1c9d242abe6c992c4435d7cfb035d2b6583679 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 6 Oct 2016 18:14:29 +0200 Subject: gnu: python-singledispatch: correct inputs. python-six is only required for conversion, not at run-time * gnu/packages/python.scm (python-singledispatch, python2-singledispatch): [inputs] Move python-six to [native-inputs]. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 40e6ac9c08..ea6fc83bbf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5270,8 +5270,8 @@ It is written entirely in Python.") (base32 "171b7ip0hsq5qm83np40h3phlr36ym18w0lay0a8v08kvy3sy1jv")))) (build-system python-build-system) - (inputs - `(("python-six" ,python-six))) + (native-inputs + `(("python-six" ,python-six))) ; required for conversion, not at run-time (home-page "http://docs.python.org/3/library/functools.html#functools.singledispatch") (synopsis "Backport of singledispatch feature from Python 3.4") -- cgit v1.2.3 From 6151120a71507017bfea82693c7e614b341e50e7 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 7 Oct 2016 20:32:47 +0200 Subject: gnu: python-pillow: Fix build. * gnu/packages/python.scm (python-pillow)[check-installed]: Add installed site-package to PYTHONPATH. --- gnu/packages/python.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ea6fc83bbf..fb5d2fd16a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3991,9 +3991,12 @@ services for your Python modules and applications.") `(#:phases (modify-phases %standard-phases (add-after 'install 'check-installed - (lambda _ + (lambda* (#:key outputs inputs #:allow-other-keys) (begin (setenv "HOME" (getcwd)) + ;; Make installed package available for running the + ;; tests + (add-installed-pythonpath inputs outputs) (and (zero? (system* "python" "selftest.py" "--installed")) (zero? (system* "python" "test-installed.py")))))) -- cgit v1.2.3 From 05c2fd3685adc7f4257606e9a7f6d28753047352 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 7 Oct 2016 21:48:36 +0200 Subject: gnu: python-pytest-flakes: Fix build. * python.scm (python-pytest-flakes): Set PYTHONPATH prior to running tests. --- gnu/packages/python.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fb5d2fd16a..a22be5c794 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10960,7 +10960,10 @@ failures.") (modify-phases %standard-phases (delete 'check) (add-after 'install 'check - (lambda _ ; It's easier to run tests after install. + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; It's easier to run tests after install. + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) (zero? (system* "py.test" "-vv"))))))) (native-inputs `(("python-coverage" ,python-coverage) -- cgit v1.2.3 From 47f77210fcd2a4da49348419515d77471adfee0a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 7 Oct 2016 21:45:52 +0200 Subject: gnu: python-zope-schema: Add missing inputs. * gnu/packages.python.scm (python-zope-schema): Add python-coverage and python-nose to native-inputs. --- gnu/packages/python.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a22be5c794..7f14abe091 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7098,7 +7098,9 @@ internationalized messages within program source text.") `(("python-zope-event" ,python-zope-event) ("python-zope-interface" ,python-zope-interface))) (native-inputs - `(("python-zope-testing" ,python-zope-testing))) + `(("python-zope-testing" ,python-zope-testing) + ("python-coverage" ,python-coverage) + ("python-nose" ,python-nose))) (home-page "http://pypi.python.org/pypi/zope.schema") (synopsis "Zope data schemas") (description "Zope.scheme provides extensions to zope.interface for -- cgit v1.2.3 From e408ffc302f4381bcb198fbd83e210a4a1ce5dbc Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 7 Oct 2016 21:47:02 +0200 Subject: gnu: python-zope-testing: Remove needless input. * gnu/packages.python.scm (python-zope-testing): Remove python-zope-interface from native-imports. --- gnu/packages/python.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7f14abe091..c090ed5730 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7037,6 +7037,7 @@ forms, HTTP servers, regular expressions, and more.") (build-system python-build-system) (native-inputs `(("python-six" ,python-six) + ;("python-zope-interface" ,python-zope-interface) ("python-zope-exceptions" ,python-zope-exceptions) ("python-zope-testing" ,python-zope-testing) ("unzip" ,unzip))) -- cgit v1.2.3 From b72ac1b54b5a4e94f2c57c5ee026133c0160ee60 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 7 Oct 2016 22:03:39 +0200 Subject: gnu: python2-pysnptools: Correct inputs. dateutil, pytz, and six do not occur in the code. Remove python-dateutil, python-pytz, python-six from inputs; Move python-cython to native-inputs; move python-pandas to propagated-inputs. --- gnu/packages/python.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c090ed5730..bf1a8251ba 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3517,12 +3517,9 @@ toolkits.") (propagated-inputs `(("python2-numpy" ,python2-numpy) ("python2-scipy" ,python2-scipy) - ("python2-pytz" ,python2-pytz) - ("python2-cython" ,python2-cython))) - (inputs - `(("python2-dateutil-2" ,python2-dateutil-2) - ("python2-pandas" ,python2-pandas) - ("python2-six" ,python2-six))) + ("python2-pandas" ,python2-pandas))) + (native-inputs + `(("python2-cython" ,python2-cython))) (native-inputs `(("unzip" ,unzip))) (home-page "http://research.microsoft.com/en-us/um/redmond/projects/mscompbio/") -- cgit v1.2.3 From 9e8c6a37dbded0ee721067b4c4066df5f987203a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 8 Oct 2016 14:54:39 +0200 Subject: gnu: python-fonttools: Remove intervening directory in site-packges. * gnu/packages/python.scm (python-fonttools): Add phase patch-setuppy. --- gnu/packages/python.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bf1a8251ba..b160ef5874 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5722,12 +5722,23 @@ term.js Javascript terminal emulator library.") (base32 "08ay3x4ijarwhl60gqx2i9jzq6pxs20p4snc2d1q5jagh4rn39lb")))) (build-system python-build-system) - (arguments '(#:test-target "check")) + (arguments + '(#:test-target "check" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-setuppy + ;; Remove the undocumented "extra_path" argument, which adds an + ;; intervening directories between site-packages and the package + ;; directory. + (lambda _ + (substitute* "setup.py" + (("^[ \t]*extra_path *= *'FontTools',") "")) + #t))))) (home-page "http://github.com/behdad/fonttools") (synopsis "Tools to manipulate font files") (description "FontTools/TTX is a library to manipulate font files from Python. It -supports reading and writinfg of TrueType/OpenType fonts, reading and writing +supports reading and writing of TrueType/OpenType fonts, reading and writing of AFM files, reading (and partially writing) of PS Type 1 fonts. The package also contains a tool called “TTX” which converts TrueType/OpenType fonts to and from an XML-based format.") -- cgit v1.2.3 From 2efabc5589dc641dce75702b99253a3fb40bb2eb Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 13 Oct 2016 14:34:13 +0200 Subject: gnu: python-numpy-bootstrap, python-numpy: Fix build. * gnu/packages/python.scm (python-numpy-bootstrap): Correct inputs, use modify-phases, add dummy newlines character to string to make emacs happy, set PYTHONPATH prior to running tests. (python-numpy): propagate inputs, set PYTHONPATH prior to building docs. --- gnu/packages/python.scm | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b160ef5874..092378c1ba 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3098,18 +3098,17 @@ between language specification and implementation aspects.") (base32 "1bjjhvncraka5s6i4lg644jrxij6bvycxy7an20gcz3a0m11iygp")))) (build-system python-build-system) - (native-inputs - `(("python-nose" ,python-nose))) (inputs `(("openblas" ,openblas) ("lapack" ,lapack))) (native-inputs - `(("gfortran" ,gfortran))) + `(("python-nose" ,python-nose) + ("gfortran" ,gfortran))) (arguments `(#:phases - (alist-cons-before - 'build 'set-environment-variables - (lambda* (#:key inputs #:allow-other-keys) + (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 @@ -3118,7 +3117,8 @@ libraries = openblas library_dirs = ~a/lib include_dirs = ~a/include -[lapack] +# backslash-n to make emacs happy +\n[lapack] lapack_libs = lapack library_dirs = ~a/lib include_dirs = ~a/include @@ -3131,18 +3131,17 @@ include_dirs = ~a/include (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) + #t)) ;; Tests can only be run after the library has been installed and not ;; within the source directory. - (alist-cons-after - 'install 'check - (lambda _ + (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)")))) - (alist-delete - 'check - %standard-phases))))) + "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 @@ -3175,10 +3174,10 @@ capabilities.") ("python2-matplotlib" ,python2-matplotlib) ("python2-pandas" ,python2-pandas) ("python2-scikit-learn" ,python2-scikit-learn) - ("python2-cython" ,python2-cython) ("python2-pysnptools" ,python2-pysnptools))) (native-inputs `(("unzip" ,unzip) + ("python2-cython" ,python2-cython) ("python2-mock" ,python2-mock))) (home-page "http://research.microsoft.com/en-us/um/redmond/projects/mscompbio/fastlmm/") (synopsis "Perform genome-wide association studies on large data sets") @@ -3193,14 +3192,15 @@ association studies (GWAS) on extremely large data sets.") (name "python-numpy") (outputs '("out" "doc")) (inputs - `(("which" ,which) - ("python-matplotlib" ,python-matplotlib) - ("python-sphinx" ,python-sphinx) + `(("which" ,which))) + (propagated-inputs + `(("python-matplotlib" ,python-matplotlib) ("python-pyparsing" ,python-pyparsing) - ("python-numpydoc" ,python-numpydoc) ,@(package-inputs python-numpy-bootstrap))) (native-inputs `(("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx) + ("python-numpydoc" ,python-numpydoc) ("texlive" ,texlive) ("texinfo" ,texinfo) ("perl" ,perl) @@ -3211,7 +3211,10 @@ association studies (GWAS) on extremely large data sets.") ((#:phases phases) `(alist-cons-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make installed package available for building the + ;; documentation + (add-installed-pythonpath inputs outputs) (let* ((data (string-append (assoc-ref outputs "doc") "/share")) (doc (string-append data "/doc/" ,name "-" -- cgit v1.2.3 From ca33a3ad970db4fa7ede5d977db576ae98e67406 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 9 Oct 2016 13:19:50 +0200 Subject: gnu: python-matplotlib: Fix build. * gnu/packages/python.scm (python-matplotlib, python2-matplotlib): Correct inputs. [install-doc] set PYTHONPATH prior to building docs. --- gnu/packages/python.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 092378c1ba..0c5450bec4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3385,6 +3385,11 @@ transcendental functions).") ("python-pygobject" ,python-pygobject) ("gobject-introspection" ,gobject-introspection) ("python-tkinter" ,python "tk") + ("python-dateutil" ,python-dateutil-2) + ("python-numpy" ,python-numpy-bootstrap) + ("python-pillow" ,python-pillow) + ("python-pytz" ,python-pytz) + ("python-six" ,python-six) ;; The 'gtk+' package (and 'gdk-pixbuf', 'atk' and 'pango' propagated ;; from 'gtk+') provides the required 'typelib' files used by ;; 'gobject-introspection'. The location of these files is set with the @@ -3401,20 +3406,11 @@ transcendental functions).") ("python-pycairo" ,python-pycairo) ("python-cairocffi" ,python-cairocffi))) (inputs - `(("python-dateutil" ,python-dateutil-2) - ("python-six" ,python-six) - ("python-pytz" ,python-pytz) - ("python-numpy" ,python-numpy-bootstrap) - ("python-sphinx" ,python-sphinx) - ("python-numpydoc" ,python-numpydoc) - ("python-nose" ,python-nose) - ("python-mock" ,python-mock) - ("libpng" ,libpng) + `(("libpng" ,libpng) ("imagemagick" ,imagemagick) ("freetype" ,freetype) ("cairo" ,cairo) ("glib" ,glib) - ("python-pillow" ,python-pillow) ;; FIXME: Add backends when available. ;("python-wxpython" ,python-wxpython) ;("python-pyqt" ,python-pyqt) @@ -3422,6 +3418,10 @@ transcendental functions).") ("tk" ,tk))) (native-inputs `(("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx) + ("python-numpydoc" ,python-numpydoc) + ("python-nose" ,python-nose) + ("python-mock" ,python-mock) ("texlive" ,texlive) ("texinfo" ,texinfo))) (arguments @@ -3446,11 +3446,14 @@ backend = TkAgg~%" (assoc-ref inputs "tk")))))) (alist-cons-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((data (string-append (assoc-ref outputs "doc") "/share")) (doc (string-append data "/doc/" ,name "-" ,version)) (info (string-append data "/info")) (html (string-append doc "/html"))) + ;; Make installed package available for building the + ;; documentation + (add-installed-pythonpath inputs outputs) (with-directory-excursion "doc" ;; Produce pdf in 'A4' format. (substitute* (find-files "." "conf\\.py") -- cgit v1.2.3 From d548e6aa06702793471ae764bd4df3265dbcfb7f Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 9 Oct 2016 16:05:24 +0200 Subject: gnu: python-scipy: Fix build. * gnu/packages/python.scm (python-scipy) Use add-installed-pythonpath. Add dummy newlines character to string to make emacs happy. --- gnu/packages/python.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0c5450bec4..e0d0843839 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3614,7 +3614,9 @@ functions.") libraries = openblas library_dirs = ~a/lib include_dirs = ~a/include -[atlas] + +# backslash-n to make emacs happy +\n[atlas] library_dirs = ~a/lib atlas_libs = openblas " @@ -3624,11 +3626,14 @@ atlas_libs = openblas #t) (alist-cons-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((data (string-append (assoc-ref outputs "doc") "/share")) (doc (string-append data "/doc/" ,name "-" ,version)) (html (string-append doc "/html")) (pyver ,(string-append "PYVER="))) + ;; Make installed package available for building the + ;; documentation + (add-installed-pythonpath inputs outputs) (with-directory-excursion "doc" ;; Fix generation of images for mathematical expressions. (substitute* (find-files "source" "conf\\.py") -- cgit v1.2.3 From eee5cd04405dc499fcdce20f9219a9bded5720ce Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 9 Oct 2016 16:09:13 +0200 Subject: gnu: python-ipython: Fix build. * gnu/packages/python.scm (python-ipython, python2-ipython) [check, install-doc] set PYTHONPATH prior to running tests. --- gnu/packages/python.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e0d0843839..a3fd374a6f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4664,6 +4664,8 @@ tools for mocking system commands and recording calls to those.") (info (string-append data "/info")) (examples (string-append doc "/examples"))) (setenv "LANG" "en_US.utf8") + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) (with-directory-excursion "docs" ;; FIXME: pdf fails to build ;;(system* "make" "pdf" "PAPER=a4") @@ -4683,9 +4685,11 @@ tools for mocking system commands and recording calls to those.") (delete 'check) (add-after 'install 'check - (lambda* (#:key outputs tests? #:allow-other-keys) + (lambda* (#:key inputs outputs tests? #:allow-other-keys) (if tests? (with-directory-excursion "/tmp" + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) (setenv "HOME" "/tmp/") ;; required by a test (zero? (system* (string-append (assoc-ref outputs "out") "/bin/iptest")))) -- cgit v1.2.3 From a08a8350343145b18301ba0926787c0e28ee24fc Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 10 Oct 2016 11:03:37 +0200 Subject: gnu: vdirsyncer: Fix build by setting correct PYTHONPATH. For thus, use add-installed-pythonpath. * gnu/packages/dav.scm (vdirsyncer): set PYTHONPATH using add-installed-pythonpath. --- gnu/packages/dav.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 835b8fcf39..a06878dc92 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -73,11 +73,8 @@ clients.") ;; vdirsyncer requires itself to be installed in order to build ;; the manpage. (add-after 'install 'manpage - (lambda* (#:key outputs #:allow-other-keys) - (setenv "PYTHONPATH" - (string-append - (getenv "PYTHONPATH") - ":" (assoc-ref outputs "out"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) (zero? (system* "make" "--directory=docs/" "man")) (install-file "docs/_build/man/vdirsyncer.1" -- cgit v1.2.3 From 48160559a1a443f8d3024376ab79a925b25ebc42 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 10 Oct 2016 11:13:36 +0200 Subject: gnu: thefuck: Fix build. Requires setuptools >= 17.1 due to some features used, while our python currently only includes 12.0. * gnu/packages/admin.scm (thefuck): Add setuptools to native-inputs. --- gnu/packages/admin.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ee07b3be8a..f1c283c7c2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1701,6 +1701,10 @@ throughput (in the same interval).") ("python-decorator" ,python-decorator) ("python-psutil" ,python-psutil) ("python-six" ,python-six))) + (inputs + ;; Requires setuptools >= 17.1 due to some features used, while our + ;; python currently only includes 12.0. TODO: Remove this input. + `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/nvbn/thefuck") (synopsis "Correct mistyped console command") (description -- cgit v1.2.3 From e116d100fd8f87c65bab91a5a599804d5fb64708 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 10 Oct 2016 11:37:52 +0200 Subject: gnu: openstack: Correct inputs. * gnu/packages/openstack.scm (python-os-testr) Propagate input python-subunit, change all other inputs to native-inputs. (python-mox3): Remove needless input python-six. (python-stevedore, python-requests-mock): Move python-pbr to native-inputs. --- gnu/packages/openstack.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 55fd005f9b..e2672668d8 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -149,7 +149,6 @@ guidelines}.") (native-inputs `(("python-fixtures" ,python-fixtures) ("python-pbr" ,python-pbr) - ("python-six" ,python-six) ("python-testtools" ,python-testtools))) (home-page "http://www.openstack.org/") (synopsis "Mock object framework for Python") @@ -217,11 +216,11 @@ tested on Python version 3.2, 2.7 and 2.6.") ;; when building the package. Skip the tests for now. `(#:tests? #f)) (propagated-inputs + `(("python-subunit" ,python-subunit))) + (native-inputs `(("python-pbr" ,python-pbr) - ("python-subunit" ,python-subunit) - ("python-testtools" ,python-testtools))) - (inputs - `(("python-babel" ,python-babel))) + ("python-testtools" ,python-testtools) + ("python-babel" ,python-babel))) (home-page "https://www.openstack.org/") (synopsis "Testr wrapper to provide functionality for OpenStack projects") (description @@ -247,10 +246,9 @@ tested on Python version 3.2, 2.7 and 2.6.") (propagated-inputs `(("python-requests" ,python-requests) ("python-six" ,python-six))) - (inputs - `(("python-pbr" ,python-pbr))) (native-inputs - `(("python-discover" ,python-discover) + `(("python-pbr" ,python-pbr) + ("python-discover" ,python-discover) ("python-docutils" ,python-docutils) ("python-fixtures" ,python-fixtures) ("python-mock" ,python-mock) @@ -281,10 +279,9 @@ portions of your testing code.") (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) - (inputs - `(("python-pbr" ,python-pbr))) (native-inputs - `(;; Tests + `(("python-pbr" ,python-pbr) + ;; Tests ("python-docutils" ,python-docutils) ("python-mock" ,python-mock) ("python-oslotest" ,python-oslotest) -- cgit v1.2.3 From abcc7a0eb9ddb975689a56d818c6a44605211b43 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 10 Oct 2016 11:39:29 +0200 Subject: gnu: python-pandas: Fix build. * gnu/packages/python.scm (python-pandas): Add python-cython to native-inputs. --- gnu/packages/python.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a3fd374a6f..234f85672f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1036,7 +1036,8 @@ datetime module, available in Python 2.3+.") ("python-pytz" ,python-pytz) ("python-dateutil" ,python-dateutil-2))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-nose" ,python-nose) + ("python-cython" ,python-cython))) (home-page "http://pandas.pydata.org") (synopsis "Data structures for data analysis, time series, and statistics") (description -- cgit v1.2.3 From 521b77729e6383b1de10838395625a4b2aa5ff9e Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 10 Oct 2016 12:14:10 +0200 Subject: gnu: python-scripttest: Correct inputs. python-pytest is only required for testing, not at run-time. * gnu/packages/python.scm (python-singledispatch, python2-singledispatch): [propagated-inputs] Move python-pytest to [native-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 234f85672f..b349e3f552 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1821,7 +1821,7 @@ result back.") (base32 "0f4w84k8ck82syys7yg9maz93mqzc8p5ymis941x034v44jzq74m")))) (build-system python-build-system) - (propagated-inputs + (native-inputs `(("python-pytest" ,python-pytest))) (home-page "http://pythonpaste.org/scripttest/") (synopsis "Python library to test command-line scripts") -- cgit v1.2.3 From b52ad3714a44db81a739069f8286f005923707a3 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 10 Oct 2016 12:15:04 +0200 Subject: gnu: python-subunit, python-testrepository: Fix inputs * gnu/packages/python.scm (python-subunit, python2-subunit): [propagated-inputs]:: Add python-extras, remove python-testtools, move python-testscenarios to [native-inputs]. (python-testrepository, python2-testrepository): [native-inputs] move python-fixtures and python-subunit to [propagated-inputs] --- gnu/packages/python.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b349e3f552..4410af2b49 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1929,9 +1929,10 @@ use of resources by test cases.") "1nkw9wfbvizmpajbj3in8ns07g7lwkiv8hip14jjlwk3cacls6jv")))) (build-system python-build-system) (propagated-inputs - `(("python-testtools" ,python-testtools) - ("python-mimeparse" ,python-mimeparse) - ("python-testscenarios" ,python-testscenarios))) + `(("python-extras" ,python-extras) + ("python-mimeparse" ,python-mimeparse))) + (native-inputs + `(("python-testscenarios" ,python-testscenarios))) (home-page "http://launchpad.net/subunit") (synopsis "Python implementation of the subunit protocol") (description @@ -2047,11 +2048,11 @@ Python tests.") "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m")))) (build-system python-build-system) (propagated-inputs - `(("python-testtools" ,python-testtools))) - (native-inputs `(("python-fixtures" ,python-fixtures) - ("python-pbr-minimal" ,python-pbr-minimal) ;; same as for building fixture ("python-subunit" ,python-subunit) + ("python-testtools" ,python-testtools))) + (native-inputs + `(("python-pbr-minimal" ,python-pbr-minimal) ;; same as for building fixture ("python-mimeparse" ,python-mimeparse))) (home-page "https://launchpad.net/testrepository") (synopsis "Database for Python test results") -- cgit v1.2.3 From c4516ad206ab8558b3de5695fd62851855a31439 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 10 Oct 2016 12:00:11 +0200 Subject: gnu: python-pytest-xdist: Remove needless input python-apipkg. * gnu/packages/python.scm (python-pytest-xdist): Remove input python-apipkg. --- gnu/packages/python.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4410af2b49..e091ceff65 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1787,8 +1787,7 @@ same arguments.") `(("unzip" ,unzip) ("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs - `(("python-apipkg" ,python-apipkg) - ("python-execnet" ,python-execnet) + `(("python-execnet" ,python-execnet) ("python-pytest" ,python-pytest) ("python-py" ,python-py))) (home-page -- cgit v1.2.3 From e0ed457944d1166d8d2bb53dab6e724989d1576c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 11:40:26 +0200 Subject: gnu: python-setuptools: remove pre-built binaries from source. These are used to build self-extracting installers for Windows. * gnu/packages/python.scm (python-setuptools, python2-setuptools) [source]: Add snippet to delete *.exe files. --- gnu/packages/python.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e091ceff65..1ecfb6ccbc 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -825,7 +825,15 @@ have been used.") version ".tar.gz")) (sha256 (base32 - "0kc7rbav00ks6iaw14p38y81q12fx0lpkhgf5m97xc04f5r318ig")))) + "0kc7rbav00ks6iaw14p38y81q12fx0lpkhgf5m97xc04f5r318ig")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove included binaries which are used to build self-extracting + ;; installers for Windows. + ;; TODO: Find some way to build them ourself so we can include them. + (for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$")) + #t)))) (build-system python-build-system) ;; FIXME: Tests require pytest, which itself relies on setuptools. ;; One could bootstrap with an internal untested setuptools. -- cgit v1.2.3 From 8e73d3baabbf17eb4e0fab56063c6d9b9c14aab2 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 6 Oct 2016 16:59:36 +0200 Subject: gnu: python-testscenarios: remove needless input "mimetools". This does not occur in the source. * gnu/packages/python.scm (python-testscenarios, python2-testscenarios) [propagated-inputs]: Remove python-mimeparse. --- gnu/packages/python.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1ecfb6ccbc..770603db58 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1884,8 +1884,7 @@ compatibility.") "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg")))) (build-system python-build-system) (propagated-inputs - `(("python-testtools" ,python-testtools) - ("python-mimeparse" ,python-mimeparse))) + `(("python-testtools" ,python-testtools))) (home-page "https://launchpad.net/testscenarios") (synopsis "Pyunit extension for dependency injection") (description -- cgit v1.2.3 From d5e41cf28ca400cc1ce060945518f77cc9efc818 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 6 Oct 2016 17:00:28 +0200 Subject: gnu: pytest-mock: remove needless propagated input "python-py". This is not listed as an requirement and is already propagated by python-pytest. * gnu/packages/python.scm (python-pytest-mock, python2-pytest-mock): [propagated-inputs]: Remove python-py. --- gnu/packages/python.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 770603db58..d50a4bdf4e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1750,8 +1750,7 @@ supports coverage of subprocesses.") (native-inputs `(("unzip" ,unzip))) (propagated-inputs - `(("python-py" ,python-py) - ("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/pytest-dev/pytest-mock/") (synopsis "Thin-wrapper around the mock package for easier use with py.test") (description -- cgit v1.2.3 From 25b2c47d753efd0761a4e16519dce38d828789f5 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 18:40:58 +0200 Subject: gnu: python-statsmodels: Fix build * gnu/packages/statistics.scm (python-statsmodels): [check] set PYTHONPATH prior to running tests. --- gnu/packages/statistics.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cca08d26a8..3461799420 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1444,11 +1444,13 @@ building design matrices.") line))) #t)) (add-after 'install 'check - (lambda _ - (with-directory-excursion "/tmp" - (zero? (system* "nosetests" - "--stop" - "-v" "statsmodels")))))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) + (with-directory-excursion "/tmp" + (zero? (system* "nosetests" + "--stop" + "-v" "statsmodels")))))))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-scipy" ,python-scipy) -- cgit v1.2.3 From f78e1c27ef8b3ea82c38c689f6b2b819c47aa6e6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 18:56:15 +0200 Subject: gnu: python-cov-core: Fix imports. * gnu/packages/python.scm (python-cov-core) [inputs]: change to [propagated-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d50a4bdf4e..a14c15776f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2105,7 +2105,7 @@ executed.") (base32 "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a")))) (build-system python-build-system) - (native-inputs + (propagated-inputs `(("python-coverage" ,python-coverage))) (home-page "https://github.com/schlamar/cov-core") (synopsis "plugin core for use by pytest-cov, nose-cov and nose2-cov") -- cgit v1.2.3 From 130fe99410e52eb647c8fcff8e2de1c6b0b7575a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 19:19:33 +0200 Subject: gnu: python-pyjwt: Add missing inputs and enable test-suite. * gnu/packages/python.scm (python-pyjwt) [native-inputs]: Add python-pytest and python-pytest-cov. [arguments]. Remove. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a14c15776f..8213e83fb1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2440,9 +2440,9 @@ somewhat intelligeble.") "1556v2jppd8mjkkj66pxb5rcazm35jq81r233mdl8hfmz9n3icp1")))) (build-system python-build-system) (native-inputs - `(("python-pytest-runner" ,python-pytest-runner))) - (arguments - '(#:tests? #f)) ; test suite doesn't work + `(("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-runner" ,python-pytest-runner))) (home-page "http://github.com/progrium/pyjwt") (synopsis "JSON Web Token implementation in Python") (description -- cgit v1.2.3 From bb06aa344656b044f83cc2f0ac4c7bcbf5cd10e6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 19:26:33 +0200 Subject: gnu: python-oauthlib, python-oauthlib2: Correct inputs. * gnu/packages/python.scm (python-oauthlib) [propagated-inputs] Move all to [native-inputs]. [native-inputs]: Remove python-mock, python-coverage. (python2-oauthlib)[native-inputs]: Add python2-mock. --- gnu/packages/python.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8213e83fb1..117e845672 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2464,13 +2464,10 @@ somewhat intelligeble.") "1bfrj70vdjxjw74khbyh6f0dksv7p5rh2346jnlrffyacd3gwjzg")))) (build-system python-build-system) (native-inputs - `(("python-coverage" ,python-coverage) - ("python-nose" ,python-nose) - ("python-mock" ,python-mock))) - (propagated-inputs - `(("python-blinker" ,python-blinker) + `(("python-nose" ,python-nose) ("python-cryptography" ,python-cryptography) - ("python-pyjwt" ,python-pyjwt))) + ("python-pyjwt" ,python-pyjwt) + ("python-blinker" ,python-blinker))) (home-page "https://github.com/idan/oauthlib") (synopsis "OAuth implementation for Python") (description @@ -2484,6 +2481,7 @@ OAuth request-signing logic.") (package (inherit base) (native-inputs `(("python2-unittest2" ,python2-unittest2) + ("python2-mock" ,python2-mock) ,@(package-native-inputs base)))))) (define-public python-itsdangerous -- cgit v1.2.3 From 6aa5f1ca240b6daf4dbc5c3031fdd697119a49ea Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 19:32:06 +0200 Subject: gnu: python-joblib: Remove python byte-code files from source. * gnu/packages/python.scm (python-joblib, python2-joblib)[source]: Add snippet. --- gnu/packages/python.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 117e845672..8190a3bd2b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2649,7 +2649,15 @@ logic-free templating system Mustache.") (uri (pypi-uri "joblib" version)) (sha256 (base32 - "0787k919zlfmgymprz5bzv0v1df5bbirlf3awrghmjgvkrd9dci9")))) + "0787k919zlfmgymprz5bzv0v1df5bbirlf3awrghmjgvkrd9dci9")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove pre-compiled .pyc files from source. + (for-each delete-file-recursively + (find-files "." "__pycache__" #:directories? #t)) + (for-each delete-file (find-files "." "\\.pyc$")) + #t)))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From f052ec9a509d78aa5f0f1034241435a91a0a246f Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 19:32:41 +0200 Subject: gnu: python-joblib: Add comment. * gnu/packages/python.scm (python-joblib): Add comment. --- gnu/packages/python.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8190a3bd2b..7555711607 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2678,6 +2678,7 @@ logic-free templating system Mustache.") (("def test_parallel_with_interactively_defined_functions" line) (string-append "@SkipTest\n" line))) #t))))) + ;; Provide nose to enable tests command (native-inputs `(("python-nose" ,python-nose) ("python-sphinx" ,python-sphinx) -- cgit v1.2.3 From 7c88bcf4bb585050448d275dd0bb72fad660dda6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 19:34:57 +0200 Subject: gnu: python-feedgenerator: Remove python byte-code files from source. * gnu/packages/python.scm (python-feedgenerator, python2-feedgenerator) [source]: Add snippet. --- gnu/packages/python.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7555711607..d05035ea81 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2806,7 +2806,15 @@ sources.") (uri (pypi-uri "feedgenerator" version)) (sha256 (base32 - "0mkimp1fpdan4p3882vzcws4l594k71ich4g0wq97jbra7p602n0")))) + "0mkimp1fpdan4p3882vzcws4l594k71ich4g0wq97jbra7p602n0")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove pre-compiled .pyc files from source. + (for-each delete-file-recursively + (find-files "." "__pycache__" #:directories? #t)) + (for-each delete-file (find-files "." "\\.pyc$")) + #t)))) (build-system python-build-system) (propagated-inputs `(("python-pytz" ,python-pytz) -- cgit v1.2.3 From 9fbe7b2bca101835b2e456af1aecd2be9ec9f182 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 19:38:41 +0200 Subject: gnu: python-blinker: No longer disable tests. The package does not provide tests, but there is no need to disable them. Having them enabled allows running them if some newer version may provide tests. * gnu/package/python.scm (python-blinker, python2-blinker): [arguments]: Remove. --- gnu/packages/python.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d05035ea81..88d99710ac 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2842,9 +2842,6 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") (base32 "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7")))) (build-system python-build-system) - ;; No "test" command supplied to setuptools, so unless there's another way - ;; to run tests, we're skipping them! - (arguments '(#:tests? #f)) (home-page "http://pythonhosted.org/blinker/") (synopsis "Fast, simple object-to-object and broadcast signaling") (description -- cgit v1.2.3 From b83e23337bcd13b880e3f8bacc371815efec4633 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 20:27:53 +0200 Subject: gnu: python-scikit-image: Correct inputs. * gnu/packages/python.scm: (python-scikit-image, python2-scikit-image) [propagated-inputs]: Move python-numpy and python-six to [native-inputs]. Add comment. --- gnu/packages/python.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 88d99710ac..f3ac670f9f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2960,15 +2960,16 @@ mining and data analysis.") (sha256 (base32 "0jz416fqvpahqyffw8plmszzfj669w8wvf3y9clnr5lr6a7md3kn")))) (build-system python-build-system) + ;; See DEPENDS.txt for the list of build and run time requiremnts (propagated-inputs `(("python-matplotlib" ,python-matplotlib) ("python-networkx" ,python-networkx) - ("python-numpy" ,python-numpy) ("python-scipy" ,python-scipy) - ("python-six" ,python-six) ("python-pillow" ,python-pillow))) (native-inputs - `(("python-cython" ,python-cython))) + `(("python-numpy" ,python-numpy) + ("python-cython" ,python-cython) + ("python-six" ,python-six))) (home-page "http://scikit-image.org/") (synopsis "Image processing in Python") (description -- cgit v1.2.3 From ddd1dc3d2d6728bfe55fb7d9f562556c4992b4f8 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 20:32:13 +0200 Subject: gnu: python2-scikit-image: Remove needless propagated-input. * gnu/packages/python.scm: (python2-scikit-image) [propagated-inputs]: Remove python-pytz, it does not occur anywhere in the source. --- gnu/packages/python.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f3ac670f9f..00a323fb37 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2983,10 +2983,7 @@ mining and data analysis.") (package (inherit scikit-image) (native-inputs `(("python2-mock" ,python2-mock) - ,@(package-native-inputs scikit-image))) - (propagated-inputs - `(("python2-pytz" ,python2-pytz) - ,@(package-propagated-inputs scikit-image)))))) + ,@(package-native-inputs scikit-image)))))) (define-public python-redis (package -- cgit v1.2.3 From 1273359455379895e2ae29ddeb9bcaf3f5001a6d Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 20:37:14 +0200 Subject: gnu: python2-scikit-image: Remove needless native-input and inheritance. Remove last additional [native-inputs] python-mock, thus there is no need to inherit python-scikit-image package. Simply use package-with-python2. * gnu/packages/python.scm: (python-scikit-image): [properties]: Remove python2-variant. (python2-scikit-image) Use simply "package-with-python2" after removing last [native-inputs] python-mock. --- gnu/packages/python.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 00a323fb37..2da510aff2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2974,16 +2974,10 @@ mining and data analysis.") (synopsis "Image processing in Python") (description "Scikit-image is a collection of algorithms for image processing.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-scikit-image)))))) + (license license:bsd-3))) (define-public python2-scikit-image - (let ((scikit-image (package-with-python2 - (strip-python2-variant python-scikit-image)))) - (package (inherit scikit-image) - (native-inputs - `(("python2-mock" ,python2-mock) - ,@(package-native-inputs scikit-image)))))) + (package-with-python2 python-scikit-image)) (define-public python-redis (package -- cgit v1.2.3 From cf8124b0177136598b07a8d7d0c68570e182b04b Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 20:41:36 +0200 Subject: gnu: python-redis: Remove unused input. * gnu/packages/python.scm (python-redis, python2-redis) Comment out [native-inputs] since these are used only for running tests, which is disabled since it requires a Redis server. --- gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2da510aff2..b7640dbda0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2994,8 +2994,9 @@ mining and data analysis.") (build-system python-build-system) ;; Tests require a running Redis server (arguments '(#:tests? #f)) - (native-inputs - `(("python-pytest" ,python-pytest))) + ;; As long as we are not running test, we do not need this input :-) + ;;(native-inputs + ;; `(("python-pytest" ,python-pytest))) (home-page "https://github.com/andymccurdy/redis-py") (synopsis "Redis Python client") (description -- cgit v1.2.3 From 213d1745c6adbfd274b1edc575529e026b0ab743 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 20:48:19 +0200 Subject: gnu: python-numpydoc: Correct inputs. * gnu/packages/python.scm (python-numpydoc, python-numpydoc) [native-inputs]: Remove python-docutils. Move python-shpinx to [propagated-inputs]. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b7640dbda0..36317cf1ec 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3334,9 +3334,9 @@ that client code uses to construct the grammar directly in Python code.") (("3") "2")))))) (build-system python-build-system) (native-inputs - `(("python-docutils" ,python-docutils) - ("python-sphinx" ,python-sphinx) - ("python-nose" ,python-nose))) + `(("python-sphinx" ,python-sphinx))) + (native-inputs + `(("python-nose" ,python-nose))) (home-page "https://pypi.python.org/pypi/numpydoc") (synopsis "Numpy's Sphinx extensions") -- cgit v1.2.3 From fe94cf0cdd8f94599fa79f163257a1feea4946e8 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 21:49:55 +0200 Subject: gnu: Add python-rst.linker, python2-rst.linker. * gnu/packages/python.scm (python-rst.linker, python2-rst.linker): New variables. --- gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 36317cf1ec..a261400383 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2796,6 +2796,36 @@ sources.") (define-public python2-sphinx-rtd-theme (package-with-python2 python-sphinx-rtd-theme)) +(define-public python-rst.linker + (package + (name "python-rst.linker") + (version "1.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "rst.linker" version)) + (sha256 + (base32 + "0bh4lnj2p1nh0wf5pgxgfbrp27xhb1rinahkb5j7s3qprq6qn0sr")))) + (build-system python-build-system) + (propagated-inputs + `(("python-dateutil" ,python-dateutil-2) + ("python-six" ,python-six))) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) + ;; Test would require path.py, which would introduce a cyclic dependence. + (arguments `(#:tests? #f)) + ;; Note: As of version 1.7 the documentation is not worth building. + (home-page "https://github.com/jaraco/rst.linker") + (synopsis "Sphinx plugin to add links and timestamps") + (description "rst.linker allows to automatically replace text by a +reStructuredText external reference or timestamps. It's primary purpose is to +augment the changelog, but it can be used for other documents, too.") + (license license:expat))) + +(define-public python2-rst.linker + (package-with-python2 python-rst.linker)) + (define-public python-feedgenerator (package (name "python-feedgenerator") -- cgit v1.2.3 From 2887700e4d6e9d43df97d9b11d9aba935951a3e8 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 21:48:40 +0200 Subject: gnu: python-pathpy: Build documentation. * gnu/packages/python.scm (python-pathpy, python2-pathpy) [output] Add output "doc". [native-inputs]: Add python-sphinx and python-rst.linker [build-doc], [install-doc]: New build phases. --- gnu/packages/python.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a261400383..62c5ecae6e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4398,13 +4398,33 @@ them as the version argument or in a SCM managed file.") "path.py/path.py-" version ".tar.gz")) (sha256 (base32 "1p8s1l2vfkqhqxdhqlj0g1jjw4f1as2frr35sjcpjjpd5a89y41f")))) + (outputs '("out" "doc")) (build-system python-build-system) (propagated-inputs `(("python-appdirs" ,python-appdirs))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) + ("python-sphinx" ,python-sphinx) + ("python-rst.linker" ,python-rst.linker) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda _ + (setenv "LANG" "en_US.UTF-8") + (zero? (system* "python" "setup.py" "build_sphinx")))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((data (string-append (assoc-ref outputs "doc") "/share")) + (doc (string-append data "/doc/" ,name "-" ,version)) + (html (string-append doc "/html"))) + (mkdir-p html) + (for-each (lambda (file) + (copy-file file (string-append doc "/" file))) + '("README.rst" "CHANGES.rst")) + (copy-recursively "build/sphinx/html" html))))))) (home-page "http://github.com/jaraco/path.py") (synopsis "Python module wrapper for built-in os.path") (description -- cgit v1.2.3 From 38d480a8a66f99443d76e30428406fb149d9a7b5 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 22:39:22 +0200 Subject: gnu: python-zope-interface: Correct inputs. * gnu/packages/python.scm(python-zope-interface)[propagated-inputs] change to [native-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 62c5ecae6e..f5deb44188 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7034,7 +7034,7 @@ dispatching systems can be built.") (base32 "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if")))) (build-system python-build-system) - (propagated-inputs + (native-inputs `(("python-zope-event" ,python-zope-event))) (home-page "https://github.com/zopefoundation/zope.interface") (synopsis "Python implementation of the \"design by contract\" -- cgit v1.2.3 From d27f176a7231b63b721f8ac49cdb431fdf095221 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 23:14:30 +0200 Subject: gnu: python-zope-location: Correct inputs. * gnu/packages/python.scm(python-zope-location)[native-inputs] change to [propagated-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f5deb44188..ced74808da 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7261,7 +7261,7 @@ brokering, etc.) for which the proxy is responsible.") (base32 "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74")))) (build-system python-build-system) - (native-inputs + (propagated-inputs `(("python-zope-proxy" ,python-zope-proxy) ("python-zope-schema" ,python-zope-schema))) (home-page "http://pypi.python.org/pypi/zope.location/") -- cgit v1.2.3 From 861f70c9da94e43e9fa175f214751d0aba641b2b Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 23:26:16 +0200 Subject: gnu: python-configobj: Correct inputs. * gnu/packages/python.scm(python-configobj)[native-inputs] change to [propagated-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ced74808da..d0862491fb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7456,7 +7456,7 @@ addon modules.") ;; required to parse the keyword 'install_requires' in setup.py. (patches (search-patches "python-configobj-setuptools.patch")))) (build-system python-build-system) - (native-inputs + (propagated-inputs `(("python-six" ,python-six))) (synopsis "Config file reading, writing and validation") (description "ConfigObj is a simple but powerful config file reader and -- cgit v1.2.3 From fd8e23b7b3ba095abd51e8ab41e35671e0bbc21d Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 23:28:36 +0200 Subject: gnu: python-zope-security: Correct inputs. * gnu/packages/python.scm(python-zope-security)[native-inputs] New element, move python-zope-component, python-zope-configuration, python-zope-location, python-zope-testrunner, python-zope-testing here. --- gnu/packages/python.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d0862491fb..9d609226c9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7288,10 +7288,12 @@ Zope3, which are are special objects that have a structural location.") (build-system python-build-system) (propagated-inputs `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) - ("python-zope-component" ,python-zope-component) - ("python-zope-location" ,python-zope-location) ("python-zope-proxy" ,python-zope-proxy) - ("python-zope-schema" ,python-zope-schema) + ("python-zope-schema" ,python-zope-schema))) + (native-inputs + `(("python-zope-component" ,python-zope-component) + ("python-zope-configuration" ,python-zope-configuration) + ("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") -- cgit v1.2.3 From a5333f7c61507e25657c7a5dd251f9b084ced886 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 23:28:48 +0200 Subject: gnu: python-websocket-client: Correct inputs. * gnu/packages/python.scm (python-websocket-client)[native-inputs] change to [propagated-inputs], remove a wrong comment. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9d609226c9..e7338cbcfb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7597,8 +7597,8 @@ tables.") (base32 "0h9glp1jll3z76ly3kg08aqgxqk0a68p4zi9yn50353bh5nj92v7")))) (build-system python-build-system) - (native-inputs - `(("python-six" ,python-six))) ; for tests + (propagated-inputs + `(("python-six" ,python-six))) (home-page "https://github.com/liris/websocket-client") (synopsis "WebSocket client for Python") (description "The Websocket-client module provides the low level APIs for -- cgit v1.2.3 From b9fc496ff65a1f5656c3e7f62220b44c23f17406 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 23:37:21 +0200 Subject: gnu: python-wsgi-intercept: Correct inputs. * gnu/packages/python.scm(python-wsgi-intercept): [native-inputs]: move python-six to [propagated-inputs]. [propagated-inputs] move python-httplib2, python-requests to [native-inputs]. --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e7338cbcfb..57b89efd05 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7824,13 +7824,13 @@ framework which enables you to test server connections locally.") (base32 "0kjj2v2dvmnpdd5h5gk9rzz0f54rhjb0yiz3zg65bmp65slfw65d")))) (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six))) (native-inputs `(("python-pytest" ,python-pytest) - ("python-six" ,python-six) + ("python-httplib2" ,python-httplib2) + ("python-requests" ,python-requests) ("python-urllib3" ,python-urllib3))) - (propagated-inputs - `(("python-httplib2" ,python-httplib2) - ("python-requests" ,python-requests))) (synopsis "Puts a WSGI application in place of a real URI for testing") (description "Wsgi_intercept installs a WSGI application in place of a real URI for testing. Testing a WSGI application normally involves starting a -- cgit v1.2.3 From 8322749a1cf7ad2ae64dab6367bc8ca4d380f778 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 23:46:06 +0200 Subject: gnu: python-urllib3: update comment. * gnu/packages/python.scm(python-urllib3)[propagated-inputs]: Update comment. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 57b89efd05..8d0d03a92e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8147,7 +8147,7 @@ concurrent.futures package from Python 3.2") ("python-mock" ,python-mock) ("python-tornado" ,python-tornado))) (propagated-inputs - `(;; packages for https security + `(;; extra packages for https security ("python-certifi" ,python-certifi) ("python-ndg-httpsclient" ,python-ndg-httpsclient) ("python-pyasn1" ,python-pyasn1) -- cgit v1.2.3 From 7ba07edfb1600b808987448bb64b43f875b40d32 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 25 Oct 2016 19:19:22 +0200 Subject: gnu: python-tox: Update FIXME comments. * gnu/packages/python.scm(python-tox)[arguments]: Update FIXME comment. [inputs]: Add FIXME comment. --- gnu/packages/python.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8d0d03a92e..e126708638 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8243,15 +8243,16 @@ Pytest but stripped of Pytest specific details.") "1vj73ar4rimq3fwy5r2z3jv4g9qbh8rmpmncsc00g0k310acqzxz")))) (build-system python-build-system) (arguments - ;; FIXME: Tests require a newer version of pytest, but upgrading our - ;; pytest breaks other packages. + ;; FIXME: Tests require pytest-timeout, which itself requires + ;; pytest>=2.8.0 for installation. '(#:tests? #f)) (propagated-inputs `(("python-pluggy" ,python-pluggy) ; >=0.3.0,<0.4.0 ("python-py" ,python-py) ("python-virtualenv" ,python-virtualenv))) (native-inputs - `(("python-pytest" ,python-pytest))) ; >= 2.3.5 + `(; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout) + ("python-pytest" ,python-pytest))) ; >= 2.3.5 (home-page "http://tox.testrun.org/") (synopsis "Virtualenv-based automation of test activities") (description "Tox is a generic virtualenv management and test command line -- cgit v1.2.3 From f7989b8bb0e66c9f631dbca425abd092a0a49c5c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 17 Oct 2016 00:11:04 +0200 Subject: gnu: Remove some outdated comments. These comments were about setuptools used at runtime for pkg_resources. * gnu/packages/python.scm: Remove some outdated comments. --- gnu/packages/python.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e126708638..c1c666f423 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4036,7 +4036,6 @@ services for your Python modules and applications.") ("openjpeg" ,openjpeg) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) - ;; Note: setuptools used at runtime for pkg_resources (arguments `(#:phases (modify-phases %standard-phases (add-after @@ -8563,7 +8562,6 @@ and to spawn subprocesses to handle requests.") (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) - ;; Note: setuptools used at runtime for pkg_resources (home-page "http://pythonpaste.org/deploy/") (synopsis "Load, configure, and compose WSGI applications and servers") @@ -8593,7 +8591,6 @@ file.") (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) - ;; Note: setuptools used at runtime for pkg_resources (propagated-inputs `(("python-six" ,python-six))) (arguments @@ -8636,7 +8633,6 @@ follows ideas flowing from WSGI (Web Standard Gateway Interface).") (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) - ;; Note: setuptools used at runtime for pkg_resources (propagated-inputs `(("python-paste" ,python-paste) ("python-pastedeploy" ,python-pastedeploy))) -- cgit v1.2.3 From 06f1d73ed4583836095ee3b04f4295ed2f432498 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 17 Oct 2016 00:18:28 +0200 Subject: gnu: python-celery: Remove needless inputs. These are indirect requirements and propagated by python-kombu. * gnu/packages/python.scm(python-celery)[propagated-inputs] Remove python-amqp and python-anyjson. --- gnu/packages/python.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c1c666f423..c2f34f54de 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8901,8 +8901,6 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.") `(("python-nose" ,python-nose))) (propagated-inputs `(("python-pytz" ,python-pytz) - ("python-amqp" ,python-amqp) - ("python-anyjson" ,python-anyjson) ("python-billiard" ,python-billiard) ("python-kombu" ,python-kombu))) (home-page "http://celeryproject.org") -- cgit v1.2.3 From 47c7dc4a3f1af7b1e9c64c476f4c190fb44fe5ff Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 17 Oct 2016 00:21:37 +0200 Subject: gnu: python-sphinx-repoze-autointerface: Remove needless input. This is an indirect requirement and propagated by python-sphinx already. * gnu/packages/python.scm(python-sphinx-repoze-autointerface) [propagated-inputs]: Remove python-docutils. --- gnu/packages/python.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c2f34f54de..bd3e62b3fb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9009,8 +9009,7 @@ commands into documents, helping you to keep your command examples up to date.") "08ycivzf7bh4a1zcyp31hbyqs1b2c9r26raa3vxjwwmbfqr3iw4f")))) (build-system python-build-system) (propagated-inputs - `(("python-docutils" ,python-docutils) - ("python-sphinx" ,python-sphinx) + `(("python-sphinx" ,python-sphinx) ("python-zope-interface" ,python-zope-interface))) (synopsis "Auto-generate Sphinx API docs from Zope interfaces") (description "This package defines an extension for the Sphinx documentation -- cgit v1.2.3 From a0a09859789fb92d452816478e244baa2645ce6f Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 17 Oct 2016 00:22:09 +0200 Subject: gnu: python-sphinxcontrib-programoutput: Remove needless input. This is an indirect requirement and propagated by python-sphinx already. * gnu/packages/python.scm(python-sphinxcontrib-programoutput) [propagated-inputs]: Remove python-docutils. --- gnu/packages/python.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bd3e62b3fb..1de70014ae 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8986,8 +8986,7 @@ programmatically interfacing with your system's $EDITOR.") "098as6z1s0gb4dh5xcr1fd2vpm91zj93jzvgawspxf5s4hqs0xhp")))) (build-system python-build-system) (propagated-inputs - `(("python-docutils" ,python-docutils) - ("python-sphinx" ,python-sphinx))) + `(("python-sphinx" ,python-sphinx))) (synopsis "Sphinx extension to include program output") (description "A Sphinx extension to literally insert the output of arbitrary commands into documents, helping you to keep your command examples up to date.") -- cgit v1.2.3 From d8ea5f2f27a7ec4cc9974eadadd88c59458bb8ce Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 17 Oct 2016 00:26:20 +0200 Subject: gnu: python-responses: Correct inputs * gnu/packages/python.scm(python-responses)[native-inputs] move python-cookies to [propagated-inputs] --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1de70014ae..ef8a78f27a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9165,10 +9165,10 @@ Python.") ;; https://github.com/getsentry/responses/issues/38 #:tests? #f)) (native-inputs - `(("python-cookies" ,python-cookies) - ("python-mock" ,python-mock))) + `(("python-mock" ,python-mock))) (propagated-inputs `(("python-requests" ,python-requests) + ("python-cookies" ,python-cookies) ("python-six" ,python-six))) (home-page "https://github.com/getsentry/responses") (synopsis "Utility for mocking out the `requests` Python library") -- cgit v1.2.3 From 2c199b5527b89fbfa036308d9b6764e36e8cef1c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 17 Oct 2016 00:44:22 +0200 Subject: gnu: python-prompt-toolkit: Correct inputs * gnu/packages/python.scm(python-prompt-toolkit)[native-inputs] move python-six to [propagated-inputs]. Remove now empty [native-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ef8a78f27a..20b0b60ad1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10408,8 +10408,8 @@ implementation for Python.") '(#:tests? #f)) ; The test suite uses some Windows-specific data types. (propagated-inputs `(("python-wcwidth" ,python-wcwidth) + ("python-six" ,python-six) ("python-pygments" ,python-pygments))) - (native-inputs `(("python-six" ,python-six))) (home-page "https://github.com/jonathanslenders/python-prompt-toolkit") (synopsis "Library for building command line interfaces in Python") (description -- cgit v1.2.3 From fd1d6de729efde0907fe50d9a711a48ac450c82d Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 17 Oct 2016 00:48:02 +0200 Subject: gnu: python-consul: Correct inputs. * gnu/packages/python.scm(python-consul)[native-inuts] move python-requests and python-six to [propagated-inputs]. --- gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 20b0b60ad1..b3f2ad3433 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10748,8 +10748,9 @@ interface for programs.") "0rfyxcy4cr3x848vhx876ifalxd5ghq6l5x813m49h4vq2d4jiq8")))) (build-system python-build-system) (native-inputs - `(("python-pytest" ,python-pytest) - ("python-requests" ,python-requests) + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-requests" ,python-requests) ("python-six" ,python-six))) (home-page "https://github.com/cablehead/python-consul") (synopsis "Python client for Consul") -- cgit v1.2.3 From 4e0969686cf005105b5a2f9718f0a2bdde9a6b4c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 17 Oct 2016 00:51:32 +0200 Subject: gnu: python-freezegun: Correct input. * u/packages/python.scm(python-freezegun)[native-inputs] move python-dateutils-2 to [propagated-inputs]. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b3f2ad3433..f3a5ddf6ce 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10879,10 +10879,10 @@ List. Forked from and using the same API as the publicsuffix package.") (native-inputs `(("python-mock" ,python-mock) ("python-nose" ,python-nose) - ("python-coverage" ,python-coverage) - ("python-dateutil-2" ,python-dateutil-2))) + ("python-coverage" ,python-coverage))) (propagated-inputs - `(("python-six" ,python-six))) + `(("python-six" ,python-six) + ("python-dateutil-2" ,python-dateutil-2))) (arguments `(#:phases (modify-phases %standard-phases ;; The tests are normally executed via `make test`, but the PyPi -- cgit v1.2.3 From 38ceb106bd12bcf52f5d277d93393f284c83cc1f Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 17 Oct 2016 01:22:48 +0200 Subject: gnu: python-nautilus: Correct inputs * gnu/packages/python.scm(python-nautilus, python2-nautilus): [propagated-inputs] remove python-graphql-core, python-graphql-relay, python-requests: not listed and already propagated by others. Remove pycparser: not listed, not used in source. Move python-nose2 to [native-inputs] (used for tests only). --- gnu/packages/python.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f3a5ddf6ce..0d7fcf1c86 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11268,17 +11268,14 @@ with an associated set of resolve methods that know how to fetch data.") `(("python-bcrypt" ,python-bcrypt) ("python-click" ,python-click) ("python-consul" ,python-consul) - ("python-graphql-core" ,python-graphql-core) - ("python-graphql-relay" ,python-graphql-relay) ("python-graphene" ,python-graphene) ("python-jinja2" ,python-jinja2) - ("python-nose2" ,python-nose2) ("python-peewee" ,python-peewee) ("python-pika" ,python-pika) - ("python-pycparser" ,python-pycparser) - ("python-requests" ,python-requests) ("python-tornado" ,python-tornado) ("python-wtforms" ,python-wtforms))) + (native-inputs + `(("python-nose2" ,python-nose2))) (home-page "https://github.com/AlecAivazis/nautilus") (synopsis "Library for creating microservice applications") (description -- cgit v1.2.3 From 251ed7f2fe61f46d216dff20f19c53dc9cac05ab Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 23:40:42 +0200 Subject: gnu: python-sphinxcontrib-newsfeed: Remove needless input. * gnu/packages/python.scm (python-sphinxcontrib-newsfeed) [propagated-inputs]: Remove python-docutils, already porpagated by python-sphinx. --- gnu/packages/python.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0d7fcf1c86..c8b3584a80 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7894,8 +7894,7 @@ files for use with Python.") "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p")))) (build-system python-build-system) (propagated-inputs - `(("python-docutils" ,python-docutils) - ("python-sphinx" ,python-sphinx))) + `(("python-sphinx" ,python-sphinx))) (synopsis "News Feed extension for Sphinx") (description "Sphinxcontrib-newsfeed is an extension for adding a simple Blog, News or Announcements section to a Sphinx website.") -- cgit v1.2.3 From 632735f215f5b136ae79914af2eb42b15eebaa11 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 16 Oct 2016 22:16:58 +0200 Subject: gnu: python-testlib: Remove useless self-defined phase "unpack". Unzipping is now done by standard-phase "unpack" automatically. * gnu/packages/python.scm (python-testlib, python2-testlib)[phases] No longer replace "unpack". --- gnu/packages/python.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c8b3584a80..a2aebbd829 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5290,18 +5290,7 @@ falling into the Python interpreter.") (base32 "1mz26cxn4x8bbgv0rn0mvj2z05y31rkc8009nvdlb3lam5b4mj3y")))) (build-system python-build-system) (native-inputs - `(("unzip" ,unzip))) - (arguments - `(#:phases - (alist-replace - 'unpack - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((unzip (string-append (assoc-ref inputs "unzip") - "/bin/unzip")) - (source (assoc-ref inputs "source"))) - (and (zero? (system* unzip source)) - (chdir (string-append "testlib-" ,version))))) - %standard-phases))) + `(("unzip" ,unzip))) ; for unpacking the source (synopsis "Python micro test suite harness") (description "A micro unittest suite harness for Python.") (home-page "https://github.com/trentm/testlib") -- cgit v1.2.3 From 3221207417fa48d0b954520450980812932b804c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 19 Oct 2016 23:19:26 +0200 Subject: gnu: khal: Fix build. The old one was plain wrong and only worked by luck since the old python build system did manipulate PYTHONPATH. * gnu/packages/calendar.scm(khal)[phase manpage]: Use add-installed-pythonpath. --- gnu/packages/calendar.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 306c949066..447dcd698e 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -96,10 +96,9 @@ data units.") `(#:phases (modify-phases %standard-phases ;; Building the manpage requires khal to be installed. (add-after 'install 'manpage - (lambda* (#:key outputs #:allow-other-keys) - (setenv "PYTHONPATH" - (string-append - (getenv "PYTHONPATH") ":" (assoc-ref outputs "out"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) (zero? (system* "make" "--directory=doc/" "man")) (install-file "doc/build/man/khal.1" -- cgit v1.2.3 From 54c85e12fda033ef01bb2c649b540d9694a368f3 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 19 Oct 2016 23:45:12 +0200 Subject: gnu: python2-warpedlmm: Remove phase remove-bin-directory. This directory did contain contain wrappers for `nose`, which should not be there anyway (since nose already was a native-input). The new python build system no longer creates this directory, while the old one did. (This difference is due to the bloody details of how packages are installed.) * gnu/packages/bioinformatics.scm (python2-warpedlmm) [modify-phases] Remove, since remove-bin-directory was the only modification here. --- gnu/packages/bioinformatics.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9b47dc3d51..0d5d8ff32a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3509,18 +3509,7 @@ files and writing bioinformatics applications.") "1agfz6zqa8nc6cw47yh0s3y14gkpa9wqazwcj7mwwj3ffnw39p3j")))) (build-system python-build-system) (arguments - `(#:python ,python-2 ; requires Python 2.7 - #:phases - (modify-phases %standard-phases - (add-after - 'install 'remove-bin-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; The "bin" directory only contains wrappers for running - ;; the module tests. They are not needed after the - ;; "check" phase. - (delete-file-recursively - (string-append (assoc-ref outputs "out") "/bin")) - #t))))) + `(#:python ,python-2)) ; requires Python 2.7 (propagated-inputs `(("python-scipy" ,python2-scipy) ("python-numpy" ,python2-numpy) -- cgit v1.2.3 From de5bc89093895744e9d0cdcf26c9b3bc971a8f0e Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 23 Oct 2016 21:20:46 +0200 Subject: gnu: python2-pbcore: Fix inputs: * gnu/packages/bioinformatics.scm (python2-pbcore) [inputs] change to [propagated-inputs]. [native-inputs]: Remove python-docutils, which comes with sphinx. [former propagated-inputs]: move all (which is only pyxb) to [inputs]. --- gnu/packages/bioinformatics.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0d5d8ff32a..f9929dfa4f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3476,17 +3476,15 @@ interrupted by stop codons. OrfM finds and prints these ORFs.") "1kjmv891d6qbpp4shhhvkl02ff4q5xlpnls2513sm2cjcrs52f1i")))) (build-system python-build-system) (arguments `(#:python ,python-2)) ; pbcore requires Python 2.7 - (inputs + (propagated-inputs `(("python-cython" ,python2-cython) ("python-numpy" ,python2-numpy) ("python-pysam" ,python2-pysam) ("python-h5py" ,python2-h5py))) (native-inputs - `(("python-docutils" ,python2-docutils) - ("python-nose" ,python2-nose) - ("python-sphinx" ,python2-sphinx))) - (propagated-inputs - `(("python-pyxb" ,python2-pyxb))) + `(("python-nose" ,python2-nose) + ("python-sphinx" ,python2-sphinx) + ("python-pyxb" ,python2-pyxb))) (home-page "http://pacificbiosciences.github.io/pbcore/") (synopsis "Library for reading and writing PacBio data files") (description -- cgit v1.2.3 From bac6816879248864d28f71c02414e89f071a81fe Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 23 Oct 2016 22:22:34 +0200 Subject: gnu: python-pytest-django: Remove needless propagated input "python-py". This is already propagated by python-pytest. * gnu/packages/python.scm (python-pytest-django) [propagated-inputs]: Remove python-py. --- gnu/packages/django.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 2de80353f8..bbb2d71db1 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -142,8 +142,7 @@ with arguments to the field constructor.") `(("python-django" ,python-django) ("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs - `(("python-py" ,python-py) - ("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest))) (home-page "http://pytest-django.readthedocs.org/") (synopsis "Django plugin for py.test") (description "Pytest-django is a plugin for py.test that provides a set of -- cgit v1.2.3 From 011271c769552b284cf7cf2081eb28e999f42e41 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 25 Oct 2016 18:15:29 +0200 Subject: gnu: python-flake8: Remove python byte-code files from source. * gnu/packages/python.scm (python-flake8)[source]: Add snippet. --- gnu/packages/python.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a2aebbd829..823624fc1b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5602,7 +5602,15 @@ complexity of Python source code.") (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc")))) + "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove pre-compiled .pyc files from source. + (for-each delete-file-recursively + (find-files "." "__pycache__" #:directories? #t)) + (for-each delete-file (find-files "." "\\.pyc$")) + #t)))) (build-system python-build-system) (propagated-inputs `(("python-pep8" ,python-pep8) -- cgit v1.2.3 From b9c8ccce049cd4e5cd6e3800eb7f3033e0b09050 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 25 Oct 2016 17:37:24 +0200 Subject: gnu: python-flake8-2.2.4: Remove python byte-code files from source. * gnu/packages/python.scm (python-flake8-2.2.4)[source]: Add snippet. --- gnu/packages/python.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 823624fc1b..9f07ead921 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5647,7 +5647,15 @@ complexity of Python source code.") (uri (pypi-uri "flake8" version)) (sha256 (base32 - "1r9wsry4va45h1rck5hxd3vzsg2q3y6lnl6pym1bxvz8ry19jwx8")))))) + "1r9wsry4va45h1rck5hxd3vzsg2q3y6lnl6pym1bxvz8ry19jwx8")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove pre-compiled .pyc files from source. + (for-each delete-file-recursively + (find-files "." "__pycache__" #:directories? #t)) + (for-each delete-file (find-files "." "\\.pyc$")) + #t)))))) (define-public python2-flake8-2.2.4 (package-with-python2 python-flake8-2.2.4)) -- cgit v1.2.3 From bac23672ee6db3d24c75b7a18077b9318fdb81c9 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 25 Oct 2016 17:37:43 +0200 Subject: gnu: python-tables: Remove python byte-code files from source. * gnu/packages/python.scm (python-tables)[source]: Add snippet. --- gnu/packages/python.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9f07ead921..48d75f0943 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6136,7 +6136,15 @@ printing of sub-tables by specifying a row range.") (uri (pypi-uri "tables" version)) (sha256 (base32 - "117s6w7s3yxafpmf3zz3svana7xfrsviw01va1xp7h8ylx8v6r1m")))) + "117s6w7s3yxafpmf3zz3svana7xfrsviw01va1xp7h8ylx8v6r1m")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove pre-compiled .pyc files from source. + (for-each delete-file-recursively + (find-files "." "__pycache__" #:directories? #t)) + (for-each delete-file (find-files "." "\\.pyc$")) + #t)))) (build-system python-build-system) (arguments `(;; FIXME: python-build-system does not pass configure-flags to "build" -- cgit v1.2.3 From 1b5241c5153e0c3039f01f520c8cca28063bbaf6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 23 Oct 2016 20:25:22 +0200 Subject: gnu: python-scikit-learn: Remove useless property "python2-variant". The Python 2 packages does not change the definition, thus the propery is useless. * gnu/packages/python.scm (python-scikit-learn): [properties]: Remove "python2-variant". (python2-scikit-learn): Remove now needless "strip-python2-variant". --- gnu/packages/python.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 48d75f0943..589fd048cd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2971,11 +2971,10 @@ and is very extensible.") (description "Scikit-learn provides simple and efficient tools for data mining and data analysis.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-scikit-learn)))))) + (license license:bsd-3))) (define-public python2-scikit-learn - (package-with-python2 (strip-python2-variant python-scikit-learn))) + (package-with-python2 python-scikit-learn)) (define-public python-scikit-image (package -- cgit v1.2.3 From 5b1416d9834182989da3f11b7475c81e06b0c52b Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 15 Nov 2016 21:24:31 +0100 Subject: gnu: python-betamax: fix inputs. * gnu/packages/python.scm (python-betamax): [inputs] change to [propagated-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 589fd048cd..2e6f5a6b63 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11310,7 +11310,7 @@ focus on building massively scalable web applications.") (arguments '(;; Many tests fail because they require networking. #:tests? #f)) - (inputs + (progated-inputs `(("python-requests" ,python-requests))) (home-page "https://github.com/sigmavirus24/betamax") (synopsis "Record HTTP interactions with python-requests") -- cgit v1.2.3 From e62600feb6a3aca2304925ed8c0bb5a9060e38dd Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 15 Nov 2016 21:25:56 +0100 Subject: gnu: python2-ipython: fix inputs. * gnu/packages/python.scm (python2-ipython): [inputs] change to [native-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2e6f5a6b63..c195bb6da0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4784,7 +4784,7 @@ computing.") (arguments `(#:tests? #f ,@(package-arguments ipython))) ;; FIXME: add pyreadline once available. - (inputs + (native-inputs `(("python2-mock" ,python2-mock) ,@(package-inputs ipython)))))) -- cgit v1.2.3 From 05e2e4cf005142ea18b3615209ffb585decb3880 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 15 Nov 2016 22:20:04 +0100 Subject: gnu: python-pip: fix inputs. * gnu/packages/python.scm (python-pip): [inputs] change to [native-inputs]. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c195bb6da0..f2e226a53a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6466,9 +6466,9 @@ library.") (base32 "08cm8d4228fj0qnrysy3qv1a6022zr3dcs25amd14lgxil6vvx26")))) (build-system python-build-system) - (inputs - `(("python-virtualenv" ,python-virtualenv) - ;; Tests + (native-inputs + `(;; Tests + ("python-virtualenv" ,python-virtualenv) ("python-mock" ,python-mock) ("python-pytest" ,python-pytest) ("python-scripttest" ,python-scripttest))) -- cgit v1.2.3 From 8fa6890b6c5c0fca98fc52c85942ef0ff0b65921 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 15 Nov 2016 21:28:21 +0100 Subject: gnu: python-botocore: fix inputs. * gnu/packages/python.scm (python-botocore): [inputs] change to [native-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f2e226a53a..b09ef5b0b3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8313,7 +8313,7 @@ document.") `(("python-dateutil" ,python-dateutil-2) ("python-docutils" ,python-docutils) ("python-jmespath" ,python-jmespath))) - (inputs + (native-inputs `(("python-mock" ,python-mock) ("python-nose" ,python-nose) ("behave" ,behave) -- cgit v1.2.3 From d46491779e18cf614caeeb1b4becbd9171c64416 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 15 Nov 2016 21:28:45 +0100 Subject: gnu: python-awscli: fix inputs. * gnu/packages/python.scm (python-awscli): [inputs] change to [native-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b09ef5b0b3..60b94b51e0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8346,7 +8346,7 @@ interface to the Amazon Web Services (AWS) API.") ("python-s3transfer" ,python-s3transfer) ("python-docutils" ,python-docutils) ("python-rsa" ,python-rsa))) - (inputs + (native-inputs `(("python-mock" ,python-mock) ("python-nose" ,python-nose) ("python-sphinx" ,python-sphinx) -- cgit v1.2.3 From c415f76302a4c4ba3d8f9279e0b5142f111b21af Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 25 Nov 2016 11:22:27 -0500 Subject: gnu: python-betamax: Fix typo. * gnu/packages/python.scm (python-betamax): Fix typo. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ec672a5544..33ab81ac77 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11312,7 +11312,7 @@ focus on building massively scalable web applications.") (arguments '(;; Many tests fail because they require networking. #:tests? #f)) - (progated-inputs + (propagated-inputs `(("python-requests" ,python-requests))) (home-page "https://github.com/sigmavirus24/betamax") (synopsis "Record HTTP interactions with python-requests") -- cgit v1.2.3 From 6f1dcafd81940f8f78ac0d2f3adad3d339828765 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 29 Nov 2016 18:06:24 +0100 Subject: gnu: wxPython: Fix build. * gnu/packages/wxwidgets.scm (python2-wxpython) [arguments]: Disable installation via setuptools (and --single-version-externally-managed). --- gnu/packages/wxwidgets.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index b72567f259..a65c969e5c 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -149,6 +149,9 @@ and many other languages.") (arguments `(#:python ,python-2 #:tests? #f ; tests fail + ;; wxPython directly extends distutils command classes, + ;; we can't easily make setup.py use setuptools. + #:use-setuptools? #f #:configure-flags (list "WXPORT=gtk2" "UNICODE=1") #:phases -- cgit v1.2.3 From 388606a72b5690aa6af64941a642884e45ee471d Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 29 Nov 2016 18:08:36 +0100 Subject: gnu: wxPython: Remove useless inputs. * gnu/packages/wxwidgets.scm (python2-wxpython) [native-inputs]: Remove setuptools, which is already included in python. --- gnu/packages/wxwidgets.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index a65c969e5c..5285037ffe 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -184,8 +184,7 @@ and many other languages.") #t))))) (native-inputs `(("mesa" ,mesa) ; for glcanvas - ("pkg-config" ,pkg-config) - ("python2-setuptools" ,python2-setuptools))) + ("pkg-config" ,pkg-config))) (inputs `(("gtk+" ,gtk+-2) ; for wxPython/src/helpers.cpp ("wxwidgets" ,wxwidgets-gtk2))) -- cgit v1.2.3 From 2cb64f3b1b3df338acfc0ba9f719875db21812b0 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 29 Nov 2016 18:24:59 +0100 Subject: gnu: wicd: Fix build. * gnu/packages/wicd.scm (wicd) [arguments]: Disable installation via setuptools (and --single-version-externally-managed). --- gnu/packages/wicd.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/wicd.scm b/gnu/packages/wicd.scm index e70bf736a5..9de956c6ff 100644 --- a/gnu/packages/wicd.scm +++ b/gnu/packages/wicd.scm @@ -67,6 +67,9 @@ (arguments `(#:python ,python-2 #:tests? #f ; test suite requires networking + ;; wicd directly extends distutils command classes, + ;; we can't easily make setup.py use setuptools. + #:use-setuptools? #f #:phases (alist-cons-before 'build 'configure -- cgit v1.2.3 From 80983df357856fe4e65e384a655e466164e049a1 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 29 Nov 2016 19:02:35 +0100 Subject: gnu: python2-discogs-client: Remove python2-setuptools from inputs. * gnu/packages/music.scm (python2-discogs-client): Use simply "package-with-python2". Remove inheriting from python-discogs-client since adding python2-setuptools to [native-inputs] has been the sole reason for inheriting. (python-discogs-client) Remove the now needless [properties] "python2-variant". --- gnu/packages/music.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3f2018ef46..6950d8884f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2471,13 +2471,7 @@ you to query the Discogs database for information on artists, releases, labels, users, Marketplace listings, and more. It also supports OAuth 1.0a authorization, which allows you to change user data such as profile information, collections and wantlists, inventory, and orders.") - (license license:bsd-2) - (properties `((python2-variant . ,(delay python2-discogs-client)))))) + (license license:bsd-2))) (define-public python2-discogs-client - (let ((base (package-with-python2 - (strip-python2-variant python-discogs-client)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-discogs-client)) -- cgit v1.2.3