From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: guix-devel@gnu.org
Subject: [PATCH 14/14] gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs)
Date: Wed, 28 Sep 2016 15:58:27 +0200 [thread overview]
Message-ID: <1475071107-10765-15-git-send-email-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <1475071107-10765-1-git-send-email-h.goebel@crazy-compilers.com>
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 f4ac802..fce6a07 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3429,11 +3429,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
@@ -7114,19 +7109,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 614816f..c8a6e05 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -622,11 +622,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 b9fe1fc..2540acb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2697,12 +2697,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)))
@@ -3709,12 +3703,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
@@ -3747,17 +3736,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 <http://bugs.gnu.org/20765>.
- (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 _
@@ -6030,15 +6008,7 @@ a hash value.")
(substitute* "libarchive/ffi.py"
(("find_library\\('archive'\\)")
(string-append "'" libarchive
- "/lib/libarchive.so'"))))
-
- ;; Do not make a compressed egg (see
- ;; <http://bugs.gnu.org/20765>).
- (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")
@@ -8550,9 +8520,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
@@ -10065,10 +10032,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
@@ -10093,10 +10057,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 a3f9f2f..8bb74c4 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1382,13 +1382,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 126e9df..1fe3179 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -476,15 +476,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 <http://bugs.gnu.org/20765>.
- (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 42d882e..237961b 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -221,11 +221,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
--
2.7.4
next prev parent reply other threads:[~2016-09-28 13:59 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-28 13:58 [PATCH 00/14] Change python-build-system (fixes bug 20765) Hartmut Goebel
2016-09-28 13:58 ` [PATCH 01/14] gnu: ensure pip and setuptools are installed even for Python 2 Hartmut Goebel
2016-09-28 13:58 ` [PATCH 02/14] guix: build all Python packages with --single-version-externally-managed Hartmut Goebel
2016-09-28 13:58 ` [PATCH 03/14] guix: Add lint-checker for packages which should be no inputs at all Hartmut Goebel
2016-09-28 13:58 ` [PATCH 04/14] gnu: python-setuptools: remove pre-built binaries Hartmut Goebel
2016-09-28 13:58 ` [PATCH 05/14] gnu: Remove python-setuptools and python2-setuptools from inputs (part 1) Hartmut Goebel
2016-09-28 13:58 ` [PATCH 06/14] gnu: Remove python-setuptools and python2-setuptools from inputs (part 2) Hartmut Goebel
2016-09-28 13:58 ` [PATCH 07/14] gnu: Remove python-setuptools and python2-setuptools from inputs (part 3) Hartmut Goebel
2016-09-28 13:58 ` [PATCH 08/14] gnu: Remove python-setuptools and python2-setuptools from inputs (part 4) Hartmut Goebel
2016-09-28 13:58 ` [PATCH 09/14] gnu: Remove python-setuptools and python2-setuptools from inputs (part 5a) Hartmut Goebel
2016-09-28 13:58 ` [PATCH 10/14] gnu: Remove python-setuptools and python2-setuptools from inputs (part 5b) Hartmut Goebel
2016-09-28 13:58 ` [PATCH 11/14] gnu: Remove needless inputs python-pip and python2-pip Hartmut Goebel
2016-09-28 13:58 ` [PATCH 12/14] lint: 'check-inputs-should-not-be-an-input-at-all' checks for python-pip Hartmut Goebel
2016-09-28 13:58 ` [PATCH 13/14] gnu: python-h5py: Remove needless "python2-variant" property Hartmut Goebel
2016-09-28 13:58 ` Hartmut Goebel [this message]
2016-09-28 14:03 ` [PATCH 00/14] Change python-build-system (fixes bug 20765) Hartmut Goebel
2016-09-28 15:54 ` Marius Bakke
2016-09-28 17:33 ` Hartmut Goebel
2016-09-28 17:40 ` Hartmut Goebel
2016-09-30 14:39 ` Marius Bakke
2016-10-02 9:05 ` Hartmut Goebel
2016-10-02 12:14 ` Hartmut Goebel
2016-10-02 14:24 ` Ludovic Courtès
2016-10-02 17:31 ` Hartmut Goebel
2016-10-02 18:01 ` Leo Famulari
2016-10-02 19:25 ` Marius Bakke
2016-10-10 13:24 ` Please set up Hydra channel for new python-build-system (was: [PATCH 00/14] Change python-build-system (fixes bug 20765)) Hartmut Goebel
2016-10-12 14:29 ` Leo Famulari
2016-10-12 14:37 ` Andreas Enge
2016-10-12 14:51 ` Leo Famulari
2016-10-13 8:17 ` Vincent Legoll
2016-10-03 9:31 ` [PATCH 00/14] Change python-build-system (fixes bug 20765) Hartmut Goebel
2016-10-04 21:39 ` Hartmut Goebel
2016-10-02 2:27 ` Leo Famulari
2016-10-02 2:46 ` Leo Famulari
2016-10-02 9:19 ` Hartmut Goebel
2016-10-02 9:18 ` Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475071107-10765-15-git-send-email-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).