Carl Smedstad pushed to branch main at Arch Linux / Packaging / Packages / 
python-httpretty


Commits:
3c1a3913 by Carl Smedstad at 2024-12-30T18:06:58+01:00
Use commit instead of PR link to source patch

Commits are guaranteed to be static, PRs might change.

- - - - -
43a9813b by Carl Smedstad at 2024-12-30T18:32:07+01:00
Apply patch from PR making functional tests compatible with pytest

- - - - -
5b4ed8a4 by Carl Smedstad at 2024-12-30T18:50:56+01:00
Apply patch from PR making all but one test pass

- - - - -
6b2d6154 by Carl Smedstad at 2024-12-30T18:56:15+01:00
upgpkg: 1.1.4-12: Apply patches to enable more test coverage

Preparation for bumping python-urllib3 to 2.3.0.

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = python-httpretty
        pkgdesc = HTTP client mock for Python
        pkgver = 1.1.4
-       pkgrel = 11
+       pkgrel = 12
        url = https://github.com/gabrielfalcao/httpretty
        arch = any
        license = MIT
@@ -25,10 +25,15 @@ pkgbase = python-httpretty
        makedepends = python-installer
        makedepends = python-wheel
        makedepends = python-setuptools
+       depends = python
        depends = python-urllib3
        source = 
https://github.com/gabrielfalcao/httpretty/archive/1.1.4/python-httpretty-1.1.4.tar.gz
-       source = 
python-httpretty-drop-mock.patch::https://github.com/gabrielfalcao/httpretty/pull/452.patch
+       source = 
python-httpretty-drop-mock.patch::https://github.com/gabrielfalcao/httpretty/commit/9fd8e0bdd9e45041d15be1d8ee7983005d9f3199.patch
+       source = 
python-httpretty-functional-tests-pytest-compatibility.patch::https://github.com/gabrielfalcao/httpretty/commit/299d50c9cb0ba73343d1a88c202e17f6599fde54.patch
+       source = 
python-httpretty-fix-failing-requests-tests.patch::https://github.com/gabrielfalcao/httpretty/commit/929cc89c2afced0c42bd08e3b9440ab1f4ec22a8.patch
        sha512sums = 
58c733ba4719f97e06e2313bb6b94f1c6609d3facb2e0262ac37be97f1c3430eac661611ba9b3712c9c1809846e177b61f3fc2945f3770d475f70b81bea2aced
        sha512sums = 
5520594ddb2e73d75c6eb8476dc1984464306614d915627c0c9e69815a5671d65e286e90f3ee926daa040f9f24a81835eb5c7993e620a5b67aaaefa06571dcb2
+       sha512sums = 
c9f1668be03210ef5efc7fe6f4783af31549aa812ebb32154a27034b88866e7e81df59648a3bb68f8f6c08c2734abc4b012c9e8b90d19d8570940c20391294e9
+       sha512sums = 
0b890bfd1dad70cf27aef5720e3158225697a4ccbe735fd7dd7e2b0887b60cc158750b9724d3e192311a6f32400480ce6ded4b01f01ed885085753ef13fc939e
 
 pkgname = python-httpretty


=====================================
PKGBUILD
=====================================
@@ -2,12 +2,13 @@
 
 pkgname=python-httpretty
 pkgver=1.1.4
-pkgrel=11
+pkgrel=12
 pkgdesc="HTTP client mock for Python"
 arch=('any')
 url="https://github.com/gabrielfalcao/httpretty";
 license=('MIT')
-depends=('python-urllib3')
+depends=('python'
+         'python-urllib3')
 makedepends=('python-build'
              'python-installer'
              'python-wheel'
@@ -29,13 +30,22 @@ checkdepends=('openssl'
               'python-sure'
               'python-tornado')
 source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz"
-        $pkgname-drop-mock.patch::$url/pull/452.patch)
+        # https://github.com/gabrielfalcao/HTTPretty/pull/452
+        
"$pkgname-drop-mock.patch::$url/commit/9fd8e0bdd9e45041d15be1d8ee7983005d9f3199.patch"
+        # https://github.com/gabrielfalcao/HTTPretty/pull/453
+        
"$pkgname-functional-tests-pytest-compatibility.patch::$url/commit/299d50c9cb0ba73343d1a88c202e17f6599fde54.patch"
+        # https://github.com/gabrielfalcao/HTTPretty/pull/479
+        
"$pkgname-fix-failing-requests-tests.patch::$url/commit/929cc89c2afced0c42bd08e3b9440ab1f4ec22a8.patch")
 
sha512sums=('58c733ba4719f97e06e2313bb6b94f1c6609d3facb2e0262ac37be97f1c3430eac661611ba9b3712c9c1809846e177b61f3fc2945f3770d475f70b81bea2aced'
-            
'5520594ddb2e73d75c6eb8476dc1984464306614d915627c0c9e69815a5671d65e286e90f3ee926daa040f9f24a81835eb5c7993e620a5b67aaaefa06571dcb2')
+            
'5520594ddb2e73d75c6eb8476dc1984464306614d915627c0c9e69815a5671d65e286e90f3ee926daa040f9f24a81835eb5c7993e620a5b67aaaefa06571dcb2'
+            
'c9f1668be03210ef5efc7fe6f4783af31549aa812ebb32154a27034b88866e7e81df59648a3bb68f8f6c08c2734abc4b012c9e8b90d19d8570940c20391294e9'
+            
'0b890bfd1dad70cf27aef5720e3158225697a4ccbe735fd7dd7e2b0887b60cc158750b9724d3e192311a6f32400480ce6ded4b01f01ed885085753ef13fc939e')
 
 prepare() {
   cd HTTPretty-$pkgver
   patch -p1 -i ../$pkgname-drop-mock.patch
+  patch -p1 -i ../$pkgname-functional-tests-pytest-compatibility.patch
+  patch -p1 -i ../$pkgname-fix-failing-requests-tests.patch
   sed -i -e '/rednose/d' -e '/cover/d' setup.cfg
 }
 
@@ -46,17 +56,9 @@ build() {
 
 check() {
   cd HTTPretty-$pkgver
-  export PYTHONPATH=.
-  local deseclected=(
-    # https://github.com/gabrielfalcao/HTTPretty/issues/457
-    tests/functional/test_requests.py
-    # meant to be used with nose not pytest
-    tests/functional/test_bypass.py
-    tests/functional/test_debug.py
-    tests/functional/test_requests.py
-    tests/functional/test_passthrough.py
-  )
-  pytest ${deseclected[@]/#/--deselect }
+  # https://github.com/gabrielfalcao/HTTPretty/issues/457
+  PYTHONPATH=. pytest \
+    --deselect 
tests/functional/test_requests.py::test_httpretty_should_handle_paths_starting_with_two_slashes
 }
 
 package() {



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/python-httpretty/-/compare/2667ac8f22e799276bd647134e52ad525d4e5c30...6b2d615495b7f682e162cba8f2b7308866f50f08

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/python-httpretty/-/compare/2667ac8f22e799276bd647134e52ad525d4e5c30...6b2d615495b7f682e162cba8f2b7308866f50f08
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to