* [gentoo-commits] repo/gentoo:master commit in: www-misc/urlwatch/files/, www-misc/urlwatch/
@ 2016-07-07 7:47 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2016-07-07 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 6329f9f3f20d3a8178404b7bf05397d34036ab30
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Tue Jul 5 18:24:00 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jul 7 07:19:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6329f9f3
www-misc/urlwatch: bump to 2.2, use HTTPS URLs
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/1830
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
www-misc/urlwatch/Manifest | 1 +
.../urlwatch/files/urlwatch-2.2-fix-install.patch | 42 ++++++++++++++++++++
www-misc/urlwatch/metadata.xml | 2 +
www-misc/urlwatch/urlwatch-2.2.ebuild | 46 ++++++++++++++++++++++
4 files changed, 91 insertions(+)
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 332f126..19afc97 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,3 +1,4 @@
DIST urlwatch-1.18.tar.gz 14987 SHA256 6b17411b6658f3aeb5839d1b32458f020ce40ee1e62a3d40387a2622fa731824 SHA512 ffbfb41e5b6ca71abf19132424dc1bfb3d0cfc30a644615c34539bb5b00acea5803d4c30637c58e9682820c5411227f7c579344c1e212f575431a1c650a7e520 WHIRLPOOL 49915ef83cc835b8ac67216eaeb61391195f28fa28b5716c7e1cc8c8dac465d9f3670beb408c80dc3fa5315683467524b02b1663fb671f26338059acfa247b23
DIST urlwatch-2.0.tar.gz 22988 SHA256 6be8034671788b8c3633d12e16ae69685f0c4341d2c46bed0e847749f8c76848 SHA512 00855557daccf2c418382082392173f03d694be0b6e643ad06fb2a6e0329d17fac37232867686d8e0a6cb79f037e4127a5ea78739bfcd8acfd1cffccf2d78b75 WHIRLPOOL e0f7fce989391aad6f85dc075e91987bfa1e7fcff06d252625716b692a5052f0dac31553e1676522ef7c0df1488f3059c31ba47922a6cf755d47518fe5e90179
DIST urlwatch-2.1.tar.gz 25134 SHA256 6627b753f9c7a908863899b1b4eb9283ef8a630bf78490c6e492275a5919c476 SHA512 60960b41b592d45a29f967d212580b2687afc5d5053adef7c796044e404a4a1e120ea66d8cd0cbf869cccead76373db0d0ab6d6541a77cc4f8885c02b098f6d2 WHIRLPOOL 6a9344d9cbfd0afdc79c0d9af364fba493a9c65f6f4fdf322baf3e5a635e231986789d11428e15c40d89030ff587fc9f9f90833f65109af59bd81cc0f70be193
+DIST urlwatch-2.2.tar.gz 24435 SHA256 a3257ab795adb91514c7163610c7a916ccce9df9ab2cfdef2b72c250ab292069 SHA512 680547d01da6830059048247be4467c68ce9977786f3ba1ec0ad470eb77608b6938c244ed9341ddfd382d65cae167338c685bff2eac91a5f15e881c2aca7bb9b WHIRLPOOL 46d0dce6dc904e15561986e724882592a174c0c2480daf4eac81a4616b7b73d32033b06e70fafad3b399e557365b084e6f7518fa070420ecd22e4340b7b45f96
diff --git a/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch b/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch
new file mode 100644
index 0000000..66626db
--- /dev/null
+++ b/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch
@@ -0,0 +1,42 @@
+From ebe7b90100a3d960f53fdc9409d2d89eaa61bf11 Mon Sep 17 00:00:00 2001
+From: Thomas Perl <m@thp.io>
+Date: Tue, 28 Jun 2016 18:15:51 +0200
+Subject: [PATCH] Check current directory and use os.path.relpath (Fixes #73)
+
+---
+ setup.py | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 947a7c8..45405cd 100644
+--- a/setup.py
++++ b/setup.py
+@@ -7,10 +7,15 @@
+
+ import os
+ import re
++import sys
+
+ PACKAGE_NAME = 'urlwatch'
+ DEPENDENCIES = ['minidb', 'PyYAML', 'requests']
+-HERE = os.path.dirname(__file__)
++HERE = os.path.abspath(os.path.dirname(__file__))
++
++if os.path.normpath(os.getcwd()) != os.path.normpath(HERE):
++ print('You must run {} inside {} (cwd={})'.format(os.path.basename(__file__), HERE, os.getcwd()))
++ sys.exit(1)
+
+ # Assumptions:
+ # 1. Package name equals main script file name (and only one script)
+@@ -29,9 +34,9 @@
+
+ m['scripts'] = [os.path.join(HERE, PACKAGE_NAME)]
+ m['package_dir'] = {'': os.path.join(HERE, 'lib')}
+-m['packages'] = ['.'.join(dirname[len(HERE)+1:].split(os.sep)[1:])
++m['packages'] = ['.'.join(os.path.relpath(dirname, HERE).split(os.sep)[1:])
+ for dirname, _, files in os.walk(os.path.join(HERE, 'lib')) if '__init__.py' in files]
+-m['data_files'] = [(dirname[len(HERE)+1:], [os.path.join(dirname[len(HERE)+1:], fn) for fn in files])
++m['data_files'] = [(os.path.relpath(dirname, HERE), [os.path.join(os.path.relpath(dirname, HERE), fn) for fn in files])
+ for dirname, _, files in os.walk(os.path.join(HERE, 'share')) if files]
+ m['install_requires'] = DEPENDENCIES
+
diff --git a/www-misc/urlwatch/metadata.xml b/www-misc/urlwatch/metadata.xml
index 7be7880..66d7093 100644
--- a/www-misc/urlwatch/metadata.xml
+++ b/www-misc/urlwatch/metadata.xml
@@ -7,5 +7,7 @@
</maintainer>
<upstream>
<remote-id type="pypi">urlwatch</remote-id>
+ <remote-id type="github">thp/urlwatch</remote-id>
+ <bugs-to>https://github.com/thp/urlwatch/issues</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/www-misc/urlwatch/urlwatch-2.2.ebuild b/www-misc/urlwatch/urlwatch-2.2.ebuild
new file mode 100644
index 0000000..a9d7a73
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-2.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="https://thp.io/2008/urlwatch/ https://pypi.python.org/pypi/urlwatch"
+SRC_URI="https://thp.io/2008/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/minidb[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ || ( www-client/lynx app-text/html2text )
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-install.patch" )
+
+python_test() {
+ nosetests test || die "tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]] && \
+ ! has_version dev-python/chump; then
+ elog "Install 'dev-python/chump' to enable Pushover" \
+ "notifications support"
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/urlwatch/files/, www-misc/urlwatch/
@ 2016-09-03 22:00 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2016-09-03 22:00 UTC (permalink / raw
To: gentoo-commits
commit: d647d8a196e878cac8b409c9b95d659abee344f2
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 22:00:03 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 22:00:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d647d8a1
www-misc/urlwatch: Clean up old.
Package-Manager: portage-2.2.28
www-misc/urlwatch/Manifest | 2 -
.../urlwatch/files/urlwatch-2.2-fix-install.patch | 42 --------------------
www-misc/urlwatch/urlwatch-1.18.ebuild | 28 -------------
www-misc/urlwatch/urlwatch-2.2.ebuild | 46 ----------------------
4 files changed, 118 deletions(-)
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index f82a79b..4b2b452 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,3 +1 @@
-DIST urlwatch-1.18.tar.gz 14987 SHA256 6b17411b6658f3aeb5839d1b32458f020ce40ee1e62a3d40387a2622fa731824 SHA512 ffbfb41e5b6ca71abf19132424dc1bfb3d0cfc30a644615c34539bb5b00acea5803d4c30637c58e9682820c5411227f7c579344c1e212f575431a1c650a7e520 WHIRLPOOL 49915ef83cc835b8ac67216eaeb61391195f28fa28b5716c7e1cc8c8dac465d9f3670beb408c80dc3fa5315683467524b02b1663fb671f26338059acfa247b23
-DIST urlwatch-2.2.tar.gz 24435 SHA256 a3257ab795adb91514c7163610c7a916ccce9df9ab2cfdef2b72c250ab292069 SHA512 680547d01da6830059048247be4467c68ce9977786f3ba1ec0ad470eb77608b6938c244ed9341ddfd382d65cae167338c685bff2eac91a5f15e881c2aca7bb9b WHIRLPOOL 46d0dce6dc904e15561986e724882592a174c0c2480daf4eac81a4616b7b73d32033b06e70fafad3b399e557365b084e6f7518fa070420ecd22e4340b7b45f96
DIST urlwatch-2.5.tar.gz 25322 SHA256 6010a45dbc20d5449f214655c94977a65e1e2b8ba32f58e9045ddfdaaabf3962 SHA512 993d2596288d014a3b84ae22c29ce89282c4320dd95b339c9892db07997059fc80a96198cb89ba04d935f68d2d051da96dc981f8e8b3657492443b060d2126a1 WHIRLPOOL d8be345d19027e475825d708f9ce2c55fe4abb23e903d629aec872104a0e890f225dfe3f1c8de87541e9cbed7c62592d362e464f3014f0a7ce27000fd9a5f880
diff --git a/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch b/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch
deleted file mode 100644
index 66626db..00000000
--- a/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ebe7b90100a3d960f53fdc9409d2d89eaa61bf11 Mon Sep 17 00:00:00 2001
-From: Thomas Perl <m@thp.io>
-Date: Tue, 28 Jun 2016 18:15:51 +0200
-Subject: [PATCH] Check current directory and use os.path.relpath (Fixes #73)
-
----
- setup.py | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 947a7c8..45405cd 100644
---- a/setup.py
-+++ b/setup.py
-@@ -7,10 +7,15 @@
-
- import os
- import re
-+import sys
-
- PACKAGE_NAME = 'urlwatch'
- DEPENDENCIES = ['minidb', 'PyYAML', 'requests']
--HERE = os.path.dirname(__file__)
-+HERE = os.path.abspath(os.path.dirname(__file__))
-+
-+if os.path.normpath(os.getcwd()) != os.path.normpath(HERE):
-+ print('You must run {} inside {} (cwd={})'.format(os.path.basename(__file__), HERE, os.getcwd()))
-+ sys.exit(1)
-
- # Assumptions:
- # 1. Package name equals main script file name (and only one script)
-@@ -29,9 +34,9 @@
-
- m['scripts'] = [os.path.join(HERE, PACKAGE_NAME)]
- m['package_dir'] = {'': os.path.join(HERE, 'lib')}
--m['packages'] = ['.'.join(dirname[len(HERE)+1:].split(os.sep)[1:])
-+m['packages'] = ['.'.join(os.path.relpath(dirname, HERE).split(os.sep)[1:])
- for dirname, _, files in os.walk(os.path.join(HERE, 'lib')) if '__init__.py' in files]
--m['data_files'] = [(dirname[len(HERE)+1:], [os.path.join(dirname[len(HERE)+1:], fn) for fn in files])
-+m['data_files'] = [(os.path.relpath(dirname, HERE), [os.path.join(os.path.relpath(dirname, HERE), fn) for fn in files])
- for dirname, _, files in os.walk(os.path.join(HERE, 'share')) if files]
- m['install_requires'] = DEPENDENCIES
-
diff --git a/www-misc/urlwatch/urlwatch-1.18.ebuild b/www-misc/urlwatch/urlwatch-1.18.ebuild
deleted file mode 100644
index 938f929..00000000
--- a/www-misc/urlwatch/urlwatch-1.18.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="http://thp.io/2008/urlwatch/ https://pypi.python.org/pypi/urlwatch"
-SRC_URI="http://thp.io/2008/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- || ( www-client/lynx app-text/html2text )"
-
-python_prepare() {
- if [[ ${EPYTHON} == python3.* ]]; then
- 2to3 -nw --no-diffs urlwatch lib/urlwatch/*.py \
- share/urlwatch/examples/hooks.py.example setup.py || die
- fi
-}
diff --git a/www-misc/urlwatch/urlwatch-2.2.ebuild b/www-misc/urlwatch/urlwatch-2.2.ebuild
deleted file mode 100644
index a9d7a73..00000000
--- a/www-misc/urlwatch/urlwatch-2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="https://thp.io/2008/urlwatch/ https://pypi.python.org/pypi/urlwatch"
-SRC_URI="https://thp.io/2008/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
- dev-python/keyring[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/minidb[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- || ( www-client/lynx app-text/html2text )
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-install.patch" )
-
-python_test() {
- nosetests test || die "tests failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]] && \
- ! has_version dev-python/chump; then
- elog "Install 'dev-python/chump' to enable Pushover" \
- "notifications support"
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/urlwatch/files/, www-misc/urlwatch/
@ 2019-04-14 13:25 Louis Sautier
0 siblings, 0 replies; 5+ messages in thread
From: Louis Sautier @ 2019-04-14 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 88135a353597de9aa041b5e85107f821adab133a
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 12:35:18 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 13:23:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88135a35
www-misc/urlwatch: bump to 2.17
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
www-misc/urlwatch/Manifest | 1 +
.../files/urlwatch-2.17-fix-yaml.load.patch | 18 +++++++
www-misc/urlwatch/urlwatch-2.17.ebuild | 62 ++++++++++++++++++++++
3 files changed, 81 insertions(+)
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 4dce477bcd7..c28fb92900d 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,3 +1,4 @@
DIST urlwatch-2.13.tar.gz 34312 BLAKE2B 6ac618d4f1f78b0a3f6d17dd2283704e8d1fc7173ce6d79fcf0f9177f48463a610a4c20d8483a4a9c22e56eca67730ef25982981f310ca8e9927e48e298a1b1d SHA512 5ca6ad3de54c2e1d63cb545ae0d213a4483ef175dad947be00994bc990d047c7aec1f3b0a8b23290672db940001a9cc31c919aa7d9c280ab4792299e2dba684c
DIST urlwatch-2.15.tar.gz 36839 BLAKE2B a474d93adb4ef95ad5c44b7cee4a077dd744caf09c84ec64b2e9f04635505a8ffd422f4ba56cb2069571b5b4b1e1f7df4b7412a716b5738388a0c55ea831e050 SHA512 3390a693656a89e75836f713249261650c03e1dc1d1819d82872d35eead7f29844502073d8674e92e97a32e44180347928e5dfada814798984d11e1ff4f0ac40
DIST urlwatch-2.16.tar.gz 42713 BLAKE2B bee95c808b8705135112646ed7bf42c6606d716f447394e69fbc3355d38597e44b3e94ac91c6c2304fadcc5eb7d35349e6d54601721319c39268583fa8c7c042 SHA512 ffa9245bc4b8631e3105b1afd4ed3c3f5585bc30cd56c7531f9c2d0e4d61e36b56db3a69d62f851bed5fba9c9c332034b1757d70b32f4a4b0607ae59ed6cf887
+DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
diff --git a/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch b/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch
new file mode 100644
index 00000000000..c8bd04ae932
--- /dev/null
+++ b/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch
@@ -0,0 +1,18 @@
+commit d00041bacd6343cadf29c3d0a98817a7b9fda2a1
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date: Sun Apr 14 14:49:24 2019 +0200
+
+ Fix YAMLLoadWarning in tests
+
+diff --git a/test/test_filters.py b/test/test_filters.py
+index 3402616..da2393b 100644
+--- a/test/test_filters.py
++++ b/test/test_filters.py
+@@ -33,6 +33,6 @@ def test_filters():
+ eq_(result, expected_result)
+
+ with open(os.path.join(os.path.dirname(__file__), 'data/filter_tests.yaml'), 'r', encoding='utf8') as fp:
+- filter_tests = yaml.load(fp)
++ filter_tests = yaml.load(fp, Loader=yaml.SafeLoader)
+ for test_name in filter_tests:
+ yield check_filter, test_name
diff --git a/www-misc/urlwatch/urlwatch-2.17.ebuild b/www-misc/urlwatch/urlwatch-2.17.ebuild
new file mode 100644
index 00000000000..240d4e646a3
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-2.17.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="https://thp.io/2008/urlwatch/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ dev-python/cssselect[${PYTHON_USEDEP}]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/minidb[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pycodestyle[${PYTHON_USEDEP}]
+ )
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+# https://github.com/thp/urlwatch/pull/382
+PATCHES=( "${FILESDIR}/${P}-fix-yaml.load.patch" )
+
+python_test() {
+ nosetests -v test || die "tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ if ! has_version dev-python/chump; then
+ elog "Install 'dev-python/chump' to enable Pushover" \
+ "notifications support"
+ fi
+ if ! has_version dev-python/pushbullet-py; then
+ elog "Install 'dev-python/pushbullet-py' to enable" \
+ "Pushbullet notifications support"
+ fi
+ elog "HTML parsing can be improved by installing one of the following packages"
+ elog "and changing the html2text subfilter parameter:"
+ elog "dev-python/beautifulsoup:4"
+ elog "app-text/html2text"
+ elog "dev-python/html2text"
+ elog "www-client/lynx"
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/urlwatch/files/, www-misc/urlwatch/
@ 2020-05-10 10:26 Louis Sautier
0 siblings, 0 replies; 5+ messages in thread
From: Louis Sautier @ 2020-05-10 10:26 UTC (permalink / raw
To: gentoo-commits
commit: c56dd0fb8e2dc30458b13e1366a9c1402d9c945a
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 10:22:24 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun May 10 10:26:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56dd0fb
www-misc/urlwatch: fix failure when pycodestyle is not installed
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
.../files/urlwatch-2.18-pycodestyle-requirement.patch | 15 +++++++++++++++
.../{urlwatch-2.18.ebuild => urlwatch-2.18-r1.ebuild} | 4 ++++
2 files changed, 19 insertions(+)
diff --git a/www-misc/urlwatch/files/urlwatch-2.18-pycodestyle-requirement.patch b/www-misc/urlwatch/files/urlwatch-2.18-pycodestyle-requirement.patch
new file mode 100644
index 00000000000..587a55ab03c
--- /dev/null
+++ b/www-misc/urlwatch/files/urlwatch-2.18-pycodestyle-requirement.patch
@@ -0,0 +1,15 @@
+diff --git a/setup.py b/setup.py
+index 5f85aaf..7466787 100644
+--- a/setup.py
++++ b/setup.py
+@@ -17,9 +17,7 @@ if sys.version_info < (3, 3):
+ m['name'] = 'urlwatch'
+ m['author'], m['author_email'] = re.match(r'(.*) <(.*)>', m['author']).groups()
+ m['description'], m['long_description'] = docs[0].strip().split('\n\n', 1)
+-m['install_requires'] = ['minidb', 'PyYAML', 'requests', 'keyring', 'pycodestyle', 'appdirs', 'lxml', 'cssselect']
+-if sys.version_info < (3, 4):
+- m['install_requires'].extend(['enum34'])
++m['install_requires'] = ['minidb', 'PyYAML', 'requests', 'keyring', 'appdirs', 'lxml', 'cssselect']
+ if sys.platform == 'win32':
+ m['install_requires'].extend(['colorama'])
+ m['entry_points'] = {"console_scripts": ["urlwatch=urlwatch.cli:main"]}
diff --git a/www-misc/urlwatch/urlwatch-2.18.ebuild b/www-misc/urlwatch/urlwatch-2.18-r1.ebuild
similarity index 90%
rename from www-misc/urlwatch/urlwatch-2.18.ebuild
rename to www-misc/urlwatch/urlwatch-2.18-r1.ebuild
index 4c0c01c582b..d8fcfd698a2 100644
--- a/www-misc/urlwatch/urlwatch-2.18.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.18-r1.ebuild
@@ -36,6 +36,10 @@ BDEPEND="
)
"
+# This will be in the next release
+# https://github.com/thp/urlwatch/commit/44e862282d39a6e23f67c3c0240a93cccbb41a55
+PATCHES=( "${FILESDIR}/${P}-pycodestyle-requirement.patch" )
+
DOCS=( CHANGELOG.md README.md )
distutils_enable_tests nose
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-misc/urlwatch/files/, www-misc/urlwatch/
@ 2024-03-11 21:29 Louis Sautier
0 siblings, 0 replies; 5+ messages in thread
From: Louis Sautier @ 2024-03-11 21:29 UTC (permalink / raw
To: gentoo-commits
commit: a52e465a71b97dd14b803d5e2ac86735aca84d99
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 21:23:03 2024 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 21:26:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52e465a
www-misc/urlwatch: fix CSS selectors with dev-python/lxml >= 5.0.0
Closes: https://bugs.gentoo.org/926767
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
www-misc/urlwatch/files/urlwatch-2.28-lxml-5.patch | 28 ++++++++
www-misc/urlwatch/urlwatch-2.28-r1.ebuild | 76 ++++++++++++++++++++++
2 files changed, 104 insertions(+)
diff --git a/www-misc/urlwatch/files/urlwatch-2.28-lxml-5.patch b/www-misc/urlwatch/files/urlwatch-2.28-lxml-5.patch
new file mode 100644
index 000000000000..d5f80410859f
--- /dev/null
+++ b/www-misc/urlwatch/files/urlwatch-2.28-lxml-5.patch
@@ -0,0 +1,28 @@
+https://github.com/thp/urlwatch/commit/123de66d019aef7fc18fab6d56cc2a54d81fea3f
+
+From: James Hewitt <james.hewitt@uk.ibm.com>
+Date: Wed, 17 Jan 2024 13:50:28 +0000
+Subject: [PATCH] Update CSS Selector to use new style
+
+New style of calling the CSSSelector directly instead of using the
+evaluate function. This has been supported since lxml 1.1 [1] and the
+evaluate method has been deprecated since lxml 2.1 [2].
+
+[1] https://github.com/lxml/lxml/blob/lxml-1.1/src/lxml/xpath.pxi#L66
+[2] https://github.com/lxml/lxml/blob/lxml-2.1/src/lxml/xpath.pxi#L143
+
+Signed-off-by: James Hewitt <james.hewitt@uk.ibm.com>
+--- a/lib/urlwatch/filters.py
++++ b/lib/urlwatch/filters.py
+@@ -761,9 +761,9 @@ def _get_filtered_elements(self):
+ excluded_elems = None
+ if self.filter_kind == 'css':
+ selected_elems = CSSSelector(self.expression,
+- namespaces=self.namespaces).evaluate(root)
++ namespaces=self.namespaces)(root)
+ excluded_elems = CSSSelector(self.exclude,
+- namespaces=self.namespaces).evaluate(root) if self.exclude else None
++ namespaces=self.namespaces)(root) if self.exclude else None
+ elif self.filter_kind == 'xpath':
+ selected_elems = root.xpath(self.expression, namespaces=self.namespaces)
+ excluded_elems = root.xpath(self.exclude, namespaces=self.namespaces) if self.exclude else None
diff --git a/www-misc/urlwatch/urlwatch-2.28-r1.ebuild b/www-misc/urlwatch/urlwatch-2.28-r1.ebuild
new file mode 100644
index 000000000000..ae6e35c21106
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-2.28-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="
+ https://thp.io/2008/urlwatch/
+ https://github.com/thp/urlwatch/
+ https://pypi.org/project/urlwatch/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ dev-python/cssselect[${PYTHON_USEDEP}]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ >=dev-python/minidb-2.0.6[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ app-text/tesseract[png]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jq[${PYTHON_USEDEP}]
+ dev-python/pytesseract[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-lxml-5.patch"
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_sphinx docs/source dev-python/alabaster
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+ # Require the pdftotext module
+ "lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test.pdf]"
+ "lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test-password.pdf]"
+ # Skip code quality check
+ "lib/urlwatch/tests/test_handler.py::test_pep8_conformance"
+)
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ if ! has_version dev-python/chump; then
+ elog "Install 'dev-python/chump' to enable Pushover" \
+ "notifications support"
+ fi
+ if ! has_version dev-python/jq; then
+ elog "Install 'dev-python/jq' to enable jq filtering support"
+ fi
+ if ! has_version dev-python/pytesseract; then
+ elog "Install 'dev-python/pytesseract' to enable OCR support"
+ fi
+ elog "HTML parsing can be improved by installing one of the following packages"
+ elog "and changing the html2text subfilter parameter:"
+ elog "dev-python/beautifulsoup4"
+ elog "app-text/html2text"
+ elog "dev-python/html2text"
+ elog "www-client/lynx"
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-11 21:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-14 13:25 [gentoo-commits] repo/gentoo:master commit in: www-misc/urlwatch/files/, www-misc/urlwatch/ Louis Sautier
-- strict thread matches above, loose matches on Subject: below --
2024-03-11 21:29 Louis Sautier
2020-05-10 10:26 Louis Sautier
2016-09-03 22:00 Patrice Clement
2016-07-07 7:47 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox