Age | Commit message (Collapse) | Author |
|
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.
|
|
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.
|
|
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.
|
|
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.
|
|
* guix/scripts/lint.scm (check-inputs-should-be-native package): Add python
packages which are typically used for testing or for building the
documentation.
|
|
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.
|
|
* 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.
|
|
|
|
* 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 (add-installed-pythonpath,
site-packages): New exported procedures.
|
|
* 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.
|
|
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 <h.goebel@crazy-compilers.com>
|
|
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".
|
|
* gnu/packages/python.scm (python-2.7): Add "--with-ensurepip=install" to
configure-flags.
* doc/guix.texi (Python Modules): Document it.
|
|
|
|
* gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.52.
[home-page]: Use https.
|
|
* gnu/packages/maths.scm (octave): Update to 4.2.0.
[native-inputs]: Add lzip.
[home-page]: Use https.
|
|
* gnu/packages/parallel.scm (parallel): Update to 20161022.
[home-page]: Use https.
|
|
* gnu/packages/cdrom.scm (libcdio): Update to 0.94.
[home-page]: Use https.
|
|
* gnu/packages/vpn.scm (gvpe): Update to 3.0.
|
|
* gnu/packages/cryptsetup.scm (cryptsetup): Update to 1.7.3.
|
|
* gnu/packages/python.scm (python-vcversioner): Update to 2.16.0.0.
[inputs]: Remove python-setuptools.
[properties]: New field.
(python2-vcversioner): Use 'strip-python2-variant'.
[native-inputs]: Add python2-setuptools.
|
|
* gnu/packages/shells.scm (fish): Update to 2.4.0.
|
|
* gnu/services/networking.scm (connman-shepherd-service): Add
wpa-supplicant among list of requirements.
|
|
* gnu/services/networking.scm (wpa-supplicant-service): New procedure.
(wpa-supplicant-service-type): New variable.
* doc/guix.texi (Networking Services): Document it.
|
|
* gnu/packages/connman.scm (connman): Use localstatedir outside of store.
|
|
* gnu/packages/python.scm (python-jsonschema)[arguments]: Replace 'check
phase with python nosetests.
[native-inputs]: Add python-nose.
[home-page]: Use https.
(python2-jsonschema)[native-inputs]: Add python2-mock.
|
|
* gnu/packages/freedesktop.scm (accountsservice): Update to 0.6.43.
|
|
* gnu/packages/package-management.scm (guix-devel): Update to commit
7ca37da855fd921fa3925bb62f8015f770b7e784.
|
|
* gnu/packages/package-management.scm (guix-0.11.0)[arguments]: Update
pattern in 'disable-container-tests' to match 'test-equal'.
|
|
* gnu/packages/web.scm (libpsl): Update to 0.15.0.
|
|
* gnu/packages/freedesktop.scm (libinput)[inputs]: Add glib.
[native-inputs]: Add cairo, gtk+-3.
(libinput-minimal)[native-inputs]: Only pkg-config.
|
|
* gnu/packages/freedesktop.scm: Reorder modules alphabetically.
|
|
* gnu/packages/freedesktop.scm (libinput): Update to 1.5.1.
|
|
* gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.7.
|
|
* gnu/packages/video.scm (mpv)[inputs]: Change 'lua' to 'lua-5.2'.
|
|
* guix/import/cpan.scm (cpan-module->sexp) <version>: Test if version in
meta is string or number. If it is number, coerce to string.
|
|
* gnu/packages/patches/readline-6.2-CVE-2014-2524.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/readline.scm (readline-6.2): Use it.
|
|
* gnu/packages/crypto.scm (signify): Update to 20.
|
|
* gnu/packages/mail.scm (mailutils): Update to 3.0.
[arguments]: Adjust 'pre-build' phase.
* gnu/packages/patches/m4-gets-undeclared.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
|
|
* gnu/packages/guile.scm (guile-ncurses): Update to 2.1.
[home-page]: Use https.
|
|
* gnu/packages/linux.scm (btrfs-progs): Update to 4.8.3.
|
|
* gnu/packages/web.scm (tidy)[arguments]: Use the ‘modify-phases’ syntax.
|
|
* gnu/packages/protobuf.scm (protobuf)[home-page]: Update it.
|
|
* gnu/packages/mtools.scm (exfat-utils): Update to 1.2.4.
[source, home-page]: Move away from dead Google Code project.
[arguments, native-inputs]: Remove.
|
|
Hello,
The containers test was hanging for me, and this patch fixed the
problem.
--
Andy
From 945ad44acf489b7f3a398d4ab739ec2b48477502 Mon Sep 17 00:00:00 2001
From: Andy Patterson <ajpatter@uwaterloo.ca>
Date: Sat, 12 Nov 2016 22:10:01 -0500
Subject: [PATCH] tests: Don't check file-systems in container tests.
* tests/containers.scm ("call-with-container, mnt namespace"): Don't
check file-system in 'call-with-container' call.
* tests/containers.scm
("call-with-container, mnt namespace, wrong bindmount"): Likewise.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
* gnu/packages/lisp.scm (clisp)[inputs]: Use readline-6.2.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
|
|
|
|
* gnu/packages/syndication.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
|
|
* gnu/packages/ncurses.scm (stfl): New variable.
|