From f210e94432fcb8d6c03589287833f7594f270522 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
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(-)
(limited to 'gnu/packages/python.scm')
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 @@ (define-public python-lockfile
(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 @@ (define-public python-keyring
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 @@ (define-public python-dateutil-2
(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 @@ (define-public python-parsedatetime
"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 @@ (define-public python-pandas
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 @@ (define-public python-pyicu
(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 @@ (define-public python-pytest-cov
"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 @@ (define-public python-pytest-runner
(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 @@ (define-public python-pytest-xdist
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 @@ (define-public python-cov-core
(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 @@ (define-public python-vcversioner
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 @@ (define-public python-itsdangerous
(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 @@ (define-public python-numexpr
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 @@ (define-public python-pycodestyle
(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 @@ (define-public python-orderedmultidict
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 @@ (define-public python-furl
(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 @@ (define-public python-flask-babel
(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 @@ (define-public python-sqlalchemy-utils
@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 @@ (define-public python-alembic
(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 @@ (define-public python-beautifulsoup4
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 @@ (define-public python-q
"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 @@ (define-public python-msgpack
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 @@ (define-public python-ipaddress
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 @@ (define-public python-file
(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 @@ (define-public python-atomicwrites
(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 @@ (define-public python-apipkg
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 @@ (define-public python-execnet
@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 @@ (define-public python-pytest-cache
(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 @@ (define-public python-wtforms
"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 @@ (define-public python-mako
(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 @@ (define-public python-waitress
(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 @@ (define-public python-wsgiproxy2
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 @@ (define-public python-pyquery
(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 @@ (define-public python-webtest
(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 @@ (define-public python-translitcodec
"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 @@ (define-public python-editor
(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 @@ (define-public python-sphinxcontrib-programoutput
(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 @@ (define-public python-psycopg2
(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 @@ (define-public python-vobject
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 @@ (define-public python-flask
(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 @@ (define-public python-cookies
(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 @@ (define-public python-responses
(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 @@ (define-public python-future
"@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 @@ (define-public python-ply
(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 @@ (define-public python-wcwidth
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 @@ (define-public python-prompt-toolkit
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 @@ (define-public python-jedi
"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 @@ (define-public python-requests-oauthlib
(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 @@ (define-public python-pyserial
(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 @@ (define-public python-nltk
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 @@ (define-public python-pymongo
(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 @@ (define-public python-sh
(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 @@ (define-public python-consul
(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 @@ (define-public python-schematics
(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 @@ (define-public python-publicsuffix
(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 @@ (define-public python-publicsuffix2
(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 @@ (define-public python2-url
(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 @@ (define-public python-freezegun
(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 @@ (define-public python-cachecontrol
(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 @@ (define-public python-lit
(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 @@ (define-public python-pytest-pep8
(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 @@ (define-public python-pytest-flakes
(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 @@ (define-public python-glances
"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 @@ (define-public python-graphql-core
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 @@ (define-public python-graphql-relay
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 @@ (define-public python-betamax
(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 @@ (define-public python-validictory
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 @@ (define-public python-imagesize
(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