* [gentoo-commits] repo/gentoo:master commit in: dev-python/click/files/, dev-python/click/
@ 2015-11-23 10:05 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-11-23 10:05 UTC (permalink / raw
To: gentoo-commits
commit: 061274ea16474076cbda23d2c230feca3c9f47a8
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 10:05:11 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 10:05:31 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061274ea
dev-python/click: Drop old
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-python/click/Manifest | 2 --
dev-python/click/click-4.0-r1.ebuild | 45 -------------------------
dev-python/click/click-4.1.ebuild | 44 ------------------------
dev-python/click/files/click-4.0-docbuild.patch | 12 -------
4 files changed, 103 deletions(-)
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index e4428f0..2d1ffe2 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,4 +1,2 @@
DIST click-2.0.tar.gz 47342 SHA256 33a984fe73aa8c6bf69c38098b69dd38405529db54baf4c8cf64c50b2dee644f SHA512 4c703ab4b5c76e393420b0edf9af9e8ddb301ccfef5f8117d3408eaa8a94abe6b7b5c7a8b61b7774a3b459b153c10438e8934f21ceb73697199828cce2c2887c WHIRLPOOL bf599395245319b31c189df297a1ec35ca69723ed24e2d3e9aa9231a3cfebdb80e1f43a0b010865b6fbecf09f23dc1121cca232aec26f09bdb455f41da5261c4
-DIST click-4.0.tar.gz 270183 SHA256 f49e03611f5f2557788ceeb80710b1c67110f97c5e6740b97edf70245eea2409 SHA512 7b3b3e3b57fe74e8d2e3be79c59476fe7830c04068f0e31b39dfee28d879d8a96eed311fbe789bfc6d12c898052ea1c901c3b6f4c995cd4e0ede61b62fe0a39a WHIRLPOOL fd183c6509c3d8a3c582454aac8a18b3d570c16ca4b1cf19dbdd97d8846fde62fadd7d80596eb321a67e48477853b26cb7e5d554c9254061ab1bb74a52d3a05a
-DIST click-4.1.tar.gz 274489 SHA256 e339ed09f25e2145314c902a870bc959adcb25653a2bd5cc1b48d9f56edf8ed8 SHA512 fe751406919d06a3ccffc2831992848d8e324f0f0ca566ea3b9ed0be3298c8d1e2039643eadc71eb4dfabd790310396cd5b26a11d7b6f6cdf503f191ce6dd1cd WHIRLPOOL 3005501210fae07d3cbdd5674a22d24b577c02ba20c34fb94f3bf7011ec2d26847b7faca5fe74ca620bdc8a0c4bfaecdf5dbcf4c2f0046de76e8b13628e2910f
DIST click-5.1.tar.gz 275592 SHA256 678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a SHA512 b860b0227644f5d1cc24d41e66985421ec971f11f3f596fb46508fdc787200b949e7ef29b2035421ebb0115384688da03c3c95a0d6acc58dd3b566b32a2b7c6a WHIRLPOOL 8bda8de886a272972595bf51af3881962063daaa4fc9e104af59b4798008a2f780c3fb4a758d7fe14ef075b92aecc43415b08bb213cbd6ac4ab92a56e405276e
diff --git a/dev-python/click/click-4.0-r1.ebuild b/dev-python/click/click-4.0-r1.ebuild
deleted file mode 100644
index cf7d3ce..0000000
--- a/dev-python/click/click-4.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- "
-
-PATCHES=( "${FILESDIR}"/${P}-docbuild.patch )
-
-python_prepare_all() {
- # Prevent un-needed d'loading
- sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- emake test
-}
-
-python_install_all() {
- # use doc && local HTML_DOCS=( docs/_build/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-4.1.ebuild b/dev-python/click/click-4.1.ebuild
deleted file mode 100644
index d7025a4..0000000
--- a/dev-python/click/click-4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- "
-
-python_prepare_all() {
- # Prevent un-needed d'loading
- sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- emake test
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/click/files/click-4.0-docbuild.patch b/dev-python/click/files/click-4.0-docbuild.patch
deleted file mode 100644
index 24ce6ce..0000000
--- a/dev-python/click/files/click-4.0-docbuild.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://github.com/mitsuhiko/click/issues/318#issuecomment-89565131
---- docs/options.rst
-+++ docs/options.rst
-@@ -150,6 +150,7 @@
- .. click:example::
-
- import os
-+ import sys
-
- @click.command()
- @click.option('--shout/--no-shout', default=False)
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/click/files/, dev-python/click/
@ 2018-08-13 12:01 Virgil Dupras
0 siblings, 0 replies; 3+ messages in thread
From: Virgil Dupras @ 2018-08-13 12:01 UTC (permalink / raw
To: gentoo-commits
commit: b267275c6ee8b262b695f4a07a555b815869767a
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 13 11:59:14 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Mon Aug 13 12:01:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b267275c
dev-python/click: fix broken tests
Closes: https://bugs.gentoo.org/635806
Package-Manager: Portage-2.3.46, Repoman-2.3.10
dev-python/click/click-6.7.ebuild | 5 ++
dev-python/click/files/click-6.7-fix-tests.patch | 65 ++++++++++++++++++++++++
2 files changed, 70 insertions(+)
diff --git a/dev-python/click/click-6.7.ebuild b/dev-python/click/click-6.7.ebuild
index a594f6dc817..74c2f3587ec 100644
--- a/dev-python/click/click-6.7.ebuild
+++ b/dev-python/click/click-6.7.ebuild
@@ -23,6 +23,11 @@ DEPEND="
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+PATCHES=(
+ # From upstream, can be removed in next release.
+ "${FILESDIR}/${PN}-6.7-fix-tests.patch"
+)
+
pkg_setup() {
use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
}
diff --git a/dev-python/click/files/click-6.7-fix-tests.patch b/dev-python/click/files/click-6.7-fix-tests.patch
new file mode 100644
index 00000000000..8a305e3665d
--- /dev/null
+++ b/dev-python/click/files/click-6.7-fix-tests.patch
@@ -0,0 +1,65 @@
+From 20b4b1c0d1564ab4ef44b7d27d5b650735e28be3 Mon Sep 17 00:00:00 2001
+From: Armin Ronacher <armin.ronacher@active-4.com>
+Date: Sat, 23 Dec 2017 09:27:57 +0100
+Subject: [PATCH] Updated tests to work with newer pytest versions
+
+---
+ tests/test_basic.py | 2 +-
+ tests/test_compat.py | 9 +++++----
+ tests/test_options.py | 2 +-
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/tests/test_basic.py b/tests/test_basic.py
+index 045f608..960cd32 100644
+--- a/tests/test_basic.py
++++ b/tests/test_basic.py
+@@ -357,7 +357,7 @@ def test_required_option(runner):
+ def test_evaluation_order(runner):
+ called = []
+
+- def memo(ctx, value):
++ def memo(ctx, param, value):
+ called.append(value)
+ return value
+
+diff --git a/tests/test_compat.py b/tests/test_compat.py
+index e4ecdc8..9dacc21 100644
+--- a/tests/test_compat.py
++++ b/tests/test_compat.py
+@@ -1,4 +1,5 @@
+ import click
++import pytest
+
+
+ if click.__version__ >= '3.0':
+@@ -11,10 +12,10 @@ if click.__version__ >= '3.0':
+ def cli(foo):
+ click.echo(foo)
+
+- result = runner.invoke(cli, ['--foo', 'wat'])
+- assert result.exit_code == 0
+- assert 'WAT' in result.output
+- assert 'Invoked legacy parameter callback' in result.output
++ with pytest.warns(Warning, match='Invoked legacy parameter callback'):
++ result = runner.invoke(cli, ['--foo', 'wat'])
++ assert result.exit_code == 0
++ assert 'WAT' in result.output
+
+
+ def test_bash_func_name():
+diff --git a/tests/test_options.py b/tests/test_options.py
+index 9dd8cdf..8bdda1f 100644
+--- a/tests/test_options.py
++++ b/tests/test_options.py
+@@ -199,7 +199,7 @@ def test_nargs_envvar(runner):
+
+
+ def test_custom_validation(runner):
+- def validate_pos_int(ctx, value):
++ def validate_pos_int(ctx, param, value):
+ if value < 0:
+ raise click.BadParameter('Value needs to be positive')
+ return value
+--
+2.16.4
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/click/files/, dev-python/click/
@ 2021-03-26 9:41 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-03-26 9:41 UTC (permalink / raw
To: gentoo-commits
commit: bb415c24e54982e01005448a29442e62099354a9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 08:28:25 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 09:41:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb415c24
dev-python/click: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/click/Manifest | 1 -
dev-python/click/click-6.7-r2.ebuild | 31 -----------
dev-python/click/click-6.7-r3.ebuild | 38 -------------
dev-python/click/files/click-6.7-fix-tests.patch | 65 ----------------------
.../click/files/click-6.7-support-sphinx-1.7.patch | 44 ---------------
5 files changed, 179 deletions(-)
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 4b245a92bce..a1e3db9c7a8 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,2 +1 @@
-DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
diff --git a/dev-python/click/click-6.7-r2.ebuild b/dev-python/click/click-6.7-r2.ebuild
deleted file mode 100644
index 4a02313d5fb..00000000000
--- a/dev-python/click/click-6.7-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="examples"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # From upstream, can be removed in next release.
- "${FILESDIR}"/${PN}-6.7-fix-tests.patch
- # From upstream, can be removed in next release.
- "${FILESDIR}"/${PN}-6.7-support-sphinx-1.7.patch
-)
-
-python_install_all() {
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-6.7-r3.ebuild b/dev-python/click/click-6.7-r3.ebuild
deleted file mode 100644
index 6a6ff97cc06..00000000000
--- a/dev-python/click/click-6.7-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- # From upstream, can be removed in next release.
- "${FILESDIR}/${PN}-6.7-fix-tests.patch"
- # From upstream, can be removed in next release.
- "${FILESDIR}/${PN}-6.7-support-sphinx-1.7.patch"
-)
-
-python_test() {
- emake test
-}
-
-python_install_all() {
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}
diff --git a/dev-python/click/files/click-6.7-fix-tests.patch b/dev-python/click/files/click-6.7-fix-tests.patch
deleted file mode 100644
index 8a305e3665d..00000000000
--- a/dev-python/click/files/click-6.7-fix-tests.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 20b4b1c0d1564ab4ef44b7d27d5b650735e28be3 Mon Sep 17 00:00:00 2001
-From: Armin Ronacher <armin.ronacher@active-4.com>
-Date: Sat, 23 Dec 2017 09:27:57 +0100
-Subject: [PATCH] Updated tests to work with newer pytest versions
-
----
- tests/test_basic.py | 2 +-
- tests/test_compat.py | 9 +++++----
- tests/test_options.py | 2 +-
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test_basic.py b/tests/test_basic.py
-index 045f608..960cd32 100644
---- a/tests/test_basic.py
-+++ b/tests/test_basic.py
-@@ -357,7 +357,7 @@ def test_required_option(runner):
- def test_evaluation_order(runner):
- called = []
-
-- def memo(ctx, value):
-+ def memo(ctx, param, value):
- called.append(value)
- return value
-
-diff --git a/tests/test_compat.py b/tests/test_compat.py
-index e4ecdc8..9dacc21 100644
---- a/tests/test_compat.py
-+++ b/tests/test_compat.py
-@@ -1,4 +1,5 @@
- import click
-+import pytest
-
-
- if click.__version__ >= '3.0':
-@@ -11,10 +12,10 @@ if click.__version__ >= '3.0':
- def cli(foo):
- click.echo(foo)
-
-- result = runner.invoke(cli, ['--foo', 'wat'])
-- assert result.exit_code == 0
-- assert 'WAT' in result.output
-- assert 'Invoked legacy parameter callback' in result.output
-+ with pytest.warns(Warning, match='Invoked legacy parameter callback'):
-+ result = runner.invoke(cli, ['--foo', 'wat'])
-+ assert result.exit_code == 0
-+ assert 'WAT' in result.output
-
-
- def test_bash_func_name():
-diff --git a/tests/test_options.py b/tests/test_options.py
-index 9dd8cdf..8bdda1f 100644
---- a/tests/test_options.py
-+++ b/tests/test_options.py
-@@ -199,7 +199,7 @@ def test_nargs_envvar(runner):
-
-
- def test_custom_validation(runner):
-- def validate_pos_int(ctx, value):
-+ def validate_pos_int(ctx, param, value):
- if value < 0:
- raise click.BadParameter('Value needs to be positive')
- return value
---
-2.16.4
-
diff --git a/dev-python/click/files/click-6.7-support-sphinx-1.7.patch b/dev-python/click/files/click-6.7-support-sphinx-1.7.patch
deleted file mode 100644
index 1076c2decad..00000000000
--- a/dev-python/click/files/click-6.7-support-sphinx-1.7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2c7929511114494350e26d7b0c790fb8ca82f605 Mon Sep 17 00:00:00 2001
-From: Daw-Ran Liou <dawran6@gmail.com>
-Date: Mon, 14 May 2018 13:34:23 -0400
-Subject: [PATCH] Support Sphinx 1.7+
-
-Move: from sphinx.util.compat import Directive
-To: from docutils.parsers.rst import Directive
----
- docs/clickdoctools.py | 2 +-
- setup.py | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/docs/clickdoctools.py b/docs/clickdoctools.py
-index c3db195..1dd47d3 100644
---- a/docs/clickdoctools.py
-+++ b/docs/clickdoctools.py
-@@ -15,7 +15,7 @@ from docutils import nodes
- from docutils.statemachine import ViewList
-
- from sphinx.domains import Domain
--from sphinx.util.compat import Directive
-+from docutils.parsers.rst import Directive
-
- PY2 = sys.version_info[0] == 2
-
-diff --git a/setup.py b/setup.py
-index b78403e..f1bcdcf 100644
---- a/setup.py
-+++ b/setup.py
-@@ -24,6 +24,11 @@ setup(
- maintainer_email='contact@palletsprojects.com',
- long_description=readme,
- packages=['click'],
-+ extras_require={
-+ 'docs': [
-+ 'sphinx',
-+ ],
-+ },
- description='A simple wrapper around optparse for '
- 'powerful command line utilities.',
- license='BSD',
---
-2.16.4
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-26 9:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-23 10:05 [gentoo-commits] repo/gentoo:master commit in: dev-python/click/files/, dev-python/click/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2018-08-13 12:01 Virgil Dupras
2021-03-26 9:41 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox