CVS commit: pkgsrc/net/py-pypiserver

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed May 11 11:01:39 UTC 2022

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

Log Message:
py-pypiserver: updated to 1.5.0

1.5.0 (2022-05-01)
------------------
- CHORE: pull CHANGES.rst from v1.4.x
- DOC: add call for maintainers to README
- DOC: Fixes in README examples
- DOC: start of empty contributor documentation directory
- ENH: added JSON Topic for use with micropython-upip
- ENH: Backwards-compatible argparse config (not yet in use)
- ENH: Refactor storage operations into separate Backend classes
- ENH: Restore ability to drop hashing in new config
- ENH: Specify doctype for generated pages.
  Fixed violation of PEP 503 warning with pip>=22.
- ENH: Use argparse config throughout app
- FIX: Fix silly typo in the readme :)
- FIX: fix small typing and lint errors in config.py
- FIX: fix version incompatibility that breaks twine in docker test
- FIX: fix(setuptools-in-tests) add `packages=[]` in test setup
- FIX: Gunicorn/gevent docker, log fixes, cache busting
- MAINT: Add aggregate "tests" job
- MAINT: Add release to PyPi job
- MAINT: add github action for release management
- MAINT: Add python 3.9 testing
- MAINT: Cleanup code to python 3.6
- MAINT: contributor update in README
- MAINT: disable unstable test for Python 3.9
- MAINT: Docker improvements
- MAINT: drop standalone, drop py 2.7 and 3.5
- MAINT: Merge branch 'v1.4.x'
- MAINT: Push to Docker Hub from CI
- MAINT: Refactor test_server to increase speed
- MAINT: Run black on codebase
- MAINT: run gh actions on PRs from forks
- MAINT: small code style fixes
- MAINT: Switch to GH actions


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-pypiserver/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-pypiserver/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-pypiserver/distinfo
cvs rdiff -u -r1.2 -r1.3 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.

Modified files:

Index: pkgsrc/net/py-pypiserver/Makefile
diff -u pkgsrc/net/py-pypiserver/Makefile:1.8 pkgsrc/net/py-pypiserver/Makefile:1.9
--- pkgsrc/net/py-pypiserver/Makefile:1.8       Wed Jan  5 15:41:17 2022
+++ pkgsrc/net/py-pypiserver/Makefile   Wed May 11 11:01:39 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:17 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/11 11:01:39 adam Exp $
 
-DISTNAME=      pypiserver-1.4.2
+DISTNAME=      pypiserver-1.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pypiserver/}
 EXTRACT_SUFX=  .zip
@@ -16,25 +15,23 @@ BUILD_DEPENDS+=     ${PYPKGPREFIX}-wheel>=0.
 DEPENDS+=      ${PYPKGPREFIX}-passlib>=1.6:../../security/py-passlib
 DEPENDS+=      ${PYPKGPREFIX}-watchdog-[0-9]*:../../sysutils/py-watchdog
 TEST_DEPENDS+= ${PYPKGPREFIX}-WebTest-[0-9]*:../../www/py-WebTest
+TEST_DEPENDS+= ${PYPKGPREFIX}-pip>=7:../../devel/py-pip
+TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.3:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 TEST_DEPENDS+= ${PYPKGPREFIX}-twine-[0-9]*:../../net/py-twine
 
-.include "../../lang/python/pyversion.mk"
-
-.if ${_PYTHON_VERSION} == 27
-TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-.endif
-
-PYTHON_VERSIONED_DEPENDENCIES= pip:test test:test
+USE_LANGUAGES= # none
 
 USE_PKG_RESOURCES=     yes
 
-USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pypi-server pypi-server-${PYVERSSUFFIX} || ${TRUE}
 
+do-test:
+       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
+
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-pypiserver/PLIST
diff -u pkgsrc/net/py-pypiserver/PLIST:1.1 pkgsrc/net/py-pypiserver/PLIST:1.2
--- pkgsrc/net/py-pypiserver/PLIST:1.1  Wed May 29 20:13:09 2019
+++ pkgsrc/net/py-pypiserver/PLIST      Wed May 11 11:01:39 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/05/29 20:13:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/05/11 11:01:39 adam Exp $
 bin/pypi-server-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -16,16 +16,28 @@ ${PYSITELIB}/pypiserver/__main__.pyo
 ${PYSITELIB}/pypiserver/_app.py
 ${PYSITELIB}/pypiserver/_app.pyc
 ${PYSITELIB}/pypiserver/_app.pyo
