On Sun, Oct 11, 2020 at 10:23:04PM -0400, Daniel Jakots wrote: > Hi, > > Here's a diff for py-requests. I had trouble with 2.23's test suite. I > found a solution for 2.24 from > https://github.com/pytest-dev/pytest/issues/2042#issuecomment-429289164 > > There are still some failures.
Looks fine to me. Do these failures appear in the previous version? > > Cheers, > Daniel > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/www/py-requests/Makefile,v > retrieving revision 1.40 > diff -u -p -r1.40 Makefile > --- Makefile 3 Jul 2020 21:13:20 -0000 1.40 > +++ Makefile 12 Oct 2020 02:21:49 -0000 > @@ -2,10 +2,9 @@ > > COMMENT= elegant and simple HTTP library for Python > > -MODPY_EGG_VERSION= 2.22.0 > +MODPY_EGG_VERSION= 2.24.0 > DISTNAME= requests-${MODPY_EGG_VERSION} > PKGNAME= py-${DISTNAME} > -REVISION= 1 > > CATEGORIES= www > > @@ -41,5 +40,8 @@ WRKDIST= ${WRKDIR}/requests-${MODPY_EGG > post-install: > ln -fs /etc/ssl/cert.pem \ > ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/requests/cacert.pem > + > +do-test: > + @cd ${WRKSRC} && PY_IGNORE_IMPORTMISMATCH=1 ${MODPY_BIN} ${MODPY_SETUP} > test > > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/www/py-requests/distinfo,v > retrieving revision 1.25 > diff -u -p -r1.25 distinfo > --- distinfo 20 May 2019 02:28:19 -0000 1.25 > +++ distinfo 12 Oct 2020 02:21:49 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (requests-2.22.0.tar.gz) = > EeAHqKKqAyP1qSHp5qLX5OZ9mHfoV3P7qbpkGQJcvrQ= > -SIZE (requests-2.22.0.tar.gz) = 113406 > +SHA256 (requests-2.24.0.tar.gz) = > s1WaEx23LDPulpSAhA//S7bdER3n3SfI7h+CD08AIxs= > +SIZE (requests-2.24.0.tar.gz) = 115071 > cvs server: Diffing patches > Index: patches/patch-setup_py > =================================================================== > RCS file: patches/patch-setup_py > diff -N patches/patch-setup_py > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-setup_py 12 Oct 2020 02:21:49 -0000 > @@ -0,0 +1,14 @@ > +$OpenBSD$ > + > +Index: setup.py > +--- setup.py.orig > ++++ setup.py > +@@ -49,7 +49,7 @@ requires = [ > + > + ] > + test_requirements = [ > +- 'pytest-httpbin==0.0.7', > ++ 'pytest-httpbin', > + 'pytest-cov', > + 'pytest-mock', > + 'pytest-xdist', > Index: patches/patch-tests_test_utils_py > =================================================================== > RCS file: patches/patch-tests_test_utils_py > diff -N patches/patch-tests_test_utils_py > --- patches/patch-tests_test_utils_py 29 Jun 2019 21:42:07 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,19 +0,0 @@ > -$OpenBSD: patch-tests_test_utils_py,v 1.1 2019/06/29 21:42:07 kmos Exp $ > - > -Fix tests for pytest 4. From a patch not committed upstream yet. > - > -https://github.com/kennethreitz/requests/pull/5049 > - > -Index: tests/test_utils.py > ---- tests/test_utils.py.orig > -+++ tests/test_utils.py > -@@ -33,7 +33,8 @@ class TestSuperLen: > - 'stream, value', ( > - (StringIO.StringIO, 'Test'), > - (BytesIO, b'Test'), > -- pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')), > -+ pytest.param(cStringIO, 'Test', > -+ marks=pytest.mark.skipif('cStringIO is None')), > - )) > - def test_io_streams(self, stream, value): > - """Ensures that we properly deal with different kinds of IO > streams.""" > -- Antoine