* [gentoo-commits] repo/gentoo:master commit in: dev-python/citeproc-py/, dev-python/citeproc-py/files/
@ 2021-10-20 3:10 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-10-20 3:10 UTC (permalink / raw
To: gentoo-commits
commit: c5ecf710bcac01705d82d711f7a965f6c53f1135
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Mon Sep 13 19:03:34 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 03:08:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ecf710
dev-python/citeproc-py: add 0.6.0
Bug: https://bugs.gentoo.org/792561
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22283
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/citeproc-py/Manifest | 2 ++
dev-python/citeproc-py/citeproc-py-0.6.0.ebuild | 42 ++++++++++++++++++++++
.../files/stop_test_from_accessing_git-0.6.0.patch | 13 +++++++
3 files changed, 57 insertions(+)
diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index b47f04a2e2a..8cf3be4efa9 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1 +1,3 @@
DIST citeproc-py-0.4.0.tar.gz 109786 BLAKE2B 8d8520ad10a9db7b7da1a2febcc594750572a562ada3944e41dd42321a3b9384828ad17e671307b5c4affeca2ec4a3f8e97eec650dad7005323ccb2913ef43d5 SHA512 bdc09a6f632a13cdfa757710c0d137ec73fe590bd01e049847fe013569231426bc72b318133fa34c96c5608b7a30058c27f4cd3d5fa2ba4b0760527b877992d5
+DIST citeproc-py-0.6.0.tar.gz 140624 BLAKE2B 169129c6be29a5a5c4678ccc2e2dd0b9ef58248ae66339ac32c6fab887058c7bbd2884d2ce959ce52287a622be4abded7e1ab06cae9c0952be47352671f951c4 SHA512 901a62c59189a652b589e4aa12e489f72f5ea40db1349fcdc0e4ffd6f5be8d364dccdc23cfab1a9003fbc672d75c5bdf06c74b9b5e1fcfb2c12e84df39fe1fb1
+DIST citeproc-py-test-suite-c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11.tar.gz 990340 BLAKE2B acf02bec956765d0bea794a96ce7b86104c98aa4c0f8620dbfaeb7f16f37fe07e5b45883c04a1c639fad9098e3733339c90deaf8cdd794fadb8db1456972d16b SHA512 8653ea8968fa108c0814f43744f6e569a0a32cf4e82addec667f75a28b9c1fd9c7714c0c75a85e0d6f7f579e554494925ba4ab05e21e4dcb6b727d00b6a16df7
diff --git a/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild b/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
new file mode 100644
index 00000000000..d69a3058ef1
--- /dev/null
+++ b/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+# Keep synced with tests/citeproc-test.py
+TEST_SUITE_COMMIT="c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11"
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another Python CSL Processor"
+HOMEPAGE="https://pypi.org/project/citeproc-py/"
+SRC_URI="
+ mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+ test? (
+ https://github.com/citation-style-language/test-suite/archive/${TEST_SUITE_COMMIT}.tar.gz -> ${PN}-test-suite-${TEST_SUITE_COMMIT}.tar.gz
+ )"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+BDEPEND=">=app-text/rnc2rng-2.6.3[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} )"
+
+PATCHES=( "${FILESDIR}/stop_test_from_accessing_git-${PV}.patch" )
+
+distutils_enable_tests nose
+
+src_prepare() {
+ default_src_prepare
+ mv "${WORKDIR}/test-suite-${TEST_SUITE_COMMIT}" "${S}/tests/test-suite" || die
+}
+
+python_test() {
+ nosetests -v --ignore-files=citeproc-test.py || die "Tests failed with ${EPYTHON}"
+ ${EPYTHON} tests/citeproc-test.py -vs || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/citeproc-py/files/stop_test_from_accessing_git-0.6.0.patch b/dev-python/citeproc-py/files/stop_test_from_accessing_git-0.6.0.patch
new file mode 100644
index 00000000000..e04ff1be1b8
--- /dev/null
+++ b/dev-python/citeproc-py/files/stop_test_from_accessing_git-0.6.0.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/citeproc-test.py b/tests/citeproc-test.py
+index 11bd47d..8934700 100644
+--- a/tests/citeproc-test.py
++++ b/tests/citeproc-test.py
+@@ -288,7 +288,7 @@ if __name__ == '__main__':
+ glob_pattern = '*'
+ run_all_tests = True
+
+- test_repo_has_updates = clone_test_suite()
++ test_repo_has_updates = False
+
+ # import the text fixture parser included with citeproc-test
+ try: # Python 3.3+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/citeproc-py/, dev-python/citeproc-py/files/
@ 2021-11-14 8:46 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2021-11-14 8:46 UTC (permalink / raw
To: gentoo-commits
commit: 8b2696408a861d31a0b53ba2ec9161d5977ba8e1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 08:37:49 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 08:46:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b269640
dev-python/citeproc-py: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/citeproc-py/Manifest | 1 -
dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild | 25 -------------
.../b1a5f925527093b0b5c11507f379a908e3354820.patch | 42 ----------------------
3 files changed, 68 deletions(-)
diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index 8cf3be4efa9a..f226fa1ed986 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1,3 +1,2 @@
-DIST citeproc-py-0.4.0.tar.gz 109786 BLAKE2B 8d8520ad10a9db7b7da1a2febcc594750572a562ada3944e41dd42321a3b9384828ad17e671307b5c4affeca2ec4a3f8e97eec650dad7005323ccb2913ef43d5 SHA512 bdc09a6f632a13cdfa757710c0d137ec73fe590bd01e049847fe013569231426bc72b318133fa34c96c5608b7a30058c27f4cd3d5fa2ba4b0760527b877992d5
DIST citeproc-py-0.6.0.tar.gz 140624 BLAKE2B 169129c6be29a5a5c4678ccc2e2dd0b9ef58248ae66339ac32c6fab887058c7bbd2884d2ce959ce52287a622be4abded7e1ab06cae9c0952be47352671f951c4 SHA512 901a62c59189a652b589e4aa12e489f72f5ea40db1349fcdc0e4ffd6f5be8d364dccdc23cfab1a9003fbc672d75c5bdf06c74b9b5e1fcfb2c12e84df39fe1fb1
DIST citeproc-py-test-suite-c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11.tar.gz 990340 BLAKE2B acf02bec956765d0bea794a96ce7b86104c98aa4c0f8620dbfaeb7f16f37fe07e5b45883c04a1c639fad9098e3733339c90deaf8cdd794fadb8db1456972d16b SHA512 8653ea8968fa108c0814f43744f6e569a0a32cf4e82addec667f75a28b9c1fd9c7714c0c75a85e0d6f7f579e554494925ba4ab05e21e4dcb6b727d00b6a16df7
diff --git a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
deleted file mode 100644
index 37553b998754..000000000000
--- a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another Python CSL Processor"
-HOMEPAGE="https://pypi.org/project/citeproc-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/b1a5f925527093b0b5c11507f379a908e3354820.patch" )
-
-RDEPEND="
- app-text/rnc2rng[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]"
-BDEPEND="
- ${RDEPEND}"
diff --git a/dev-python/citeproc-py/files/b1a5f925527093b0b5c11507f379a908e3354820.patch b/dev-python/citeproc-py/files/b1a5f925527093b0b5c11507f379a908e3354820.patch
deleted file mode 100644
index b3b6e0fe074a..000000000000
--- a/dev-python/citeproc-py/files/b1a5f925527093b0b5c11507f379a908e3354820.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From b1a5f925527093b0b5c11507f379a908e3354820 Mon Sep 17 00:00:00 2001
-From: Brecht Machiels <brecht@mos6581.org>
-Date: Tue, 22 May 2018 12:57:47 +0200
-Subject: [PATCH] rnc2rng 2.6.1 handles rnc file encoding (fixes #81)
-
----
- setup.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index dbaad6d..774932b 100755
---- a/setup.py
-+++ b/setup.py
-@@ -9,6 +9,7 @@
- import sys
-
- from datetime import datetime
-+from io import open
- from subprocess import Popen, PIPE
- from setuptools import setup, find_packages
- from setuptools.command.build_py import build_py
-@@ -63,9 +64,8 @@ def convert_rnc():
- import rnc2rng
-
- filename_root, _ = os.path.splitext(CSL_SCHEMA_RNC)
-- with open(CSL_SCHEMA_RNC, 'r') as rnc:
-- root = rnc2rng.load(rnc)
-- with open(filename_root + '.rng', 'w') as rng:
-+ root = rnc2rng.load(CSL_SCHEMA_RNC)
-+ with open(filename_root + '.rng', 'w', encoding='utf-8') as rng:
- rnc2rng.dump(root, rng)
-
-
-@@ -91,7 +91,7 @@ def run(self):
- 'data/schema/*.rng',
- 'data/styles/*.csl']},
- scripts=['bin/csl_unsorted'],
-- setup_requires=['rnc2rng>=2.2'],
-+ setup_requires=['rnc2rng>=2.6.1'],
- install_requires=['lxml'],
- provides=[PACKAGE],
- #test_suite='nose.collector',
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-14 8:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-20 3:10 [gentoo-commits] repo/gentoo:master commit in: dev-python/citeproc-py/, dev-python/citeproc-py/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-11-14 8:46 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