| 1 |
commit: a2b9ca40d1f71da79688e05292516294c1407bdc |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 6 11:54:41 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 6 12:05:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b9ca40 |
| 7 |
|
| 8 |
dev-python/python-sqlparse: Remove py2 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../python-sqlparse/python-sqlparse-0.2.3.ebuild | 20 ++------------------ |
| 13 |
.../python-sqlparse/python-sqlparse-0.2.4.ebuild | 20 ++------------------ |
| 14 |
.../python-sqlparse/python-sqlparse-0.3.0.ebuild | 2 +- |
| 15 |
3 files changed, 5 insertions(+), 37 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild |
| 18 |
index 2a51bb0cf79..3f52bef28aa 100644 |
| 19 |
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild |
| 20 |
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild |
| 21 |
@@ -3,7 +3,7 @@ |
| 22 |
|
| 23 |
EAPI=6 |
| 24 |
|
| 25 |
-PYTHON_COMPAT=( python2_7 python3_6 ) |
| 26 |
+PYTHON_COMPAT=( python3_6 ) |
| 27 |
|
| 28 |
inherit distutils-r1 |
| 29 |
|
| 30 |
@@ -17,14 +17,11 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
| 31 |
SLOT="0" |
| 32 |
KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" |
| 33 |
LICENSE="BSD-2" |
| 34 |
-IUSE="doc test" |
| 35 |
+IUSE="test" |
| 36 |
RESTRICT="!test? ( test )" |
| 37 |
|
| 38 |
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" |
| 39 |
- |
| 40 |
DEPEND=" |
| 41 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 42 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
| 43 |
test? ( |
| 44 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 45 |
dev-python/pytest-cov[${PYTHON_USEDEP}] |
| 46 |
@@ -34,14 +31,6 @@ DISTUTILS_IN_SOURCE_BUILD=1 |
| 47 |
|
| 48 |
S="${WORKDIR}"/${P#python-} |
| 49 |
|
| 50 |
-pkg_setup() { |
| 51 |
- use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) |
| 52 |
-} |
| 53 |
- |
| 54 |
-python_compile_all() { |
| 55 |
- use doc && emake -C docs html |
| 56 |
-} |
| 57 |
- |
| 58 |
python_test() { |
| 59 |
if python_is_python3; then |
| 60 |
2to3 -w --no-diffs -n tests/ sqlparse/ |
| 61 |
@@ -50,8 +39,3 @@ python_test() { |
| 62 |
py.test tests || die "testsuite failed under ${EPYTHON}" |
| 63 |
fi |
| 64 |
} |
| 65 |
- |
| 66 |
-python_install_all() { |
| 67 |
- use doc && local HTML_DOCS=( docs/build/html/. ) |
| 68 |
- distutils-r1_python_install_all |
| 69 |
-} |
| 70 |
|
| 71 |
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild |
| 72 |
index 3216f5eb6d6..36f895a3d44 100644 |
| 73 |
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild |
| 74 |
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild |
| 75 |
@@ -3,7 +3,7 @@ |
| 76 |
|
| 77 |
EAPI=6 |
| 78 |
|
| 79 |
-PYTHON_COMPAT=( python2_7 python3_{6,7} ) |
| 80 |
+PYTHON_COMPAT=( python3_{6,7} ) |
| 81 |
|
| 82 |
inherit distutils-r1 |
| 83 |
|
| 84 |
@@ -17,14 +17,11 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
| 85 |
SLOT="0" |
| 86 |
KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" |
| 87 |
LICENSE="BSD-2" |
| 88 |
-IUSE="doc test" |
| 89 |
+IUSE="test" |
| 90 |
RESTRICT="!test? ( test )" |
| 91 |
|
| 92 |
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" |
| 93 |
- |
| 94 |
DEPEND=" |
| 95 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 96 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
| 97 |
test? ( |
| 98 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 99 |
dev-python/pytest-cov[${PYTHON_USEDEP}] |
| 100 |
@@ -34,14 +31,6 @@ DISTUTILS_IN_SOURCE_BUILD=1 |
| 101 |
|
| 102 |
S="${WORKDIR}"/${P#python-} |
| 103 |
|
| 104 |
-pkg_setup() { |
| 105 |
- use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) |
| 106 |
-} |
| 107 |
- |
| 108 |
-python_compile_all() { |
| 109 |
- use doc && emake -C docs html |
| 110 |
-} |
| 111 |
- |
| 112 |
python_test() { |
| 113 |
if python_is_python3; then |
| 114 |
2to3 -w --no-diffs -n tests/ sqlparse/ |
| 115 |
@@ -50,8 +39,3 @@ python_test() { |
| 116 |
py.test tests || die "testsuite failed under ${EPYTHON}" |
| 117 |
fi |
| 118 |
} |
| 119 |
- |
| 120 |
-python_install_all() { |
| 121 |
- use doc && local HTML_DOCS=( docs/build/html/. ) |
| 122 |
- distutils-r1_python_install_all |
| 123 |
-} |
| 124 |
|
| 125 |
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild |
| 126 |
index a0839ec0c23..33092e587e3 100644 |
| 127 |
--- a/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild |
| 128 |
+++ b/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild |
| 129 |
@@ -3,7 +3,7 @@ |
| 130 |
|
| 131 |
EAPI=7 |
| 132 |
|
| 133 |
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) |
| 134 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
| 135 |
inherit distutils-r1 |
| 136 |
|
| 137 |
MY_PN="${PN##python-}" |
Archives