Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714387983206750"
MIME-Version: 1.0
Date: Mon, 29 Apr 2024 10:53:03 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/net/py-pypiserver
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20240429105303.610F3FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714387983206750
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Mon Apr 29 10:53:03 UTC 2024

Modified Files:
	pkgsrc/net/py-pypiserver: Makefile distinfo
	pkgsrc/net/py-pypiserver/patches: patch-setup.py

Log Message:
py-pypiserver: updated to 2.1.1

2.1.1 (2024-04-24)
- 31c9cf1 FIX: deprecated `setuptools.py` when building in `package.sh`
- 2619c17 FIX: use the right env variables in `release-tag` workflow

2.1.0 (2024-04-24)
- d588913 ENH: Bump github action versions and add multiarch support
- a558dbc ENH: Handle tar.xz archives
- 2f0a56c FIX: support Python 3.12
- 84bf12c MAINT: make the last supported python version explicit in `ci.yaml`
- 946fbfe MAINT: Update setuptools requirement from <62.0.0,>=40.0 to >=40.0,<70.0.0 in /requirements
- 50c7a78 MAINT: add tar xz test case


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/py-pypiserver/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/py-pypiserver/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-pypiserver/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1714387983206750
Content-Disposition: inline
Content-Length: 3654
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/py-pypiserver/Makefile
diff -u pkgsrc/net/py-pypiserver/Makefile:1.13 pkgsrc/net/py-pypiserver/Makefile:1.14
--- pkgsrc/net/py-pypiserver/Makefile:1.13	Mon Jan 15 20:42:45 2024
+++ pkgsrc/net/py-pypiserver/Makefile	Mon Apr 29 10:53:03 2024
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2024/01/15 20:42:45 adam Exp $
+# $NetBSD: Makefile,v 1.14 2024/04/29 10:53:03 adam Exp $
 
-DISTNAME=	pypiserver-2.0.1
+DISTNAME=	pypiserver-2.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pypiserver/}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/pypiserver/pypiserver
@@ -13,6 +12,7 @@ LICENSE=	modified-bsd
 
 TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel>=0.25.0:../../devel/py-wheel
+DEPENDS+=	${PYPKGPREFIX}-packaging>=23.2:../../devel/py-packaging
 DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6:../../security/py-passlib
 DEPENDS+=	${PYPKGPREFIX}-pip>=7:../../devel/py-pip
 DEPENDS+=	${PYPKGPREFIX}-watchdog-[0-9]*:../../sysutils/py-watchdog
@@ -23,6 +23,11 @@ USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
+.include "../../lang/python/pyversion.mk"
+.if ${PYTHON_VERSION} < 312
+DEPENDS+=	${PYPKGPREFIX}-importlib-resources-[0-9]*:../../devel/py-importlib-resources
+.endif
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 	${MV} pypi-server pypi-server-${PYVERSSUFFIX} || ${TRUE}

Index: pkgsrc/net/py-pypiserver/distinfo
diff -u pkgsrc/net/py-pypiserver/distinfo:1.10 pkgsrc/net/py-pypiserver/distinfo:1.11
--- pkgsrc/net/py-pypiserver/distinfo:1.10	Mon Jan 15 20:42:45 2024
+++ pkgsrc/net/py-pypiserver/distinfo	Mon Apr 29 10:53:03 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2024/01/15 20:42:45 adam Exp $
+$NetBSD: distinfo,v 1.11 2024/04/29 10:53:03 adam Exp $
 
-BLAKE2s (pypiserver-2.0.1.zip) = 962c0944bf5e8c57a5ffb6caa04709ceda11e36e26cab99fda37470938f7f3bb
-SHA512 (pypiserver-2.0.1.zip) = 4b09548b6357c69726698fb1e39cb1846380381fa2a46f6247e568b761e4cc2847f87fc23cf1d18e648c6c26b0e395156d53c5a7890e3198820313188562dd2a
-Size (pypiserver-2.0.1.zip) = 206482 bytes
-SHA1 (patch-setup.py) = 8a9e4de725f3df7beb44e6036abebafc6cedd7b8
+BLAKE2s (pypiserver-2.1.1.tar.gz) = f7ab992d29485ff6f16c4956760093d6835560cd1914fbb1ccb0e70f2af63903
+SHA512 (pypiserver-2.1.1.tar.gz) = 188505325b9f3ba666967d7fa959cb73edf48006ff3795a1c0b961fcc77697be4aa864ad6ee18ebb1850334fb01fc92898865c0d6f33a8e0c8e59b1fc091eb5f
+Size (pypiserver-2.1.1.tar.gz) = 188504 bytes
+SHA1 (patch-setup.py) = e0fb40de46b0881c85bb79760febe59d1a04eeba

Index: pkgsrc/net/py-pypiserver/patches/patch-setup.py
diff -u pkgsrc/net/py-pypiserver/patches/patch-setup.py:1.4 pkgsrc/net/py-pypiserver/patches/patch-setup.py:1.5
--- pkgsrc/net/py-pypiserver/patches/patch-setup.py:1.4	Fri Aug  4 08:17:36 2023
+++ pkgsrc/net/py-pypiserver/patches/patch-setup.py	Mon Apr 29 10:53:03 2024
@@ -1,15 +1,14 @@
-$NetBSD: patch-setup.py,v 1.4 2023/08/04 08:17:36 adam Exp $
+$NetBSD: patch-setup.py,v 1.5 2024/04/29 10:53:03 adam Exp $
 
 Do not require setuptools-git for building.
 
---- setup.py.orig	2023-07-30 19:33:20.000000000 +0000
+--- setup.py.orig	2024-04-24 23:59:20.000000000 +0000
 +++ setup.py
-@@ -13,7 +13,7 @@ tests_require = [
-     "webtest",
- ]
- 
--setup_requires = ["setuptools", "setuptools-git >= 0.3", "wheel >= 0.25.0"]
-+setup_requires = ["setuptools", "wheel >= 0.25.0"]
- install_requires = ["pip>=7"]
- 
+@@ -16,7 +16,6 @@ tests_require = [
  
+ setup_requires = [
+     "setuptools",
+-    "setuptools-git>=0.3",
+     "wheel>=0.25.0",
+ ]
+ install_requires = [


--_----------=_1714387983206750--