[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/29: gnu: Remove address@hidden
From: |
guix-commits |
Subject: |
07/29: gnu: Remove address@hidden |
Date: |
Sat, 9 Feb 2019 15:55:22 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit ac63cf0a6995fb9de6121e648b401167895b2c9d
Author: Marius Bakke <address@hidden>
Date: Fri Feb 8 17:45:51 2019 +0100
gnu: Remove address@hidden
* gnu/packages/python-xyz.scm (python-flake8-3.5): Rename to ...
(python-flake8): ... this. Update to 3.6.0. Remove previous variant.
[arguments]: Remove phases 'delete-broken-test' and
'fix-problem-with-pycodestyle'.
[properties]: Adjust for renamed variable.
(python2-flake8-3.5): Rename to ...
(python2-flake8): ... this. Remove previous variable.
* gnu/packages/check.scm (python-hypothesis)[native-inputs]: Adjust
accordingly.
---
gnu/packages/check.scm | 3 +--
gnu/packages/python-xyz.scm | 65 ++++++++-------------------------------------
2 files changed, 12 insertions(+), 56 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index afb3b96..02ee9b1 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1456,8 +1456,7 @@ instantly.")
"0fvq4mfybm129l978war86mcshkn28dkrxw7lr8549zr9ywvik1c"))))
(build-system python-build-system)
(native-inputs
- `(;; FIXME: Change to python-flake8 in the next rebuild cycle.
- ("python-flake8" ,python-flake8-3.5)
+ `(("python-flake8" ,python-flake8)
("python-pytest" ,python-pytest-bootstrap)))
(propagated-inputs
`(("python-attrs" ,python-attrs-bootstrap)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 38241c6..b92bed5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5556,35 +5556,20 @@ complexity of Python source code.")
(define-public python2-pyflakes-0.8.1
(package-with-python2 python-pyflakes-0.8.1))
-;; This package is used by hypothesis which has thousands of dependent
packages.
-;; FIXME: Consolidate this with "python-flake8" below in the next rebuild
cycle.
-(define-public python-flake8-3.5
+(define-public python-flake8
(package
(name "python-flake8")
- (version "3.5.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "flake8" version))
- (sha256
- (base32
- "184b33grvvjmiwlv9kyd7yng9qv5ld24154j70z332xxg9gjclvj"))))
+ (version "3.6.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "flake8" version))
+ (sha256
+ (base32
+ "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- ;; Two errors don't seem to have assigned codes.
- (add-after 'unpack 'delete-broken-test
- (lambda _ (delete-file "tests/unit/test_pyflakes_codes.py") #t))
- (add-after 'unpack 'fix-problem-with-pycodestyle
- (lambda _
- ;; See https://gitlab.com/pycqa/flake8/merge_requests/230
- ;; This should no longer be needed with the next release.
- (substitute* "setup.py"
- (("PEP8_PLUGIN\\('break_around_binary_operator'\\),")
- "PEP8_PLUGIN('break_after_binary_operator'),\
-PEP8_PLUGIN('break_before_binary_operator'),"))
- #t))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -5604,45 +5589,17 @@ PEP8_PLUGIN('break_before_binary_operator'),"))
"The modular source code checker: pep8, pyflakes and co")
(description
"Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.")
- (properties `((python2-variant . ,(delay python2-flake8-3.5))))
+ (properties `((python2-variant . ,(delay python2-flake8))))
(license license:expat)))
-(define-public python2-flake8-3.5
- (let ((base (package-with-python2 (strip-python2-variant
python-flake8-3.5))))
+(define-public python2-flake8
+ (let ((base (package-with-python2 (strip-python2-variant python-flake8))))
(package (inherit base)
(propagated-inputs
`(("python2-configparser" ,python2-configparser)
("python2-enum34" ,python2-enum34)
,@(package-propagated-inputs base))))))
-;; Version 3.5.0 has compatibility issues with Pyflakes 2.0, so we need
-;; this newer version. Keep it as a separate variable for now to avoid
-;; rebuilding "python-hypothesis"; this should be removed in the next
-;; rebuild cycle.
-(define-public python-flake8
- (package
- (inherit python-flake8-3.5)
- (version "3.6.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "flake8" version))
- (sha256
- (base32
- "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba"))))
- (arguments
- (substitute-keyword-arguments (package-arguments python-flake8-3.5)
- ((#:phases phases)
- `(modify-phases ,phases
- (delete 'delete-broken-test)
- (delete 'fix-problem-with-pycodestyle)))))
- (properties `((python2-variant . ,(delay python2-flake8))))))
-
-(define-public python2-flake8
- (let ((base (package-with-python2 (strip-python2-variant python-flake8))))
- (package (inherit base)
- (propagated-inputs
- (package-propagated-inputs python2-flake8-3.5)))))
-
;; python-hacking requires flake8 <2.6.0.
(define-public python-flake8-2.5
(package
- 11/29: gnu: python-pluggy: Update to 0.8.1., (continued)
- 11/29: gnu: python-pluggy: Update to 0.8.1., guix-commits, 2019/02/09
- 03/29: gnu: Tcl/Tk: Update to 8.6.9., guix-commits, 2019/02/09
- 14/29: gnu: python-more-itertools: Update to 5.0.0., guix-commits, 2019/02/09
- 15/29: gnu: python-setuptools: Update to 40.8.0., guix-commits, 2019/02/09
- 17/29: gnu: python-fonttools: Update to 3.37.3., guix-commits, 2019/02/09
- 16/29: gnu: python-freezegun: Update to 0.3.11., guix-commits, 2019/02/09
- 18/29: gnu: python-packaging: Update to 19.0., guix-commits, 2019/02/09
- 23/29: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries., guix-commits, 2019/02/09
- 21/29: gnu: glibc-final-with-bootstrap-bash: Don't enable obsolete rpc., guix-commits, 2019/02/09
- 24/29: gnu: cppunit: Update to 1.14.0., guix-commits, 2019/02/09
- 07/29: gnu: Remove address@hidden,
guix-commits <=
- 08/29: gnu: python-pycodestyle: Update to 2.5.0., guix-commits, 2019/02/09
- 13/29: gnu: python-configparser: Update to 3.7.1., guix-commits, 2019/02/09
- 19/29: gnu: python-dateutil: Update to 2.8.0., guix-commits, 2019/02/09
- 22/29: gnu: python: Fix FTBFS with GCC >= 6., guix-commits, 2019/02/09
- 25/29: gnu: swig: Fix FTBFS with GCC >= 6., guix-commits, 2019/02/09
- 27/29: gnu: libevdev: Fix FTBFS with GCC7., guix-commits, 2019/02/09
- 26/29: gnu: aspell: Fix FTBFS with GCC7., guix-commits, 2019/02/09
- 20/29: gnu: Use GCC 7 as the default compiler., guix-commits, 2019/02/09
- 29/29: gnu: inkscape: Fix FTBFS with GCC >= 6., guix-commits, 2019/02/09
- 28/29: gnu: hyperrogue: Fix FTBFS with GCC7., guix-commits, 2019/02/09