[arch-commits] Commit in nvchecker/trunk (2 files)
Chih-Hsuan Yen
yan12125 at gemini.archlinux.org
Thu Jul 29 04:09:10 UTC 2021
Date: Thursday, July 29, 2021 @ 04:09:09
Author: yan12125
Revision: 989729
upgpkg: nvchecker 2.4-1; switch sources to the git repo and various cleanups
It's common to backport upstream fixes so that tests remain green over time, and using a git repo is simpler for backports
And remove the no longer needed setuptools dependency. See https://archlinux.org/todo/cleanup-of-python-setuptools-dependency-for-console-scripts/
Modified:
nvchecker/trunk/PKGBUILD
Deleted:
nvchecker/trunk/nvchecker-update-tests-20210623.patch
---------------------------------------+
PKGBUILD | 51 ++++++++++++++------------------
nvchecker-update-tests-20210623.patch | 33 --------------------
2 files changed, 23 insertions(+), 61 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-29 01:37:36 UTC (rev 989728)
+++ PKGBUILD 2021-07-29 04:09:09 UTC (rev 989729)
@@ -2,47 +2,42 @@
# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
pkgname=nvchecker
-pkgver=2.3
-pkgrel=4
+pkgver=2.4
+# git rev-parse v$pkgver
+_commit=f89ebe4e43c45e95a5b4cbcf58f23d81a616c12f
+pkgrel=1
pkgdesc="New version checker for software releases"
arch=('any')
url="https://github.com/lilydjwg/nvchecker"
license=('MIT')
-# setuptools is in depends as pkg_resources is used in sortversion.py
-depends=('python' 'python-setuptools' 'python-toml' 'python-structlog' 'python-appdirs' 'python-tornado' 'python-pycurl' 'python-packaging')
-makedepends=('python-docutils')
-checkdepends=('python-pytest' 'python-pytest-asyncio' 'python-pytest-httpbin' 'python-flaky' 'pyalpm' 'git')
+depends=('python' 'python-toml' 'python-structlog' 'python-appdirs' 'python-tornado' 'python-pycurl' 'python-packaging')
+makedepends=('git' 'python-docutils' 'python-setuptools' 'python-pygments')
+checkdepends=('python-pytest' 'python-pytest-asyncio' 'python-pytest-httpbin' 'python-flaky' 'python-lxml' 'pyalpm' 'git')
optdepends=(
'pyalpm: for using "sort_version_key = vercmp" in configuration files and the alpm source'
+ 'python-lxml: for the htmlparser source'
'git: support for git repositories'
'python-gobject: for nvchecker-notify'
'libnotify: for nvchecker-notify'
)
-source=("https://github.com/lilydjwg/nvchecker/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
- "nvchecker-update-tests-20210506.patch"::"https://github.com/lilydjwg/nvchecker/commit/134a6885f123a3249c8c5cb168d9bae03c0ea585.patch"
- "nvchecker-fix-test-pacman.patch"::"https://github.com/lilydjwg/nvchecker/commit/61bc0c5562d353bc47ff5d6d329f3c78ca632de4.patch"
- "nvchecker-update-tests-20210603.patch"::"https://github.com/lilydjwg/nvchecker/commit/1064f3d948d7983f12bfa433c9dccd9930987396.patch"
- "nvchecker-update-tests-20210623.patch"
- "nvchecker-fix-sparkle.patch"::"https://github.com/lilydjwg/nvchecker/commit/46d724b4656fc09fd96f9452e39d6db178c1d298.patch")
-sha512sums=('bbdf6348cfd93ae156ae05b3ddb2fd238448e4a9d44eb00d2518b4657f895468af657372453c1a8c8c75f7d2f75467d884347a1aaecf896c0fdb6186607b0a63'
- '0b94b5d72f2322c678425a74c576ecf838e080e905b49b4f2651929fcf5f252b8378cf0df82cc652b604b529c5b202a6013ee4fc22b7204d9abf928bd3a3882d'
- 'dca127d5c14980e72d9de03ad4a780fdf47cf4a8b74166d2ceb04d62e0b5f1af65f1001eb9c98d3d90eb4719a507f41d6fb1aa65fa5ba2fe3ad5d7e0701e3d08'
- 'b686f90098898f3c6cf978949a47950b88f4731aa7b24b0c739a509416a6b180cf98a147302979f07d58c3312d0b886b5442d13d1c0ea5ce117d167dae6da6bf'
- 'cfea145fcb1850a85cb1d229b4646894a98a5088ad2a580b7a50ee349a89ebd3f02509abd4777e151758d8cfd51ff50bd2c3c63a0877b7eb4f24f6d8e7dea9c7'
- 'd5f82f2633d66dceeaae9a90b6c5f9bacc38db0b82d718168a3bc3f3e36242498119888fc5ba0b18cf50df2330c11a0b900decb39d1eccb3ed69ad8eee6379bd')
+source=("git+https://github.com/lilydjwg/nvchecker.git?signed#tag=$_commit")
+sha512sums=('SKIP')
+validpgpkeys=(
+ # No direct trust chain. Some related stuffs:
+ # https://api.github.com/users/lilydjwg/gpg_keys
+ # https://zh.wikipedia.org/wiki/User:Lilydjwg
+ '356690A1E7404E30D0E902B2E64D049594A54F54'
+)
prepare() {
- cd nvchecker-$pkgver
- patch -Np1 -i ../nvchecker-update-tests-20210506.patch
- patch -Np1 -i ../nvchecker-fix-test-pacman.patch
- patch -Np1 -i ../nvchecker-update-tests-20210603.patch
- # Part of upstream commit ffaca8c94947d1b9709ab98e187f98ff9a531ac3
- patch -Np1 -i ../nvchecker-update-tests-20210623.patch
- patch -Np1 -i ../nvchecker-fix-sparkle.patch
+ cd nvchecker
+ # https://github.com/lilydjwg/nvchecker/pull/197
+ # Remove no longer needed setuptools dependency
+ git cherry-pick -n 3fdb2ee9d484d458a40024e83648e8b04c6a6e49
}
build() {
- cd nvchecker-$pkgver
+ cd nvchecker
python setup.py build
make -C docs man
@@ -49,12 +44,12 @@
}
check() {
- cd nvchecker-$pkgver
+ cd nvchecker
pytest
}
package() {
- cd nvchecker-$pkgver
+ cd nvchecker
# use PYTHONHASHSEED=0 work around https://bugs.python.org/issue34722
PYTHONHASHSEED=0 python setup.py install --root="$pkgdir" --optimize=1 --skip-build
install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
Deleted: nvchecker-update-tests-20210623.patch
===================================================================
--- nvchecker-update-tests-20210623.patch 2021-07-29 01:37:36 UTC (rev 989728)
+++ nvchecker-update-tests-20210623.patch 2021-07-29 04:09:09 UTC (rev 989729)
@@ -1,33 +0,0 @@
-From ffaca8c94947d1b9709ab98e187f98ff9a531ac3 Mon Sep 17 00:00:00 2001
-From: lilydjwg <lilydjwg at gmail.com>
-Date: Wed, 23 Jun 2021 16:00:17 +0800
-Subject: [PATCH] option to not verify HTTPS certificate
-
-fixes #190.
----
- .github/workflows/mypy.yaml | 5 +++++
- docs/api.rst | 1 +
- docs/usage.rst | 3 +++
- nvchecker/ctxvars.py | 1 +
- nvchecker/httpclient/aiohttp_httpclient.py | 3 +++
- nvchecker/httpclient/base.py | 5 ++++-
- nvchecker/httpclient/httpx_httpclient.py | 10 ++++++----
- nvchecker/httpclient/tornado_httpclient.py | 2 ++
- nvchecker/util.py | 4 ++++
- tests/test_anitya.py | 2 +-
- tests/test_regex.py | 21 +++++++++++++++++++++
- 11 files changed, 51 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test_anitya.py b/tests/test_anitya.py
-index 9fd33e8..402874c 100644
---- a/tests/test_anitya.py
-+++ b/tests/test_anitya.py
-@@ -9,4 +9,4 @@ async def test_anitya(get_version):
- assert await get_version("shutter", {
- "source": "anitya",
- "anitya": "fedora/shutter",
-- }) == "0.96"
-+ }) == "0.97"
---
-2.32.0
-
More information about the arch-commits
mailing list