+${PYSITELIB}/pypiserver/backend.py
+${PYSITELIB}/pypiserver/backend.pyc
+${PYSITELIB}/pypiserver/backend.pyo
 ${PYSITELIB}/pypiserver/bottle.py
 ${PYSITELIB}/pypiserver/bottle.pyc
 ${PYSITELIB}/pypiserver/bottle.pyo
 ${PYSITELIB}/pypiserver/cache.py
 ${PYSITELIB}/pypiserver/cache.pyc
 ${PYSITELIB}/pypiserver/cache.pyo
+${PYSITELIB}/pypiserver/config.py
+${PYSITELIB}/pypiserver/config.pyc
+${PYSITELIB}/pypiserver/config.pyo
 ${PYSITELIB}/pypiserver/core.py
 ${PYSITELIB}/pypiserver/core.pyc
 ${PYSITELIB}/pypiserver/core.pyo
 ${PYSITELIB}/pypiserver/manage.py
 ${PYSITELIB}/pypiserver/manage.pyc
 ${PYSITELIB}/pypiserver/manage.pyo
+${PYSITELIB}/pypiserver/pkg_helpers.py
+${PYSITELIB}/pypiserver/pkg_helpers.pyc
+${PYSITELIB}/pypiserver/pkg_helpers.pyo
+${PYSITELIB}/pypiserver/plugin.py
+${PYSITELIB}/pypiserver/plugin.pyc
+${PYSITELIB}/pypiserver/plugin.pyo
 ${PYSITELIB}/pypiserver/welcome.html

Index: pkgsrc/net/py-pypiserver/distinfo
diff -u pkgsrc/net/py-pypiserver/distinfo:1.6 pkgsrc/net/py-pypiserver/distinfo:1.7
--- pkgsrc/net/py-pypiserver/distinfo:1.6       Tue Oct 26 11:06:42 2021
+++ pkgsrc/net/py-pypiserver/distinfo   Wed May 11 11:01:39 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:06:42 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/05/11 11:01:39 adam Exp $
 
-BLAKE2s (pypiserver-1.4.2.zip) = 536d93dfa80261ff022c5704e76a0868926af53b71f21a12e96c831f99938759
-SHA512 (pypiserver-1.4.2.zip) = f7e17dd894d62300ba27d99244e809b3789c658a5eba8d82236c8b978e28091877dd26526ce5574466dba470d70e03381982ec818a7c969071283370eb6d4cf2
-Size (pypiserver-1.4.2.zip) = 547599 bytes
-SHA1 (patch-setup.py) = 711949ce59a54a88e2cf4af347ddc7db24683357
+BLAKE2s (pypiserver-1.5.0.zip) = 60b7f76e39fc8feafaf1bfbfcfcbd562388a33cd7cf226de90a151b3c6476e7e
+SHA512 (pypiserver-1.5.0.zip) = 9db136e8492260ad5c747adacb0d03ff89e64460a22b05b9d0be35da36fd82a5a8e98bda8c0517fb5d139957bf5626127f199358ecfb36d359e7d719dadabac9
+Size (pypiserver-1.5.0.zip) = 196915 bytes
+SHA1 (patch-setup.py) = bb5ab96568ded55d450e564d3adae57f59282ad1

Index: pkgsrc/net/py-pypiserver/patches/patch-setup.py
diff -u pkgsrc/net/py-pypiserver/patches/patch-setup.py:1.2 pkgsrc/net/py-pypiserver/patches/patch-setup.py:1.3
--- pkgsrc/net/py-pypiserver/patches/patch-setup.py:1.2 Thu Jan 16 08:20:02 2020
+++ pkgsrc/net/py-pypiserver/patches/patch-setup.py     Wed May 11 11:01:39 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-setup.py,v 1.2 2020/01/16 08:20:02 adam Exp $
+$NetBSD: patch-setup.py,v 1.3 2022/05/11 11:01:39 adam Exp $
 
 Do not require setuptools-git for building.
 
---- setup.py.orig      2019-09-17 18:56:54.000000000 +0000
+--- setup.py.orig      2022-05-01 18:53:34.000000000 +0000
 +++ setup.py
-@@ -20,7 +20,7 @@ tests_require = [
- if sys.version_info == (2, 7):
-     tests_require.append("mock")
+@@ -14,7 +14,7 @@ tests_require = [
+     "webtest",
+ ]
  
--setup_requires = ["setuptools", "setuptools-git >= 0.3"]
-+setup_requires = ["setuptools"]
- if sys.version_info >= (3, 5):
-     setup_requires.append("wheel >= 0.25.0")  # earlier wheels fail in 3.5
- else:
+-setup_requires = ["setuptools", "setuptools-git >= 0.3", "wheel >= 0.25.0"]
++setup_requires = ["setuptools", "wheel >= 0.25.0"]
+ 
+ 
+ def read_file(rel_path: str):