[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: Remove python-3.4.
From: |
Leo Famulari |
Subject: |
01/01: gnu: Remove python-3.4. |
Date: |
Mon, 13 Mar 2017 15:34:19 -0400 (EDT) |
lfam pushed a commit to branch core-updates
in repository guix.
commit 7cb68a3cb3082cb6ae5435c28ae7f9278e4d1a0f
Author: Leo Famulari <address@hidden>
Date: Mon Mar 13 00:11:12 2017 -0400
gnu: Remove python-3.4.
* gnu/packages/python.scm (python-3.4): Remove variable.
* gnu/packages/patches/python-3.4-fix-tests.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/patches/python-3.4-fix-tests.patch | 12 ------------
gnu/packages/python.scm | 17 -----------------
3 files changed, 30 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index c51e042..c74418d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -853,7 +853,6 @@ dist_patch_DATA =
\
%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 \
- %D%/packages/patches/python-3.4-fix-tests.patch \
%D%/packages/patches/python-3.5-fix-tests.patch \
%D%/packages/patches/python-3.5-getentropy-on-old-kernels.patch \
%D%/packages/patches/python-dendropy-fix-tests.patch \
diff --git a/gnu/packages/patches/python-3.4-fix-tests.patch
b/gnu/packages/patches/python-3.4-fix-tests.patch
deleted file mode 100644
index d1f8138..0000000
--- a/gnu/packages/patches/python-3.4-fix-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Lib/test/test_posixpath.py 2014-03-01 05:46:56.984311000 +0100
-+++ Lib/test/test_posixpath.py 2014-03-07 00:59:20.888311000 +0100
-@@ -319,7 +319,11 @@
- del env['HOME']
- home = pwd.getpwuid(os.getuid()).pw_dir
- # $HOME can end with a trailing /, so strip it (see #17809)
-- self.assertEqual(posixpath.expanduser("~"), home.rstrip("/"))
-+ # The Guix builders have '/' as a home directory, so
-+ # home.rstrip("/") will be an empty string and the test will
-+ # fail. Let's just disable it since it does not really make
-+ # sense with such a bizarre setup.
-+ # self.assertEqual(posixpath.expanduser("~"),
home.rstrip("/"))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2a7257b..60f0594 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -344,23 +344,6 @@ data types.")
(version-major+minor version)
"/site-packages"))))))))
-(define-public python-3.4
- (package (inherit python-3.5)
- (version "3.4.5")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://www.python.org/ftp/python/"
- version "/Python-" version ".tar.xz"))
- (patches (search-patches
- "python-fix-tests.patch"
- "python-3.4-fix-tests.patch"
- "python-3-deterministic-build-info.patch"
- "python-3-search-paths.patch"))
- (patch-flags '("-p0"))
- (sha256
- (base32
- "12l9klp778wklxmckhghniy5hklss8r26995pyd00qbllk4b2r7f"))))))
-
;; Current 3.x version.
(define-public python-3 python-3.5)