python-requests move to core
This commit is contained in:
IdrisKalp
+14
@@ -0,0 +1,14 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import pythonmodules
|
||||
from pisi.actionsapi import pisitools
|
||||
|
||||
def build():
|
||||
pythonmodules.compile()
|
||||
|
||||
def install():
|
||||
pythonmodules.install()
|
||||
@@ -0,0 +1,14 @@
|
||||
diff --git a/requests/certs.py b/requests/certs.py
|
||||
index d1a378d7..4e0bffd4 100644
|
||||
--- a/requests/certs.py
|
||||
+++ b/requests/certs.py
|
||||
@@ -12,7 +12,8 @@ If you are packaging Requests, e.g., for a Linux distribution or a managed
|
||||
environment, you can change the definition of where() to return a separately
|
||||
packaged CA bundle.
|
||||
"""
|
||||
-from certifi import where
|
||||
+def where():
|
||||
+ return "/etc/ssl/certs/ca-certificates.crt"
|
||||
|
||||
if __name__ == '__main__':
|
||||
print(where())
|
||||
Executable
+28
@@ -0,0 +1,28 @@
|
||||
From 152550287d6538e5cc7649bcf685a5a0b35058dd Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Cline <jcline@redhat.com>
|
||||
Date: Tue, 12 Jun 2018 14:06:00 -0400
|
||||
Subject: [PATCH] Don't import OrderedDict from urllib3
|
||||
|
||||
We unbundle urllib3, just use collections (py2.7+)
|
||||
|
||||
Signed-off-by: Jeremy Cline <jcline@redhat.com>
|
||||
---
|
||||
requests/compat.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/requests/compat.py b/requests/compat.py
|
||||
index 6b9c6fac..6ba6e460 100644
|
||||
--- a/requests/compat.py
|
||||
+++ b/requests/compat.py
|
||||
@@ -45,7 +45,7 @@ if is_py2:
|
||||
from StringIO import StringIO
|
||||
from collections import Callable, Mapping, MutableMapping
|
||||
|
||||
- from urllib3.packages.ordered_dict import OrderedDict
|
||||
+ from collections import OrderedDict # py2.7+
|
||||
|
||||
builtin_str = str
|
||||
bytes = str
|
||||
--
|
||||
2.17.1
|
||||
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
rom fd9ab446d8479360d2c1c8252508d97d58ed3e0e Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Cline <jeremy@jcline.org>
|
||||
Date: Mon, 19 Jun 2017 16:09:02 -0400
|
||||
Subject: [PATCH] Patch requests/certs.py to use the system CA bundle
|
||||
|
||||
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
|
||||
---
|
||||
requests/certs.py | 11 ++++++++++-
|
||||
setup.py | 1 -
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/requests/certs.py b/requests/certs.py
|
||||
index d1a378d..7b103ba 100644
|
||||
--- a/requests/certs.py
|
||||
+++ b/requests/certs.py
|
||||
@@ -11,8 +11,17 @@ only one — the one from the certifi package.
|
||||
If you are packaging Requests, e.g., for a Linux distribution or a managed
|
||||
environment, you can change the definition of where() to return a separately
|
||||
packaged CA bundle.
|
||||
+
|
||||
+This Fedora-patched package returns "/etc/ssl/certs/ca-certificates.crt" provided
|
||||
+by the ca-certificates RPM package.
|
||||
"""
|
||||
-from certifi import where
|
||||
+try:
|
||||
+ from certifi import where
|
||||
+except ImportError:
|
||||
+ def where():
|
||||
+ """Return the absolute path to the system CA bundle."""
|
||||
+ return '/etc/ssl/certs/ca-certificates.crt'
|
||||
+
|
||||
|
||||
if __name__ == '__main__':
|
||||
print(where())
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 93a8507..2db9569 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -45,7 +45,6 @@ requires = [
|
||||
'chardet>=3.0.2,<3.1.0',
|
||||
'idna>=2.5,<2.8',
|
||||
'urllib3>=1.21.1,<1.24',
|
||||
- 'certifi>=2017.4.17'
|
||||
|
||||
]
|
||||
test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0']
|
||||
--
|
||||
2.9.4
|
||||
|
||||
+95
@@ -0,0 +1,95 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>python-requests</Name>
|
||||
<Homepage>http://www.python-requests.org/</Homepage>
|
||||
<Packager>
|
||||
<Name>Ergün Salman</Name>
|
||||
<Email>ergunsalman@hotmail.com</Email>
|
||||
</Packager>
|
||||
<Summary>Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.</Summary>
|
||||
<Description>Python’s standard urllib2 module provides most of the HTTP capabilities you need</Description>
|
||||
<License>MIT</License>
|
||||
<Archive sha1sum="c22ed0a553f8dc37e5c2a965048d81a5ccfaff95" type="targz">https://files.pythonhosted.org/packages/01/62/ddcf76d1d19885e8579acb1b1df26a852b03472c0e46d2b959a714c90608/requests-2.22.0.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>python-devel</Dependency>
|
||||
<Dependency>python-setuptools</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- <Patch level="1">dont-import-OrderedDict-from-urllib3.patch</Patch> -->
|
||||
<!-- <Patch level="1">patch-requests-certs.py-to-use-the-system-CA-bundle.patch</Patch> -->
|
||||
<Patch level="1">certs.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>python-requests</Name>
|
||||
<!--RuntimeDependencies>
|
||||
<Dependency>python-devel</Dependency>
|
||||
</RuntimeDependencies-->
|
||||
<Files>
|
||||
<Path fileType="data">/usr/lib</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2019-10-03</Date>
|
||||
<Version>2.22.0</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>idris Kalp</Name>
|
||||
<Email>idriskalp@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2018-09-21</Date>
|
||||
<Version>2.19.1</Version>
|
||||
<Comment>Rebuild certifi.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2018-08-15</Date>
|
||||
<Version>2.19.1</Version>
|
||||
<Comment>Version Bump.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2017-09-04</Date>
|
||||
<Version>2.13.0</Version>
|
||||
<Comment>remove unneeded runtime dep.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2017-01-25</Date>
|
||||
<Version>2.13.0</Version>
|
||||
<Comment>Version Bump</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2016-06-09</Date>
|
||||
<Version>2.9.1</Version>
|
||||
<Comment>Release Bump</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-06-06</Date>
|
||||
<Version>2.9.1</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2016-05-08</Date>
|
||||
<Version>2.9.1</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user