CVS commit: pkgsrc/www/py-curl

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Aug 25 09:01:07 UTC 2021

Modified Files:
        pkgsrc/www/py-curl: Makefile PLIST distinfo
        pkgsrc/www/py-curl/patches: patch-setup.py

Log Message:
py-curl: updated to 7.44.1

PycURL 7.44.1 - 2021-08-15
--------------------------
This release repairs incorrect Python thread initialization logic which
caused operations to hang.

PycURL 7.44.0 - 2021-08-08
--------------------------
This release reinstates best effort Python 2 support, adds Python 3.9 and
Python 3.10 alpha support and implements support for several libcurl options.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/www/py-curl/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/py-curl/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/py-curl/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-curl/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/www/py-curl/Makefile
diff -u pkgsrc/www/py-curl/Makefile:1.74 pkgsrc/www/py-curl/Makefile:1.75
--- pkgsrc/www/py-curl/Makefile:1.74    Wed Apr 21 13:25:31 2021
+++ pkgsrc/www/py-curl/Makefile Wed Aug 25 09:01:07 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2021/04/21 13:25:31 adam Exp $
+# $NetBSD: Makefile,v 1.75 2021/08/25 09:01:07 adam Exp $
 
-DISTNAME=      pycurl-7.43.0.6
+DISTNAME=      pycurl-7.44.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=   2
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pycurl/}
 
@@ -11,13 +10,18 @@ HOMEPAGE=   http://pycurl.io/
 COMMENT=       Python module interface to the cURL library
 LICENSE=       gnu-lgpl-v2.1 OR mit
 
+TEST_DEPENDS+= ${PYPKGPREFIX}-bottle-[0-9]*:../../www/py-bottle
+TEST_DEPENDS+= ${PYPKGPREFIX}-flaky-[0-9]*:../../devel/py-flaky
+
 PYSETUPARGS=   --with-openssl
-MAKE_FLAGS+=   PYTHON=${PYTHONBIN}
 
-pre-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS}
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
+do-test:
+       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
 
 BUILDLINK_API_DEPENDS.curl+=   curl>=7.19.0
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-curl/PLIST
diff -u pkgsrc/www/py-curl/PLIST:1.16 pkgsrc/www/py-curl/PLIST:1.17
--- pkgsrc/www/py-curl/PLIST:1.16       Wed Sep  9 08:16:31 2020
+++ pkgsrc/www/py-curl/PLIST    Wed Aug 25 09:01:07 2021
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.16 2020/09/09 08:16:31 leot Exp $
+@comment $NetBSD: PLIST,v 1.17 2021/08/25 09:01:07 adam Exp $
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/curl/__init__.py
 ${PYSITELIB}/curl/__init__.pyc
 ${PYSITELIB}/curl/__init__.pyo
-${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/pycurl.so
 share/doc/pycurl${PYVERSSUFFIX}/AUTHORS
 share/doc/pycurl${PYVERSSUFFIX}/COPYING-LGPL
@@ -14,6 +14,7 @@ share/doc/pycurl${PYVERSSUFFIX}/RELEASE-
 share/doc/pycurl${PYVERSSUFFIX}/examples/basicfirst.py
 share/doc/pycurl${PYVERSSUFFIX}/examples/file_upload.py
 share/doc/pycurl${PYVERSSUFFIX}/examples/linksys.py
+share/doc/pycurl${PYVERSSUFFIX}/examples/multi-socket_action-select.py
 share/doc/pycurl${PYVERSSUFFIX}/examples/opensocketexception.py
 share/doc/pycurl${PYVERSSUFFIX}/examples/quickstart/file_upload_buffer.py
 share/doc/pycurl${PYVERSSUFFIX}/examples/quickstart/file_upload_real.py

Index: pkgsrc/www/py-curl/distinfo
diff -u pkgsrc/www/py-curl/distinfo:1.28 pkgsrc/www/py-curl/distinfo:1.29
--- pkgsrc/www/py-curl/distinfo:1.28    Thu Sep  3 11:32:57 2020
+++ pkgsrc/www/py-curl/distinfo Wed Aug 25 09:01:07 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2020/09/03 11:32:57 leot Exp $
+$NetBSD: distinfo,v 1.29 2021/08/25 09:01:07 adam Exp $
 
-SHA1 (pycurl-7.43.0.6.tar.gz) = 831efb6beda9b4128f816438f56ea07946e63e39
-RMD160 (pycurl-7.43.0.6.tar.gz) = 3e38151410fd0cfb2ec88ce731458116bad59726
-SHA512 (pycurl-7.43.0.6.tar.gz) = 5625d9e38159fb785afaf539372a8ac658d9118fb25f581f11629859fde400b6fccf65e03a19e182534a78169531304639b1e6f1bfdd2cb09bce95d581b52850
-Size (pycurl-7.43.0.6.tar.gz) = 222895 bytes
-SHA1 (patch-setup.py) = c47fedb656cebd4ac3bafa1cc6f08223ea75e086
+SHA1 (pycurl-7.44.1.tar.gz) = ef2dc64486b80ee8a984adbee450a72371cdc298
+RMD160 (pycurl-7.44.1.tar.gz) = 54ea1368a042470fb94f62e59eb6ba2a9cd3cf51
+SHA512 (pycurl-7.44.1.tar.gz) = e251db332791de07364695b5fd59b3a290486eabbde8be9914b5edeefa8702b4dd9ab678739ad765f76ededeb7192444fefe2a076d3977f454259dfd06731059
+Size (pycurl-7.44.1.tar.gz) = 227562 bytes
+SHA1 (patch-setup.py) = 30f5205ed6f5447b5ee37e8721d287362d8c724e

Index: pkgsrc/www/py-curl/patches/patch-setup.py
diff -u pkgsrc/www/py-curl/patches/patch-setup.py:1.2 pkgsrc/www/py-curl/patches/patch-setup.py:1.3
--- pkgsrc/www/py-curl/patches/patch-setup.py:1.2       Mon Aug 20 07:31:51 2018
+++ pkgsrc/www/py-curl/patches/patch-setup.py   Wed Aug 25 09:01:07 2021
@@ -1,25 +1,23 @@
-$NetBSD: patch-setup.py,v 1.2 2018/08/20 07:31:51 adam Exp $
+$NetBSD: patch-setup.py,v 1.3 2021/08/25 09:01:07 adam Exp $
 
 Stick to distutils.
 Add multi Python variant support.
 
---- setup.py.orig      2018-06-02 04:59:02.000000000 +0000
+--- setup.py.orig      2021-08-15 19:30:48.000000000 +0000
 +++ setup.py
-@@ -10,12 +10,7 @@ VERSION = "7.43.0.2"
+@@ -10,10 +10,7 @@ VERSION = "7.44.1"
  
  import glob, os, re, sys, subprocess
  import distutils
 -try:
--    import wheel
--    if wheel:
--        from setuptools import setup
+-    from setuptools import setup
 -except ImportError:
 -    from distutils.core import setup
 +from distutils.core import setup
  from distutils.extension import Extension
  from distutils.util import split_quoted
  from distutils.version import LooseVersion
-@@ -605,9 +600,9 @@ def get_data_files():
+@@ -687,9 +684,9 @@ def get_data_files():
      # a list of tuples with (path to install to, a list of local files)
      data_files = []
      if sys.platform == "win32":