* [gentoo-commits] repo/gentoo:master commit in: dev-python/vdirsyncer/, dev-python/vdirsyncer/files/
@ 2021-07-10 21:30 John Helmert III
0 siblings, 0 replies; 3+ messages in thread
From: John Helmert III @ 2021-07-10 21:30 UTC (permalink / raw
To: gentoo-commits
commit: d9f335c58209e7d4f80b3ba028586511372eca88
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 10 20:53:05 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 21:30:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f335c5
dev-python/vdirsyncer: Python bump, fix tests, install systemd files
Also close old test bugs related to hypothesis which don't seem
reproducible with any modern hypothesis versions in tree.
Closes: https://bugs.gentoo.org/641546
Closes: https://bugs.gentoo.org/668360
Closes: https://bugs.gentoo.org/743953
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
.../files/vdirsyncer-0.18.0-no-cov.patch | 25 +++++++++
dev-python/vdirsyncer/vdirsyncer-0.18.0-r1.ebuild | 63 ++++++++++++++++++++++
2 files changed, 88 insertions(+)
diff --git a/dev-python/vdirsyncer/files/vdirsyncer-0.18.0-no-cov.patch b/dev-python/vdirsyncer/files/vdirsyncer-0.18.0-no-cov.patch
new file mode 100644
index 00000000000..d7e1d537ce4
--- /dev/null
+++ b/dev-python/vdirsyncer/files/vdirsyncer-0.18.0-no-cov.patch
@@ -0,0 +1,25 @@
+Avoid pytest-cov involvement:
+
+https://dev.gentoo.org/~mgorny/python-guide/pytest.html#avoiding-dependencies-on-other-pytest-plugins
+
+Signed-Off-By: John Helmert III <ajak@gentoo.org>
+
+diff --git a/setup.cfg b/setup.cfg
+index 2428e44..117f237 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,14 +1,6 @@
+ [wheel]
+ universal = 1
+
+-[tool:pytest]
+-addopts =
+- --tb=short
+- --cov-config .coveragerc
+- --cov=vdirsyncer
+- --cov-report=term-missing
+- --no-cov-on-fail
+-
+ [flake8]
+ application-import-names = tests,vdirsyncer
+ extend-ignore =
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r1.ebuild
new file mode 100644
index 00000000000..21d72fd5f54
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Synchronize calendars and contacts"
+HOMEPAGE="https://github.com/pimutils/vdirsyncer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+ >=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
+ <dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+ dev-python/atomicwrites[${PYTHON_USEDEP}]"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/pytest-localserver[${PYTHON_USEDEP}]
+ dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.18.0-no-cov.patch"
+)
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
+
+distutils_enable_tests pytest
+
+python_test() {
+ # skip tests needing servers running
+ local -x DAV_SERVER=skip
+ local -x REMOTESTORAGE_SERVER=skip
+ # pytest dies hard if the envvars do not have any value...
+ local -x CI=false
+ local -x DETERMINISTIC_TESTS=false
+
+ local deselect=(
+ # test CA is too weak for modern python
+ tests/system/utils/test_main.py::test_request_ssl
+ tests/system/utils/test_main.py::test_request_ssl_fingerprints
+ )
+
+ epytest ${deselect[@]/#/--deselect }
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ systemd_dounit contrib/vdirsyncer.{service,timer}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/vdirsyncer/, dev-python/vdirsyncer/files/
@ 2021-10-17 9:41 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-10-17 9:41 UTC (permalink / raw
To: gentoo-commits
commit: 4d27eacd7c41e246b72dbd1d425f0e4f7aee816a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 09:40:04 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 09:40:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d27eacd
dev-python/vdirsyncer: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/vdirsyncer/Manifest | 1 -
.../files/vdirsyncer-0.16.8-click-7-compat.patch | 35 -------------
dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild | 58 ----------------------
dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild | 53 --------------------
4 files changed, 147 deletions(-)
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 29341dd12fe..c4b5782242f 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,2 +1 @@
-DIST vdirsyncer-0.16.8.tar.gz 115819 BLAKE2B e0140718a1b41875421a7094e02cdeb865c500935e0c97bc18a614551586d79682641726df1a96e17a158604ed309f713f4caf4a484025eca5fbc6acbbe18f97 SHA512 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada
DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
diff --git a/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch b/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch
deleted file mode 100644
index c0ee62f959f..00000000000
--- a/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 3eb9ce5ae4320d52e6c876874511ff96a8a45f51
-Author: Hugo Osvaldo Barrera <hugo@barrera.io>
-Date: Tue Jun 9 14:45:02 2020 +0200
-
- Add compatibility with latest click
-
-diff --git a/setup.py b/setup.py
-index 59549f16842a..d584b95dd297 100644
---- a/setup.py
-+++ b/setup.py
-@@ -11,7 +11,7 @@ from setuptools import setup
-
- requirements = [
- # https://github.com/mitsuhiko/click/issues/200
-- 'click>=5.0,<6.0',
-+ 'click>=5.0',
- 'click-log>=0.3.0, <0.4.0',
-
- # https://github.com/pimutils/vdirsyncer/issues/478
-diff --git a/tests/system/cli/test_sync.py b/tests/system/cli/test_sync.py
-index f242376417f3..43d35dd8541e 100644
---- a/tests/system/cli/test_sync.py
-+++ b/tests/system/cli/test_sync.py
-@@ -123,7 +123,10 @@ def test_verbosity(tmpdir, runner):
- runner.write_with_general('')
- result = runner.invoke(['--verbosity=HAHA', 'sync'])
- assert result.exception
-- assert 'invalid value for "--verbosity"' in result.output.lower()
-+ assert (
-+ 'invalid value for "--verbosity"' in result.output.lower()
-+ or "invalid value for '--verbosity'" in result.output.lower()
-+ )
-
-
- def test_collections_cache_invalidation(tmpdir, runner):
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild
deleted file mode 100644
index 8888f31e1aa..00000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${PN}-0.16.8-click-7-compat.patch" )
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
- >=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
- <dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
- dev-python/click-threading[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/requests-toolbelt[${PYTHON_USEDEP}]
- dev-python/atomicwrites[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pytest-localserver[${PYTHON_USEDEP}]
- dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
- )"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-distutils_enable_tests pytest
-
-src_prepare() {
- default
-
- # Replace getiterator with iter for python3.9.
- # See https://github.com/pimutils/vdirsyncer/issues/880.
- sed -i "s/rv.extend(item.getiterator())/rv.extend(iter(item))/" \
- vdirsyncer/storage/dav.py || die
-}
-
-python_test() {
- # skip tests needing servers running
- local -x DAV_SERVER=skip
- local -x REMOTESTORAGE_SERVER=skip
- # pytest dies hard if the envvars do not have any value...
- local -x CI=false
- local -x DETERMINISTIC_TESTS=false
- pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
deleted file mode 100644
index d902fe2f289..00000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-SLOT="0"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
- >=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
- <dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/requests-toolbelt[${PYTHON_USEDEP}]
- dev-python/atomicwrites[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pytest-localserver[${PYTHON_USEDEP}]
- dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
- )"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-distutils_enable_tests pytest
-
-python_test() {
- # skip tests needing servers running
- local -x DAV_SERVER=skip
- local -x REMOTESTORAGE_SERVER=skip
- # pytest dies hard if the envvars do not have any value...
- local -x CI=false
- local -x DETERMINISTIC_TESTS=false
-
- local deselect=(
- # test CA is too weak for modern python
- tests/system/utils/test_main.py::test_request_ssl
- tests/system/utils/test_main.py::test_request_ssl_fingerprints
- )
-
- epytest ${deselect[@]/#/--deselect }
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/vdirsyncer/, dev-python/vdirsyncer/files/
@ 2023-11-23 16:08 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2023-11-23 16:08 UTC (permalink / raw
To: gentoo-commits
commit: dd62d2db25128ec59ae03bedd6ef1e40df0ab537
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 23 16:07:25 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 23 16:08:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd62d2db
dev-python/vdirsyncer: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/vdirsyncer/Manifest | 1 -
.../files/vdirsyncer-0.18.0-no-cov.patch | 25 --------
dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild | 74 ----------------------
3 files changed, 100 deletions(-)
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index c94006d00ca3..fdd656fe9063 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,2 +1 @@
-DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
DIST vdirsyncer-0.19.2.tar.gz 123389 BLAKE2B 35cf5e52f669307c7bc545404135bfb5ded3ca6a1b151735ddacd73835054a2e0ab518201ad206929ca845c2a2828c025a918bba54b739db3fa0a8e4e9f5de33 SHA512 056c58011d0a054a8cc215e9eabc706dfffb7d38deab5ae47311565b3bdb6de7a4772e97a0a50cdce33c82b09d559f1ec9cf9c84746553badf1d25791c7e08ce
diff --git a/dev-python/vdirsyncer/files/vdirsyncer-0.18.0-no-cov.patch b/dev-python/vdirsyncer/files/vdirsyncer-0.18.0-no-cov.patch
deleted file mode 100644
index d7e1d537ce49..000000000000
--- a/dev-python/vdirsyncer/files/vdirsyncer-0.18.0-no-cov.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Avoid pytest-cov involvement:
-
-https://dev.gentoo.org/~mgorny/python-guide/pytest.html#avoiding-dependencies-on-other-pytest-plugins
-
-Signed-Off-By: John Helmert III <ajak@gentoo.org>
-
-diff --git a/setup.cfg b/setup.cfg
-index 2428e44..117f237 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,14 +1,6 @@
- [wheel]
- universal = 1
-
--[tool:pytest]
--addopts =
-- --tb=short
-- --cov-config .coveragerc
-- --cov=vdirsyncer
-- --cov-report=term-missing
-- --no-cov-on-fail
--
- [flake8]
- application-import-names = tests,vdirsyncer
- extend-ignore =
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
deleted file mode 100644
index fb656166c00a..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 pypi systemd
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="
- https://github.com/pimutils/vdirsyncer/
- https://pypi.org/project/vdirsyncer/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
- dev-python/click[${PYTHON_USEDEP}]
- >=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/requests-toolbelt[${PYTHON_USEDEP}]
- dev-python/atomicwrites[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools-scm[${PYTHON_USEDEP}]
- test? (
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pytest-localserver[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.18.0-no-cov.patch"
-)
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin click-log
- # https://github.com/pimutils/vdirsyncer/commit/ea640001d0ad6e56369102e02b949c865c48726f
- sed -i -e '/click-log/s:, <0.4.0::' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # skip tests needing servers running
- local -x DAV_SERVER=skip
- local -x REMOTESTORAGE_SERVER=skip
- # pytest dies hard if the envvars do not have any value...
- local -x CI=false
- local -x DETERMINISTIC_TESTS=false
-
- local EPYTEST_DESELECT=(
- # test CA is too weak for modern python
- tests/system/utils/test_main.py::test_request_ssl
- tests/system/utils/test_main.py::test_request_ssl_fingerprints
- )
-
- epytest
-}
-
-src_install() {
- distutils-r1_src_install
-
- systemd_douserunit contrib/vdirsyncer.{service,timer}
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-23 16:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-17 9:41 [gentoo-commits] repo/gentoo:master commit in: dev-python/vdirsyncer/, dev-python/vdirsyncer/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-11-23 16:08 Michał Górny
2021-07-10 21:30 John Helmert III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox