[arch-commits] Commit in python-cheroot/repos/community-any (8 files)
Thore Bödecker
foxxx0 at archlinux.org
Tue Mar 3 15:47:09 UTC 2020
Date: Tuesday, March 3, 2020 @ 15:47:08
Author: foxxx0
Revision: 589783
archrelease: copy trunk to community-any
Added:
python-cheroot/repos/community-any/LICENSE
(from rev 589782, python-cheroot/trunk/LICENSE)
python-cheroot/repos/community-any/PKGBUILD
(from rev 589782, python-cheroot/trunk/PKGBUILD)
python-cheroot/repos/community-any/disable-broken-testmon-stuff.patch
(from rev 589782, python-cheroot/trunk/disable-broken-testmon-stuff.patch)
python-cheroot/repos/community-any/disable-broken-tests.patch
(from rev 589782, python-cheroot/trunk/disable-broken-tests.patch)
Deleted:
python-cheroot/repos/community-any/LICENSE
python-cheroot/repos/community-any/PKGBUILD
python-cheroot/repos/community-any/disable-broken-testmon-stuff.patch
python-cheroot/repos/community-any/disable-broken-tests.patch
------------------------------------+
LICENSE | 14 +-
PKGBUILD | 176 ++++++++++++++++++-----------------
disable-broken-testmon-stuff.patch | 93 +++++++++---------
disable-broken-tests.patch | 20 +--
4 files changed, 156 insertions(+), 147 deletions(-)
Deleted: LICENSE
===================================================================
--- LICENSE 2020-03-03 15:46:58 UTC (rev 589782)
+++ LICENSE 2020-03-03 15:47:08 UTC (rev 589783)
@@ -1,7 +0,0 @@
-Copyright Jason R. Coombs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Copied: python-cheroot/repos/community-any/LICENSE (from rev 589782, python-cheroot/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2020-03-03 15:47:08 UTC (rev 589783)
@@ -0,0 +1,7 @@
+Copyright Jason R. Coombs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-03 15:46:58 UTC (rev 589782)
+++ PKGBUILD 2020-03-03 15:47:08 UTC (rev 589783)
@@ -1,85 +0,0 @@
-# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
-# Contributor: wangjiezhe <wangjiezhe AT yandex DOT com>
-
-pkgbase='python-cheroot'
-_pkgbase="${pkgbase//python-/}"
-pkgname=('python-cheroot' 'python2-cheroot')
-pkgdesc="Highly-optimized, pure-python HTTP server"
-pkgver=8.2.1
-pkgrel=4
-arch=('any')
-url="https://github.com/cherrypy/cheroot"
-license=('MIT')
-makedepends=('python-six' 'python2-six' 'python-setuptools-scm'
- 'python2-setuptools-scm' 'python2-backports.functools_lru_cache'
- 'python2-backports.unittest_mock' 'tree' 'python-tox' 'python2-tox'
- 'python-jaraco' 'git')
-source=("https://files.pythonhosted.org/packages/source/${_pkgbase:0:1}/${_pkgbase}/${_pkgbase}-${pkgver}.tar.gz"
- "LICENSE"
- "disable-broken-tests.patch"
- "disable-broken-testmon-stuff.patch")
-sha512sums=('3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862'
- '1106afed483b7258e4ae89c5d9459c3834412b31aac90169725ed62d2ab44f61f6f79e894d4c9e4d8bd99e14530ab778df2187784f0b25eaab86d312fad68944'
- 'ee08317c027a36461a89642e47edd5f9706796dbd6c273bbda3a37da5b1578701f861b09f23957636de5e72f38c312ad07caf0216408ec5d543feea7130839ba'
- 'c49ab4843ffbcdf6799620b281c21cf0e50df34842629c01d3b6faaaabf8a76c5fa956214fe4d277d8ff41f75d7498600f3dd617b9028bc2eba0ca4b1527c6ac')
-
-prepare() {
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- patch -p1 -N -i "${srcdir}/disable-broken-tests.patch"
- patch -p1 -N -i "${srcdir}/disable-broken-testmon-stuff.patch"
-
- # git-archive support is not needed since we use PyPI tarballs
- sed -i '/setuptools_scm_git_archive/d' setup.cfg
-
- cp -r "${srcdir}/${_pkgbase}-${pkgver}" "${srcdir}/${_pkgbase}-${pkgver}-py2"
-}
-
-build() {
- # setuptools wont find version from git tag
- export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver}"
-
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- python setup.py build
-
- cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
- python2 setup.py build
-}
-
-check() {
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- tox
-
- cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
- tox2
-}
-
-package_python-cheroot() {
- depends=('python-six' 'python-jaraco')
-
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- python setup.py install --root="$pkgdir/" --optimize=1
-
- # the author has promised to include a LICENSE file in future releases:
- # https://github.com/jaraco/skeleton/issues/1
- # for now the LICENSE file has been taken from:
- # https://github.com/jaraco/skeleton/blob/skeleton/LICENSE
- install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-cheroot() {
- depends=('python2-six' 'python2-backports.functools_lru_cache'
- 'python2-backports.unittest_mock')
-
- cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
- python2 setup.py install --root="$pkgdir/" --optimize=1
-
- # the author has promised to include a LICENSE file in future releases:
- # https://github.com/jaraco/skeleton/issues/1
- # for now the LICENSE file has been taken from:
- # https://github.com/jaraco/skeleton/blob/skeleton/LICENSE
- install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- mv "${pkgdir}/usr/bin/cheroot" "${pkgdir}/usr/bin/cheroot2"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: python-cheroot/repos/community-any/PKGBUILD (from rev 589782, python-cheroot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-03 15:47:08 UTC (rev 589783)
@@ -0,0 +1,91 @@
+# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
+# Contributor: wangjiezhe <wangjiezhe AT yandex DOT com>
+
+pkgbase='python-cheroot'
+_pkgbase="${pkgbase//python-/}"
+pkgname=('python-cheroot' 'python2-cheroot')
+pkgdesc="Highly-optimized, pure-python HTTP server"
+pkgver=8.3.0
+pkgrel=1
+arch=('any')
+url="https://github.com/cherrypy/cheroot"
+license=('MIT')
+makedepends=('python-six' 'python2-six' 'python-setuptools-scm'
+ 'python2-setuptools-scm' 'python2-backports.functools_lru_cache'
+ 'python2-backports.unittest_mock' 'tree' 'python-tox' 'python2-tox'
+ 'python-jaraco' 'git')
+checkdepends=('python-pytest' 'python-pytest-xdist' 'python-pytest-cov'
+ 'python-requests' 'python-pyopenssl' 'python-trustme'
+ 'python2-pytest' 'python2-pytest-xdist' 'python2-pytest-cov'
+ 'python2-requests' 'python2-pyopenssl')
+source=("https://files.pythonhosted.org/packages/source/${_pkgbase:0:1}/${_pkgbase}/${_pkgbase}-${pkgver}.tar.gz"
+ "LICENSE"
+ "disable-broken-tests.patch"
+ "disable-broken-testmon-stuff.patch")
+sha512sums=('29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14'
+ '1106afed483b7258e4ae89c5d9459c3834412b31aac90169725ed62d2ab44f61f6f79e894d4c9e4d8bd99e14530ab778df2187784f0b25eaab86d312fad68944'
+ 'ee08317c027a36461a89642e47edd5f9706796dbd6c273bbda3a37da5b1578701f861b09f23957636de5e72f38c312ad07caf0216408ec5d543feea7130839ba'
+ 'c1a845281ac66a2058104a37e8ad03c3be134562306309e22e6109fb1cc2d78f917230af7f67893e78f3335127c0c2ce13c5f7f37cb189bc884f47e244741d1b')
+
+prepare() {
+ cd "${srcdir}/${_pkgbase}-${pkgver}"
+ patch -p1 -N -i "${srcdir}/disable-broken-tests.patch"
+ patch -p1 -N -i "${srcdir}/disable-broken-testmon-stuff.patch"
+
+ # git-archive support is not needed since we use PyPI tarballs
+ sed -i '/setuptools_scm_git_archive/d' setup.cfg
+
+ cp -r "${srcdir}/${_pkgbase}-${pkgver}" "${srcdir}/${_pkgbase}-${pkgver}-py2"
+}
+
+build() {
+ # setuptools wont find version from git tag
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver}"
+
+ cd "${srcdir}/${_pkgbase}-${pkgver}"
+ python setup.py build
+
+ cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
+ python2 setup.py build
+}
+
+check() {
+ cd "${srcdir}/${_pkgbase}-${pkgver}"
+ # tox doesn't really provide any meaningful results for downstream packaging
+ # TODO: properly run the tests with distro packages
+
+ cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
+ # tox doesn't really provide any meaningful results for downstream packaging
+ # TODO: properly run the tests with distro packages
+}
+
+package_python-cheroot() {
+ depends=('python-six' 'python-jaraco')
+
+ cd "${srcdir}/${_pkgbase}-${pkgver}"
+ python setup.py install --root="$pkgdir/" --optimize=1
+
+ # the author has promised to include a LICENSE file in future releases:
+ # https://github.com/jaraco/skeleton/issues/1
+ # for now the LICENSE file has been taken from:
+ # https://github.com/jaraco/skeleton/blob/skeleton/LICENSE
+ install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python2-cheroot() {
+ depends=('python2-six' 'python2-backports.functools_lru_cache'
+ 'python2-backports.unittest_mock')
+
+ cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
+ python2 setup.py install --root="$pkgdir/" --optimize=1
+
+ # the author has promised to include a LICENSE file in future releases:
+ # https://github.com/jaraco/skeleton/issues/1
+ # for now the LICENSE file has been taken from:
+ # https://github.com/jaraco/skeleton/blob/skeleton/LICENSE
+ install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ mv "${pkgdir}/usr/bin/cheroot" "${pkgdir}/usr/bin/cheroot2"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: disable-broken-testmon-stuff.patch
===================================================================
--- disable-broken-testmon-stuff.patch 2020-03-03 15:46:58 UTC (rev 589782)
+++ disable-broken-testmon-stuff.patch 2020-03-03 15:47:08 UTC (rev 589783)
@@ -1,45 +0,0 @@
-diff -upr a/cheroot.egg-info/requires.txt b/cheroot.egg-info/requires.txt
---- a/cheroot.egg-info/requires.txt 2019-10-18 02:59:50.000000000 +0200
-+++ b/cheroot.egg-info/requires.txt 2019-11-21 15:12:09.409022012 +0100
-@@ -18,7 +18,6 @@ collective.checkdocs
- pytest>=2.8
- pytest-mock>=1.11.0
- pytest-sugar>=0.9.1
--pytest-testmon>=0.9.7
- pytest-watch==4.2.0
- pytest-xdist>=1.28.0
- coverage==4.5.3
-diff -upr a/pytest.ini b/pytest.ini
---- a/pytest.ini 2019-10-18 02:59:30.000000000 +0200
-+++ b/pytest.ini 2019-11-21 15:11:39.575862172 +0100
-@@ -1,6 +1,6 @@
- [pytest]
- norecursedirs = dist docs build .tox .eggs
--addopts = --durations=10 -v -rxXs -l -n auto --testmon --doctest-modules --ignore cheroot/ssl/pyopenssl.py --junitxml=junit-test-results.xml --cov=cheroot --cov-report term-missing:skip-covered --cov-report xml
-+addopts = --durations=10 -v -rxXs -l -n auto --doctest-modules --ignore cheroot/ssl/pyopenssl.py --junitxml=junit-test-results.xml --cov=cheroot --cov-report term-missing:skip-covered --cov-report xml
- filterwarnings =
- error
- doctest_optionflags = ALLOW_UNICODE ELLIPSIS
-diff -upr a/setup.cfg b/setup.cfg
---- a/setup.cfg 2019-10-18 02:59:51.000000000 +0200
-+++ b/setup.cfg 2019-11-21 15:11:55.979100130 +0100
-@@ -78,7 +78,6 @@ testing =
- pytest>=2.8
- pytest-mock>=1.11.0
- pytest-sugar>=0.9.1
-- pytest-testmon>=0.9.7
- pytest-watch==4.2.0
- pytest-xdist>=1.28.0
-
-diff -upr a/tox.ini b/tox.ini
---- a/tox.ini 2019-10-18 02:59:30.000000000 +0200
-+++ b/tox.ini 2019-11-21 15:07:15.714056061 +0100
-@@ -6,7 +6,7 @@ minversion = 3.13.2
- deps =
- setuptools>=31.0.1
- commands =
-- pytest --testmon-off {posargs}
-+ pytest {posargs}
- codecov -f coverage.xml -X gcov
- usedevelop = True
- extras = testing
Copied: python-cheroot/repos/community-any/disable-broken-testmon-stuff.patch (from rev 589782, python-cheroot/trunk/disable-broken-testmon-stuff.patch)
===================================================================
--- disable-broken-testmon-stuff.patch (rev 0)
+++ disable-broken-testmon-stuff.patch 2020-03-03 15:47:08 UTC (rev 589783)
@@ -0,0 +1,48 @@
+diff -upr a/cheroot.egg-info/requires.txt b/cheroot.egg-info/requires.txt
+--- a/cheroot.egg-info/requires.txt 2019-10-18 02:59:50.000000000 +0200
++++ b/cheroot.egg-info/requires.txt 2019-11-21 15:12:09.409022012 +0100
+@@ -18,7 +18,6 @@ collective.checkdocs
+ pytest>=2.8
+ pytest-mock>=1.11.0
+ pytest-sugar>=0.9.1
+-pytest-testmon<1.0.0
+ pytest-watch==4.2.0
+ pytest-xdist>=1.28.0
+ coverage==4.5.3
+diff -upr a/setup.cfg b/setup.cfg
+--- a/setup.cfg 2019-10-18 02:59:51.000000000 +0200
++++ b/setup.cfg 2019-11-21 15:11:55.979100130 +0100
+@@ -78,7 +78,6 @@ testing =
+ pytest>=2.8
+ pytest-mock>=1.11.0
+ pytest-sugar>=0.9.1
+- pytest-testmon<1.0.0
+ pytest-watch==4.2.0
+ pytest-xdist>=1.28.0
+
+diff -upr a/tox.ini b/tox.ini
+--- a/tox.ini 2019-10-18 02:59:30.000000000 +0200
++++ b/tox.ini 2019-11-21 15:07:15.714056061 +0100
+@@ -6,7 +6,7 @@ minversion = 3.13.2
+ deps =
+ setuptools>=31.0.1
+ commands =
+- pytest --testmon-off {posargs}
++ pytest {posargs}
+ codecov -f coverage.xml -X gcov
+ usedevelop = True
+ extras = testing
+diff -upr a/pytest.ini b/pytest.ini
+--- a/pytest.ini 2020-02-09 22:59:53.000000000 +0100
++++ b/pytest.ini 2020-03-03 16:45:21.589310767 +0100
+@@ -3,10 +3,6 @@ addopts =
+ # `pytest-xdist`:
+ --numprocesses=auto
+
+- # `pytest-mon`:
+- # useful for live testing with `pytest-watch` during development:
+- --testmon
+-
+ # show 10 slowest invocations:
+ --durations=10
+
Deleted: disable-broken-tests.patch
===================================================================
--- disable-broken-tests.patch 2020-03-03 15:46:58 UTC (rev 589782)
+++ disable-broken-tests.patch 2020-03-03 15:47:08 UTC (rev 589783)
@@ -1,10 +0,0 @@
---- cheroot-6.5.5/cheroot/test/test_ssl.py 2019-06-03 13:16:07.000000000 +0200
-+++ b/cheroot/test/test_ssl.py 2019-06-03 13:55:56.147157113 +0200
-@@ -206,7 +206,6 @@ def test_ssl_adapters(
- @pytest.mark.parametrize(
- 'adapter_type',
- (
-- 'builtin',
- 'pyopenssl',
- ),
- )
Copied: python-cheroot/repos/community-any/disable-broken-tests.patch (from rev 589782, python-cheroot/trunk/disable-broken-tests.patch)
===================================================================
--- disable-broken-tests.patch (rev 0)
+++ disable-broken-tests.patch 2020-03-03 15:47:08 UTC (rev 589783)
@@ -0,0 +1,10 @@
+--- cheroot-6.5.5/cheroot/test/test_ssl.py 2019-06-03 13:16:07.000000000 +0200
++++ b/cheroot/test/test_ssl.py 2019-06-03 13:55:56.147157113 +0200
+@@ -206,7 +206,6 @@ def test_ssl_adapters(
+ @pytest.mark.parametrize(
+ 'adapter_type',
+ (
+- 'builtin',
+ 'pyopenssl',
+ ),
+ )
More information about the arch-commits
mailing list