[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/57: gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs)
From: |
Hartmut Goebel |
Subject: |
16/57: gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs). |
Date: |
Thu, 13 Oct 2016 15:20:32 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit c27e06c6994540b70d0adf830b1c292253823c0f
Author: Hartmut Goebel <address@hidden>
Date: Wed Sep 28 15:23:10 2016 +0200
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 d1572e2..1ffc848 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3553,11 +3553,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
@@ -7282,19 +7277,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 2a96c06..a7ca1dc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2693,12 +2693,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)))
@@ -3733,12 +3727,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
@@ -3771,17 +3760,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 _
@@ -6106,15 +6084,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")
@@ -8624,9 +8594,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
@@ -10139,10 +10106,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
@@ -10167,10 +10131,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 efa823a..711630e 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 e6febf4..426e61f 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
- 21/57: gnu: Fix inputs in python.scm, part 2: inputs -> native-inputs., (continued)
- 21/57: gnu: Fix inputs in python.scm, part 2: inputs -> native-inputs., Hartmut Goebel, 2016/10/13
- 02/57: guix: build all Python packages with --single-version-externally-managed., Hartmut Goebel, 2016/10/13
- 33/57: gnu: python-fixture: Enable tests., Hartmut Goebel, 2016/10/13
- 32/57: gnu: python-fixture: Correct inputs., Hartmut Goebel, 2016/10/13
- 36/57: gnu: python-singledispatch: correct inputs., Hartmut Goebel, 2016/10/13
- 39/57: gnu: python-zope-schema: Add missing inputs., Hartmut Goebel, 2016/10/13
- 29/57: gnu: python-ccm: Update synopsis and description., Hartmut Goebel, 2016/10/13
- 38/57: gnu: python-pytest-flakes: Fix build., Hartmut Goebel, 2016/10/13
- 28/57: gnu: python-ccm: Add missing input python-psutil., Hartmut Goebel, 2016/10/13
- 51/57: gnu: python-scripttest: Correct inputs., Hartmut Goebel, 2016/10/13
- 16/57: gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs).,
Hartmut Goebel <=
- 56/57: gnu: pytest-mock: remove needless propagated input "python-py"., Hartmut Goebel, 2016/10/13
- 54/57: gnu: python-setuptools: remove pre-built binaries from source., Hartmut Goebel, 2016/10/13
- 50/57: gnu: python-pandas: Fix build., Hartmut Goebel, 2016/10/13
- 09/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 1a), Hartmut Goebel, 2016/10/13
- 14/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4b), Hartmut Goebel, 2016/10/13
- 25/57: some inputs -> propagated-inputs, Hartmut Goebel, 2016/10/13
- 47/57: gnu: vdirsyncer: Fix build by setting correct PYTHONPATH., Hartmut Goebel, 2016/10/13
- 10/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 1b), Hartmut Goebel, 2016/10/13
- 12/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 3), Hartmut Goebel, 2016/10/13
- 23/57: inputs -> propagated-inputs: special, Hartmut Goebel, 2016/10/13