* [gentoo-commits] repo/gentoo:master commit in: dev-python/packaging/files/, dev-python/packaging/
@ 2017-01-31 4:44 Mike Gilbert
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert @ 2017-01-31 4:44 UTC (permalink / raw
To: gentoo-commits
commit: 63207c8570eafab4e274685d9c62c0f19dd21a23
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 04:39:38 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 04:44:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63207c85
dev-python/packaging: force distutils
Package-Manager: Portage-2.3.3_p42_p433273, Repoman-2.3.1_p35_p433273
.../packaging/files/packaging-16.8-distutils.patch | 14 ++++++++++
dev-python/packaging/packaging-16.8.ebuild | 30 +++++++++++++++++-----
2 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/dev-python/packaging/files/packaging-16.8-distutils.patch b/dev-python/packaging/files/packaging-16.8-distutils.patch
new file mode 100644
index 00000000..84bbb61
--- /dev/null
+++ b/dev-python/packaging/files/packaging-16.8-distutils.patch
@@ -0,0 +1,14 @@
+--- a/setup.py
++++ b/setup.py
+@@ -13,10 +13,7 @@ import re
+ # dependency when projects attempt to unbundle stuff from setuptools and pip.
+ # Though we don't really support that, it makes things easier if we do this and
+ # should hopefully cause less issues for end users.
+-try:
+- from setuptools import setup
+-except ImportError:
+- from distutils.core import setup
++from distutils.core import setup
+
+
+ base_dir = os.path.dirname(__file__)
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index 993971d..0a55423 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -17,18 +17,36 @@ LICENSE="|| ( Apache-2.0 BSD-2 )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
-RDEPEND=""
-DEPEND="${RDEPEND}
+RDEPEND="
+ >=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
test? (
dev-python/pretend[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
)
"
-PDEPEND="
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-16.8-distutils.patch"
+)
python_test() {
py.test --capture=no --strict -v || die
}
+
+pkg_preinst() {
+ # https://bugs.gentoo.org/585146
+ cd "${HOME}" || die
+
+ _cleanup() {
+ local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
+ local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+ if [[ -d ${egginfo} ]]; then
+ echo rm -r "${egginfo}"
+ rm -r "${egginfo}" || die "Failed to remove egg-info directory"
+ fi
+ }
+ python_foreach_impl _cleanup
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/packaging/files/, dev-python/packaging/
@ 2017-08-27 8:56 Tim Harder
0 siblings, 0 replies; 2+ messages in thread
From: Tim Harder @ 2017-08-27 8:56 UTC (permalink / raw
To: gentoo-commits
commit: 07ececc5ca9d8dd1c9c97354689bf5e4fb6a5710
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 08:36:27 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 08:53:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ececc5
dev-python/packaging: remove old
dev-python/packaging/Manifest | 2 --
.../packaging/files/packaging-15.3-distutils.patch | 24 ----------------
dev-python/packaging/packaging-15.3-r2.ebuild | 31 --------------------
dev-python/packaging/packaging-16.6.ebuild | 33 ----------------------
4 files changed, 90 deletions(-)
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index c4caa459fef..c0a524f000e 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,3 +1 @@
-DIST packaging-15.3.tar.gz 34359 SHA256 1e9a6b9ad621bc1dbd3aa8dfff52abc4b44f5c14fbb406731c25cba250a5f61e SHA512 bd59408dc6ea2a4f8cb3a84b4d1e4284148a0f6fb2d3203f90885f608871f1f2315201427d08d2ca7b2d706bc5457c8a521b5edda9187e794522dbb8e46a663c WHIRLPOOL 197e9f26022383bf5962efbd562f1502bd5f0972a782c94f3188961d8d14167c25febee459ad5b3a731bafaf3f7e53e5b051d383382c169b58aff1cb521442f3
-DIST packaging-16.6.tar.gz 44194 SHA256 a335d0778b77d3525875dfe66c2b880529e3bbde08e1a6604710ac36f851021a SHA512 221bedd71f942516be77e8146f5b64d5fcfd5aeeb20a7d2f76dcf4aa0164595192e6bb5a829965cefb149ebf523560e57cf09214801b1bceb395b9f59a4cd993 WHIRLPOOL cee4ce64142c1ec3d8ae1c3547e6b840959ffe1c3c08833b61f316f531b0d0fdb751908618762fae40cd5a9d29205a99a8cacefd30ada8a7216186ac116dc3b2
DIST packaging-16.8.tar.gz 44706 SHA256 5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb WHIRLPOOL 611db9bbba97140abfa8097335cb13de2d548c0af731167c2d5f7236771cad47eaf66231c364611f1e6526464dedef8addaa9f0155bd5902f9008952f064d430
diff --git a/dev-python/packaging/files/packaging-15.3-distutils.patch b/dev-python/packaging/files/packaging-15.3-distutils.patch
deleted file mode 100644
index bd3b8ccebe9..00000000000
--- a/dev-python/packaging/files/packaging-15.3-distutils.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Force setup.py to use distutils
-
-Bug: https://bugs.gentoo.org/563534
-
---- a/setup.py
-+++ b/setup.py
-@@ -15,7 +15,7 @@
- from __future__ import absolute_import, division, print_function
-
- import os
--import setuptools
-+from distutils.core import setup
-
-
- base_dir = os.path.dirname(__file__)
-@@ -31,7 +31,7 @@ with open(os.path.join(base_dir, "CHANGELOG.rst")) as f:
- long_description = "\n".join([long_description, f.read()])
-
-
--setuptools.setup(
-+setup(
- name=about["__title__"],
- version=about["__version__"],
-
diff --git a/dev-python/packaging/packaging-15.3-r2.ebuild b/dev-python/packaging/packaging-15.3-r2.ebuild
deleted file mode 100644
index c1c79293685..00000000000
--- a/dev-python/packaging/packaging-15.3-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? (
- dev-python/pretend[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-distutils.patch )
-
-python_test() {
- py.test --capture=no --strict -v || die
-}
diff --git a/dev-python/packaging/packaging-16.6.ebuild b/dev-python/packaging/packaging-16.6.ebuild
deleted file mode 100644
index c3021c6ff91..00000000000
--- a/dev-python/packaging/packaging-16.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? (
- dev-python/pretend[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )
-"
-PDEPEND="
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_test() {
- py.test --capture=no --strict -v || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-27 8:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-27 8:56 [gentoo-commits] repo/gentoo:master commit in: dev-python/packaging/files/, dev-python/packaging/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2017-01-31 4:44 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox