Thu Feb 23 15:59:24 2023 UTC ()
Update to 0.19.0. From the changelog:
* implement --nocache option
* new plugin: ikiwiki toot
* fix incorrect string stripping in README (Closes: GL#29)
* cleanups:
* add support for Python 3.10, no change
* remove the test compatibility shim from setup.py
* silence warnings from lxml missing type hints
* more uniform variable naming (underscores)
(schmonz)
diff -r1.19 -r1.20 pkgsrc/mail/feed2exec/Makefile
diff -r1.5 -r1.6 pkgsrc/mail/feed2exec/PLIST
diff -r1.8 -r1.9 pkgsrc/mail/feed2exec/distinfo
diff -r0 -r1.4 pkgsrc/mail/feed2exec/patches/patch-feed2exec_____init____.py
diff -r0 -r1.4 pkgsrc/mail/feed2exec/patches/patch-setup.py
diff -r0 -r1.3 pkgsrc/mail/feed2exec/patches/patch-pyproject.toml
diff -r0 -r1.3 pkgsrc/mail/feed2exec/patches/patch-setup.cfg
--- pkgsrc/mail/feed2exec/Makefile 2022/06/30 11:18:34 1.19
+++ pkgsrc/mail/feed2exec/Makefile 2023/02/23 15:59:24 1.20
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2022/06/30 11:18:34 nia Exp $
+# $NetBSD: Makefile,v 1.20 2023/02/23 15:59:24 schmonz Exp $
-DISTNAME= feed2exec-0.18.0
+DISTNAME= feed2exec-0.19.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 2
CATEGORIES= mail python
-MASTER_SITES= ${MASTER_SITE_PYPI:=f/feed2exec/}
-# remove after 0.18.0
-DIST_SUBDIR= ${DISTNAME}
+MASTER_SITES= ${MASTER_SITE_GITLAB:=anarcat/feed2exec/-/archive/${PKGVERSION_NOREV}/}
MAINTAINER= schmonz@NetBSD.org
HOMEPAGE= https://feed2exec.readthedocs.io/
@@ -17,7 +14,6 @@
BUILD_DEPENDS+= ${PYPKGPREFIX}-flakes-[0-9]*:../../devel/py-flakes
BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-Unidecode-[0-9]*:../../textproc/py-Unidecode
DEPENDS+= ${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs
DEPENDS+= ${PYPKGPREFIX}-cachecontrol-[0-9]*:../../devel/py-cachecontrol
@@ -43,8 +39,19 @@
USE_PKG_RESOURCES= yes
+SUBST_CLASSES+= version
+SUBST_STAGE.version= pre-configure
+SUBST_FILES.version= setup.py feed2exec/__init__.py
+SUBST_SED.version= -e 's|@VERSION@|${PKGVERSION_NOREV}|'
+
+post-extract:
+ ${ECHO} "version_number = \"${PKGVERSION_NOREV}\"" > ${WRKSRC}/feed2exec/_version.py
+
do-test:
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
+
+#post-install:
+# ${RM} -rf ${DESTDIR}${PREFIX}/${PYSITELIB}/feed2exec/__pycache__/
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
--- pkgsrc/mail/feed2exec/PLIST 2022/02/04 00:04:09 1.5
+++ pkgsrc/mail/feed2exec/PLIST 2023/02/23 15:59:24 1.6
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/02/04 00:04:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/02/23 15:59:24 schmonz Exp $
bin/feed2exec
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -54,6 +54,9 @@
${PYSITELIB}/feed2exec/plugins/ikiwiki_recentchanges.py
${PYSITELIB}/feed2exec/plugins/ikiwiki_recentchanges.pyc
${PYSITELIB}/feed2exec/plugins/ikiwiki_recentchanges.pyo
+${PYSITELIB}/feed2exec/plugins/ikiwikitoot.py
+${PYSITELIB}/feed2exec/plugins/ikiwikitoot.pyc
+${PYSITELIB}/feed2exec/plugins/ikiwikitoot.pyo
${PYSITELIB}/feed2exec/plugins/json.py
${PYSITELIB}/feed2exec/plugins/json.pyc
${PYSITELIB}/feed2exec/plugins/json.pyo
@@ -75,61 +78,9 @@
${PYSITELIB}/feed2exec/tests/__init__.py
${PYSITELIB}/feed2exec/tests/__init__.pyc
${PYSITELIB}/feed2exec/tests/__init__.pyo
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_add.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_cache.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_fetch.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_fetch_cache.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_fetch_parallel.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_normalize.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_pattern.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_feeds.test_settings.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_main.test_basics.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_main.test_parse.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_main.test_planet.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_opml.test_opml.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_archive.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_email.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_maildir.json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_archive[full].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_archive[page].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_catchup[full].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_catchup[page].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_404[full].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_404[page].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_invalid[full].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_invalid[page].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_too_fast[full].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_too_fast[page].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_working[full].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_example_working[page].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_invalid_example[full].json
-${PYSITELIB}/feed2exec/tests/cassettes/feed2exec.tests.test_plugins.test_wayback_invalid_example[page].json
-${PYSITELIB}/feed2exec/tests/cassettes/planet-debian.mbx
${PYSITELIB}/feed2exec/tests/conftest.py
${PYSITELIB}/feed2exec/tests/conftest.pyc
${PYSITELIB}/feed2exec/tests/conftest.pyo
-${PYSITELIB}/feed2exec/tests/files/README.mdwn
-${PYSITELIB}/feed2exec/tests/files/breaking_news.mbx
-${PYSITELIB}/feed2exec/tests/files/breaking_news.xml
-${PYSITELIB}/feed2exec/tests/files/duplicates.ini
-${PYSITELIB}/feed2exec/tests/files/duplicates.opml
-${PYSITELIB}/feed2exec/tests/files/liferea.ini
-${PYSITELIB}/feed2exec/tests/files/liferea.opml
-${PYSITELIB}/feed2exec/tests/files/planet-debian.mbx
-${PYSITELIB}/feed2exec/tests/files/planet-debian.xml
-${PYSITELIB}/feed2exec/tests/files/restic.mbx
-${PYSITELIB}/feed2exec/tests/files/restic.xml
-${PYSITELIB}/feed2exec/tests/files/rsswithpermalink.xml
-${PYSITELIB}/feed2exec/tests/files/sample.mbx
-${PYSITELIB}/feed2exec/tests/files/sample.xml
-${PYSITELIB}/feed2exec/tests/files/security.opml
-${PYSITELIB}/feed2exec/tests/files/simple.ini
-${PYSITELIB}/feed2exec/tests/files/simple.opml
-${PYSITELIB}/feed2exec/tests/files/udd.mbx
-${PYSITELIB}/feed2exec/tests/files/udd.xml
-${PYSITELIB}/feed2exec/tests/files/weird-dates.mbx
-${PYSITELIB}/feed2exec/tests/files/weird-dates.xml
-${PYSITELIB}/feed2exec/tests/pytest.ini
${PYSITELIB}/feed2exec/tests/test_feeds.py
${PYSITELIB}/feed2exec/tests/test_feeds.pyc
${PYSITELIB}/feed2exec/tests/test_feeds.pyo
--- pkgsrc/mail/feed2exec/distinfo 2022/02/04 00:04:09 1.8
+++ pkgsrc/mail/feed2exec/distinfo 2023/02/23 15:59:24 1.9
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.8 2022/02/04 00:04:09 wiz Exp $
+$NetBSD: distinfo,v 1.9 2023/02/23 15:59:24 schmonz Exp $
-BLAKE2s (feed2exec-0.18.0/feed2exec-0.18.0.tar.gz) = d5230be55f16fe0f04c98cb4465eb04ace47df125a8c8c9cc3de7ff2effaa806
+BLAKE2s (feed2exec-0.19.0.tar.gz) = 35eb61feb2cbe98a140168ba2889afd146537c3a6d9cc3d4c4d63c36c6abf8f3
-SHA512 (feed2exec-0.18.0/feed2exec-0.18.0.tar.gz) = cc3bc9f69c9347478d1aff40abebe500bdcde0b1e15df1dc389d84ff0806611128f99ca1ba40a063861f5fe5047a71455f6d3480c666afd4af042fcc52515793
+SHA512 (feed2exec-0.19.0.tar.gz) = 0b76b220d952356c66128032ab6b2bcfe86de5fcad40e9bb30663f9bea4af324c05b5384aa2172c7caf51f55c9576a89974c2640b95bb9de8ec762238541b1ba
-Size (feed2exec-0.18.0/feed2exec-0.18.0.tar.gz) = 704031 bytes
+Size (feed2exec-0.19.0.tar.gz) = 688870 bytes
+SHA1 (patch-feed2exec_____init____.py) = a55c2f1cb1feefc02fd8f7ce233f386e743f7823
+SHA1 (patch-pyproject.toml) = ccd1f75d51435ffb14156f251145d61a4167c580
+SHA1 (patch-setup.cfg) = 2f7edeb3df9a40a5b3430b3be5c5a8de46447338
+SHA1 (patch-setup.py) = 04a09a3af3e7c3342a82e87c99d641d5d326bbfa
$NetBSD: patch-feed2exec_____init____.py,v 1.4 2023/02/23 15:59:24 schmonz Exp $
Tarball lacks .git, so pass down version from our Makefile.
--- feed2exec/__init__.py.orig 2023-02-13 20:28:58.000000000 +0000
+++ feed2exec/__init__.py
@@ -5,11 +5,7 @@ from __future__ import print_function, a
try:
from ._version import version
except ImportError: # pragma: nocover
- try:
- from setuptools_scm import get_version
- version = get_version()
- except (ImportError, LookupError):
- version = '???'
+ version = '@VERSION@'
__description__ = 'The programmable feed reader'
__version__ = version
$NetBSD: patch-setup.py,v 1.4 2023/02/23 15:59:24 schmonz Exp $
Tarball lacks .git, so pass down version from our Makefile.
--- setup.py.orig 2023-02-13 20:28:58.000000000 +0000
+++ setup.py
@@ -19,4 +19,4 @@
from setuptools import setup
if __name__ == '__main__':
- setup()
+ setup(version='@VERSION@')
$NetBSD: patch-pyproject.toml,v 1.3 2023/02/23 15:59:24 schmonz Exp $
Tarball lacks .git, so pass down version from our Makefile.
--- pyproject.toml.orig 2023-02-13 20:28:58.000000000 +0000
+++ pyproject.toml
@@ -8,7 +8,6 @@ module = [
"lxml",
"pytest",
"requests_file",
- "setuptools_scm",
"unidecode",
"xdg",
"xdg.BaseDirectory",
@@ -16,7 +15,4 @@ module = [
ignore_missing_imports = true
[build-system]
-requires = ["setuptools>=45", "wheel", "setuptools_scm>=6.2"]
-
-[tool.setuptools_scm]
-write_to = "feed2exec/_version.py"
+requires = ["setuptools>=45", "wheel"]
$NetBSD: patch-setup.cfg,v 1.3 2023/02/23 15:59:24 schmonz Exp $
Tarball lacks .git, so pass down version from our Makefile.
--- setup.cfg.orig 2023-02-13 20:28:58.000000000 +0000
+++ setup.cfg
@@ -52,7 +52,6 @@ install_requires =
pyxdg
requests
requests-file
- setuptools_scm
unidecode
[options.package_data]