Skip to content

Commit

Permalink
dev-python/python-dotenv: Address collision with dev-ruby/dotenv
Browse files Browse the repository at this point in the history
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 <sping@gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3
  • Loading branch information
hartwork committed Jun 25, 2021
1 parent 14c3548 commit d4beda2
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From c57f0aa05145ff84b708ffd64106ae741096027e Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
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

1 change: 1 addition & 0 deletions dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

Expand Down
38 changes: 38 additions & 0 deletions dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

PYTHON_COMPAT=( python3_{8..9} )
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 ~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=(
"${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
}
1 change: 1 addition & 0 deletions dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

Expand Down

0 comments on commit d4beda2

Please sign in to comment.