[gentoo-commits] repo/gentoo:master commit in: dev-python/python-dotenv/, dev-python/python-dotenv/files/
commit: 9ae0c104c83a367122a4314d40966ffb6de0e975
Author: Michał Górny gentoo org>
AuthorDate: Sun May 15 10:44:51 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Sun May 15 10:57:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae0c104
dev-python/python-dotenv: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/python-dotenv/Manifest | 1 -
.../files/python-dotenv-0.19.2-entry-points.patch | 21 ---
.../python-dotenv/python-dotenv-0.19.2-r2.ebuild | 44 --
3 files changed, 66 deletions(-)
diff --git a/dev-python/python-dotenv/Manifest
b/dev-python/python-dotenv/Manifest
index 4d29d01ab4f8..52e44516f7ff 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,2 +1 @@
-DIST python-dotenv-0.19.2.tar.gz 31508 BLAKE2B
f92285090b680d3cbf842f99b6ca49ab9af877a1ed6543cbc3a41ba592240739fdf94f2ea21f2e2e3c9b9e68eeb36c5b1c12004fa953674e3f47942176e125c6
SHA512
da411fa02326ec7407bbb6760dd4e5f22eaca60d725ade3ac89302ec4e33d00fe8c231e8a64d0bc22698a93701143085c098b6703e598c6d8c2e4c57b9bafa20
DIST python-dotenv-0.20.0.tar.gz 32069 BLAKE2B
360c878241fe4df4cee2ef59a2a4967e3b5fff7250297e4adb4b7f2c50deaf66bdc76b97bc9a1998bcf3d7da7c5e40c98f93d3e3cc044a2e73e159a85a2d93fa
SHA512
85e3953f296ec59130ea212b794557d479efde0ef519303dd3a8fe8da0be2d445728b9b8fd5a4bc13372a0fa322f49d290038538ddca580841d0df1f3758f0b7
diff --git
a/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
b/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
deleted file mode 100644
index a01806fbc8c1..
--- a/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a8122d3..c7bfe82 100644
a/setup.py
-+++ b/setup.py
-@@ -36,10 +36,12 @@ setup(
- extras_require={
- 'cli': ['click>=5.0', ],
- },
--entry_points='''
--[console_scripts]
--dotenv=dotenv.cli:cli
--''',
-+entry_points={
-+"console_scripts": [
-+"dotenv=dotenv.cli:cli",
-+"python-dotenv=dotenv.cli:cli",
-+],
-+},
- license='BSD-3-Clause',
- classifiers=[
- 'Development Status :: 5 - Production/Stable',
diff --git a/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
b/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
deleted file mode 100644
index 55aabf2a3b57..
--- a/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage .env files"
-HOMEPAGE="https://github.com/theskumar/python-dotenv;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-DEPEND="
- test? (
- >=dev-python/click-5[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- >=dev-python/sh-1.09[${PYTHON_USEDEP}]
- )"
-
-DOCS=( CHANGELOG.md README.md )
-
-PATCHES=(
- # rename the entry point (note: old name is needed in tests)
- # https://bugs.gentoo.org/798648
- # also fix syntax since it doesn't seem to work anymore
- # https://bugs.gentoo.org/833389
- "${FILESDIR}"/python-dotenv-0.19.2-entry-points.patch
-)
-
-distutils_enable_tests pytest
-
-src_install() {
- distutils-r1_src_install
-
- # Avoid collision with dev-ruby/dotenv (bug #798648)
- rm "${D}"/usr/bin/dotenv || die
-}
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-dotenv/, dev-python/python-dotenv/files/
commit: ff1653aa82e8fb777a7f971b519c75b0cb074ee1
Author: Michał Górny gentoo org>
AuthorDate: Tue Feb 15 09:37:11 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Feb 15 09:39:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff1653aa
dev-python/python-dotenv: Fix installing entry points
Closes: https://bugs.gentoo.org/833389
Signed-off-by: Michał Górny gentoo.org>
.../files/python-dotenv-0.19.2-entry-points.patch | 21 +
...0.19.2.ebuild => python-dotenv-0.19.2-r1.ebuild} | 8 ++--
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git
a/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
b/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
new file mode 100644
index ..a01806fbc8c1
--- /dev/null
+++ b/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
@@ -0,0 +1,21 @@
+diff --git a/setup.py b/setup.py
+index a8122d3..c7bfe82 100644
+--- a/setup.py
b/setup.py
+@@ -36,10 +36,12 @@ setup(
+ extras_require={
+ 'cli': ['click>=5.0', ],
+ },
+-entry_points='''
+-[console_scripts]
+-dotenv=dotenv.cli:cli
+-''',
++entry_points={
++"console_scripts": [
++"dotenv=dotenv.cli:cli",
++"python-dotenv=dotenv.cli:cli",
++],
++},
+ license='BSD-3-Clause',
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
diff --git a/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild
b/dev-python/python-dotenv/python-dotenv-0.19.2-r1.ebuild
similarity index 72%
rename from dev-python/python-dotenv/python-dotenv-0.19.2.ebuild
rename to dev-python/python-dotenv/python-dotenv-0.19.2-r1.ebuild
index 662c99d941fc..066098d96dfe 100644
--- a/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.19.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,7 +25,11 @@ DEPEND="
DOCS=( CHANGELOG.md README.md )
PATCHES=(
- "${FILESDIR}"/${PN}-0.18.0-second-entrypoint.patch # bug 798648
+ # rename the entry point (note: old name is needed in tests)
+ # https://bugs.gentoo.org/798648
+ # also fix syntax since it doesn't seem to work anymore
+ # https://bugs.gentoo.org/833389
+ "${FILESDIR}"/python-dotenv-0.19.2-entry-points.patch
)
distutils_enable_tests --install pytest
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-dotenv/, dev-python/python-dotenv/files/
commit: d4beda25f7a27938194241dfaaef1ffafb12c8ce
Author: Sebastian Pipping gentoo org>
AuthorDate: Fri Jun 25 23:47:25 2021 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Fri Jun 25 23:57:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4beda25
dev-python/python-dotenv: Address collision with dev-ruby/dotenv
I'm using a second entrypoint here rather than a plain rename
to not break (1) the tests and (2) access to argv[0] by python-exec.
Closes: https://bugs.gentoo.org/798648
Signed-off-by: Sebastian Pipping gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3
.../python-dotenv-0.18.0-second-entrypoint.patch | 24 ++
.../python-dotenv/python-dotenv-0.17.1.ebuild | 1 +
18.0.ebuild => python-dotenv-0.18.0-r1.ebuild} | 11 ++
.../python-dotenv/python-dotenv-0.18.0.ebuild | 1 +
4 files changed, 37 insertions(+)
diff --git
a/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
b/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
new file mode 100644
index 000..9d69c8b6b00
--- /dev/null
+++
b/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
@@ -0,0 +1,24 @@
+From c57f0aa05145ff84b708ffd64106ae741096027e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping
+Date: Sat, 26 Jun 2021 01:38:14 +0200
+Subject: [PATCH] setup.py: Add second entrypoint "python-dotenv"
+
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index fd5785a..bb31c40 100644
+--- a/setup.py
b/setup.py
+@@ -42,6 +42,7 @@ setup(
+ entry_points='''
+ [console_scripts]
+ dotenv=dotenv.cli:cli
++python-dotenv=dotenv.cli:cli
+ ''',
+ license='BSD-3-Clause',
+ classifiers=[
+--
+2.31.1
+
diff --git a/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
b/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
index 037518dc489..eabf304977a 100644
--- a/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
dev-python/mock[${PYTHON_USEDEP}]
>=dev-python/sh-1.09[${PYTHON_USEDEP}]
)"
+RDEPEND="!dev-ruby/dotenv" # bug 798648
DOCS=( CHANGELOG.md README.md )
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
similarity index 74%
copy from dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
copy to dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
index 3fd9aa665e5..aa3667814de 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -24,4 +24,15 @@ DEPEND="
DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.18.0-second-entrypoint.patch # bug 798648
+)
+
distutils_enable_tests --install pytest
+
+src_install() {
+ distutils-r1_src_install
+
+ # Avoid collision with dev-ruby/dotenv (bug #798648)
+ rm "${D}"/usr/bin/dotenv || die
+}
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
b/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
index 3fd9aa665e5..e412eed05fb 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
@@ -21,6 +21,7 @@ DEPEND="
dev-python/mock[${PYTHON_USEDEP}]
>=dev-python/sh-1.09[${PYTHON_USEDEP}]
)"
+RDEPEND="!dev-ruby/dotenv" # bug 798648
DOCS=( CHANGELOG.md README.md )
