* [gentoo-commits] repo/gentoo:master commit in: dev-python/nextinspace/, dev-python/nextinspace/files/
@ 2024-09-21 5:16 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2024-09-21 5:16 UTC (permalink / raw
To: gentoo-commits
commit: 619c90b2cdbf81b0abfdbbf1b6396f3ae52f575e
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Sep 20 21:21:10 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 05:13:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=619c90b2
dev-python/nextinspace: migrate to dev-python/pytest-lazy-fixtures
Closes: https://bugs.gentoo.org/939424
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/nextinspace-2.0.5-lazy_fixtures.patch | 96 ++++++++++++++++++++++
dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild | 47 +++++++++++
2 files changed, 143 insertions(+)
diff --git a/dev-python/nextinspace/files/nextinspace-2.0.5-lazy_fixtures.patch b/dev-python/nextinspace/files/nextinspace-2.0.5-lazy_fixtures.patch
new file mode 100644
index 000000000000..92d94f7394f1
--- /dev/null
+++ b/dev-python/nextinspace/files/nextinspace-2.0.5-lazy_fixtures.patch
@@ -0,0 +1,96 @@
+commit 6d9b758075e756650b5a13ff3cf0852b21d6f1e7
+Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Fri Sep 20 23:13:24 2024 +0200
+Upstream: https://github.com/gideonshaked/nextinspace/pull/17
+
+ Migrate from pytest-lazy-fixture to pytest-lazy-fixtures
+
+--- a/tests/cli/test_viewer.py
++++ b/tests/cli/test_viewer.py
+@@ -1,6 +1,7 @@
+ # type: ignore
+
+ import pytest
++from pytest_lazy_fixtures import lf
+
+ from nextinspace.cli import viewer
+
+@@ -13,8 +14,8 @@ def test_dict_event(example_event, example_event_dict):
+ "launcher, dict_",
+ [
+ (
+- pytest.lazy_fixture("example_launcher"),
+- pytest.lazy_fixture("example_launcher_dict"),
++ lf("example_launcher"),
++ lf("example_launcher_dict"),
+ ),
+ (None, None),
+ ],
+@@ -27,12 +28,12 @@ def test_dict_launcher(launcher, dict_):
+ "launch, dict_",
+ [
+ (
+- pytest.lazy_fixture("example_launch_verbose"),
+- pytest.lazy_fixture("example_launch_verbose_dict"),
++ lf("example_launch_verbose"),
++ lf("example_launch_verbose_dict"),
+ ),
+ (
+- pytest.lazy_fixture("example_launch_normal"),
+- pytest.lazy_fixture("example_launch_normal_dict"),
++ lf("example_launch_normal"),
++ lf("example_launch_normal_dict"),
+ ),
+ ],
+ )
+@@ -44,12 +45,12 @@ def test_dict_launch(launch, dict_):
+ "item, dict_",
+ [
+ (
+- pytest.lazy_fixture("example_launch_normal"),
+- pytest.lazy_fixture("example_launch_normal_dict"),
++ lf("example_launch_normal"),
++ lf("example_launch_normal_dict"),
+ ),
+ (
+- pytest.lazy_fixture("example_event"),
+- pytest.lazy_fixture("example_event_dict"),
++ lf("example_event"),
++ lf("example_event_dict"),
+ ),
+ ],
+ )
+--- a/tests/test_nextinspace.py
++++ b/tests/test_nextinspace.py
+@@ -4,6 +4,7 @@ import copy
+ from datetime import MINYEAR, datetime, timedelta, timezone
+
+ import pytest
++from pytest_lazy_fixtures import lf
+
+ import nextinspace
+ from nextinspace import BASE_URL
+@@ -12,9 +13,9 @@ from nextinspace import BASE_URL
+ @pytest.mark.parametrize(
+ "example",
+ [
+- pytest.lazy_fixture("example_event"),
+- pytest.lazy_fixture("example_launcher"),
+- pytest.lazy_fixture("example_launch_verbose"),
++ lf("example_event"),
++ lf("example_launcher"),
++ lf("example_launch_verbose"),
+ ],
+ )
+ def test_eq(example):
+@@ -69,8 +70,8 @@ def test_date_str_to_datetime(datetime_str, result):
+ @pytest.mark.parametrize(
+ "launch, include_launcher",
+ [
+- (pytest.lazy_fixture("example_launch_verbose"), True),
+- (pytest.lazy_fixture("example_launch_normal"), False),
++ (lf("example_launch_verbose"), True),
++ (lf("example_launch_normal"), False),
+ ],
+ )
+ def test_next_launch(requests_mock, example_launch_text, launch, include_launcher, example_launcher_text):
diff --git a/dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild b/dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..62c30c668261
--- /dev/null
+++ b/dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1
+
+DESCRIPTION="A command-line tool for seeing the latest in space"
+HOMEPAGE="https://github.com/gideonshaked/nextinspace"
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gideonshaked/nextinspace.git"
+else
+ SRC_URI="https://github.com/gideonshaked/nextinspace/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+ KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+ >=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.24[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-1.8[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-lazy_fixtures.patch"
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ default
+
+ # Don't install license files
+ sed -e '/^include = \["LICENSE"\]$/d' -i pyproject.toml || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/nextinspace/, dev-python/nextinspace/files/
@ 2025-01-05 2:55 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2025-01-05 2:55 UTC (permalink / raw
To: gentoo-commits
commit: 11495b6c6e6441f506b04dc6cae559ffd48f00b7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 5 02:34:02 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 02:34:02 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11495b6c
dev-python/nextinspace: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/nextinspace/Manifest | 2 -
.../files/nextinspace-2.0.5-lazy_fixtures.patch | 96 ----------------------
.../files/nextinspace-3.0.0-license.patch | 20 -----
dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild | 47 -----------
dev-python/nextinspace/nextinspace-3.0.0.ebuild | 39 ---------
5 files changed, 204 deletions(-)
diff --git a/dev-python/nextinspace/Manifest b/dev-python/nextinspace/Manifest
index fd04f35727ab..b6c6934b6e29 100644
--- a/dev-python/nextinspace/Manifest
+++ b/dev-python/nextinspace/Manifest
@@ -1,3 +1 @@
-DIST nextinspace-2.0.5.gh.tar.gz 48406 BLAKE2B 6f6e2c95fc1a5a8175faca4df0a51de9996ca24847926dc35b94d0e4bd5c9de880ad757606309f622f41c825d0c2e46c587f255573b4df70fe35c937148af9d7 SHA512 c8f55446d9eea0409afb8a8ddb41001b18b55d9105d007b306717a3d932ea1b03ecb2363d0deb42ec8da1cc245b77ffb18cee6ec3474121c15c4c9b79ff80405
-DIST nextinspace-3.0.0.gh.tar.gz 55095 BLAKE2B 02140cbfaeca9fd4cb19fefd40448fc5ffbed19a8e5bcb448800b1c5917d7873be69e0aab5c4d96acf4dfb7fc57b780420de19dc38a523b5ca38c9847cfa0263 SHA512 fa1d20401b7ed910e0c65c9010062cf6d1ffe7e73c09b47f42b19ab1bfbb74612cb7405571e4db0404de81e66211799f38b6654763222643f66e63176e4a72ab
DIST nextinspace-3.0.1.gh.tar.gz 55101 BLAKE2B aeec5e34e6ae611d4f693dde10b14430d46853949c6e5d81aa90a842da670a156ecf3216c09d70f40279836155fe097c85c82e05a3e5c31d5457409f41a62f29 SHA512 92aa209e36eeed742cbfec99456aa452a164ffd97c87d6a17271c1731d9e4cdca1e616217ea6fdd347356b68644cc8fa3035228877324a7d180f764b6f8b012e
diff --git a/dev-python/nextinspace/files/nextinspace-2.0.5-lazy_fixtures.patch b/dev-python/nextinspace/files/nextinspace-2.0.5-lazy_fixtures.patch
deleted file mode 100644
index 92d94f7394f1..000000000000
--- a/dev-python/nextinspace/files/nextinspace-2.0.5-lazy_fixtures.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-commit 6d9b758075e756650b5a13ff3cf0852b21d6f1e7
-Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Fri Sep 20 23:13:24 2024 +0200
-Upstream: https://github.com/gideonshaked/nextinspace/pull/17
-
- Migrate from pytest-lazy-fixture to pytest-lazy-fixtures
-
---- a/tests/cli/test_viewer.py
-+++ b/tests/cli/test_viewer.py
-@@ -1,6 +1,7 @@
- # type: ignore
-
- import pytest
-+from pytest_lazy_fixtures import lf
-
- from nextinspace.cli import viewer
-
-@@ -13,8 +14,8 @@ def test_dict_event(example_event, example_event_dict):
- "launcher, dict_",
- [
- (
-- pytest.lazy_fixture("example_launcher"),
-- pytest.lazy_fixture("example_launcher_dict"),
-+ lf("example_launcher"),
-+ lf("example_launcher_dict"),
- ),
- (None, None),
- ],
-@@ -27,12 +28,12 @@ def test_dict_launcher(launcher, dict_):
- "launch, dict_",
- [
- (
-- pytest.lazy_fixture("example_launch_verbose"),
-- pytest.lazy_fixture("example_launch_verbose_dict"),
-+ lf("example_launch_verbose"),
-+ lf("example_launch_verbose_dict"),
- ),
- (
-- pytest.lazy_fixture("example_launch_normal"),
-- pytest.lazy_fixture("example_launch_normal_dict"),
-+ lf("example_launch_normal"),
-+ lf("example_launch_normal_dict"),
- ),
- ],
- )
-@@ -44,12 +45,12 @@ def test_dict_launch(launch, dict_):
- "item, dict_",
- [
- (
-- pytest.lazy_fixture("example_launch_normal"),
-- pytest.lazy_fixture("example_launch_normal_dict"),
-+ lf("example_launch_normal"),
-+ lf("example_launch_normal_dict"),
- ),
- (
-- pytest.lazy_fixture("example_event"),
-- pytest.lazy_fixture("example_event_dict"),
-+ lf("example_event"),
-+ lf("example_event_dict"),
- ),
- ],
- )
---- a/tests/test_nextinspace.py
-+++ b/tests/test_nextinspace.py
-@@ -4,6 +4,7 @@ import copy
- from datetime import MINYEAR, datetime, timedelta, timezone
-
- import pytest
-+from pytest_lazy_fixtures import lf
-
- import nextinspace
- from nextinspace import BASE_URL
-@@ -12,9 +13,9 @@ from nextinspace import BASE_URL
- @pytest.mark.parametrize(
- "example",
- [
-- pytest.lazy_fixture("example_event"),
-- pytest.lazy_fixture("example_launcher"),
-- pytest.lazy_fixture("example_launch_verbose"),
-+ lf("example_event"),
-+ lf("example_launcher"),
-+ lf("example_launch_verbose"),
- ],
- )
- def test_eq(example):
-@@ -69,8 +70,8 @@ def test_date_str_to_datetime(datetime_str, result):
- @pytest.mark.parametrize(
- "launch, include_launcher",
- [
-- (pytest.lazy_fixture("example_launch_verbose"), True),
-- (pytest.lazy_fixture("example_launch_normal"), False),
-+ (lf("example_launch_verbose"), True),
-+ (lf("example_launch_normal"), False),
- ],
- )
- def test_next_launch(requests_mock, example_launch_text, launch, include_launcher, example_launcher_text):
diff --git a/dev-python/nextinspace/files/nextinspace-3.0.0-license.patch b/dev-python/nextinspace/files/nextinspace-3.0.0-license.patch
deleted file mode 100644
index 0f1708777ff7..000000000000
--- a/dev-python/nextinspace/files/nextinspace-3.0.0-license.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 6e03e0f5cc94f039df06506a340b70d38860b84b
-Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Thu Dec 19 18:40:53 2024 +0100
-Upstream: https://github.com/gideonshaked/nextinspace/pull/18
-
- Don't install LICENSE file in site-diretory
-
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -58,7 +58,9 @@ classifiers = [
- "Programming Language :: Python :: 3 :: Only",
- "Natural Language :: English"
- ]
--include = ["LICENSE"]
-+include = [
-+ { path = "LICENSE", format = "sdist" },
-+]
-
- [tool.poetry.dependencies]
- python = "^3.10"
diff --git a/dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild b/dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild
deleted file mode 100644
index bb014fe9d684..000000000000
--- a/dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-DESCRIPTION="A command-line tool for seeing the latest in space"
-HOMEPAGE="https://github.com/gideonshaked/nextinspace"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/gideonshaked/nextinspace.git"
-else
- SRC_URI="https://github.com/gideonshaked/nextinspace/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
- >=dev-python/requests-2.24[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-1.8[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-lazy_fixtures.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
- default
-
- # Don't install license files
- sed -e '/^include = \["LICENSE"\]$/d' -i pyproject.toml || die
-}
diff --git a/dev-python/nextinspace/nextinspace-3.0.0.ebuild b/dev-python/nextinspace/nextinspace-3.0.0.ebuild
deleted file mode 100644
index 4017cac96b5e..000000000000
--- a/dev-python/nextinspace/nextinspace-3.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-DESCRIPTION="A command-line tool for seeing the latest in space"
-HOMEPAGE="https://github.com/gideonshaked/nextinspace"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/gideonshaked/nextinspace.git"
-else
- SRC_URI="https://github.com/gideonshaked/nextinspace/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
- >=dev-python/requests-2.24[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-1.8[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-license.patch"
-)
-
-distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-05 2:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-21 5:16 [gentoo-commits] repo/gentoo:master commit in: dev-python/nextinspace/, dev-python/nextinspace/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2025-01-05 2:55 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