[arch-commits] Commit in python-dephell/trunk (2 files)
Date: Thursday, June 11, 2020 @ 01:54:31
Author: eschwartz
Revision: 641896
upgpkg: python-dephell 0.8.3-1: upstream release
- disable some new tests which we don't need to run
- reapply patch to use system certs -- the code was refactored
Modified:
python-dephell/trunk/0001-Do-not-override-the-system-SSL-certificates-with-the.patch
python-dephell/trunk/PKGBUILD
-+
0001-Do-not-override-the-system-SSL-certificates-with-the.patch | 49
+-
PKGBUILD| 13 +-
2 files changed, 32 insertions(+), 30 deletions(-)
Modified: 0001-Do-not-override-the-system-SSL-certificates-with-the.patch
===
--- 0001-Do-not-override-the-system-SSL-certificates-with-the.patch
2020-06-11 01:03:28 UTC (rev 641895)
+++ 0001-Do-not-override-the-system-SSL-certificates-with-the.patch
2020-06-11 01:54:31 UTC (rev 641896)
@@ -1,4 +1,4 @@
-From 34bda6658067630dd28b732cc7b8ba259ebf919a Mon Sep 17 00:00:00 2001
+From 9e8c2fd8abef936fa483da40f3819100b5e3b520 Mon Sep 17 00:00:00 2001
From: Eli Schwartz
Date: Tue, 6 Aug 2019 19:43:13 -0400
Subject: [PATCH] Do not override the system SSL certificates with the certifi
@@ -6,41 +6,42 @@
We need to respect the system certification policy, and by default the
ssl module will use our packaged ca-certificates.
+
+ssl.create_default_context(cafile=None) is the default to use the
+builtin (system) certs, but can be overridden on the command line. I
+don't know why one would wish to do so, but eh, this patch is less
+invasive than the previous patch.
---
- dephell/networking.py | 7 +--
+ dephell/networking.py | 3 +--
setup.py | 2 +-
- 2 files changed, 2 insertions(+), 7 deletions(-)
+ 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dephell/networking.py b/dephell/networking.py
-index 9f862be..b33e1b1 100644
+index faa91d3..61f836f 100644
--- a/dephell/networking.py
+++ b/dephell/networking.py
-@@ -2,7 +2,6 @@
- from ssl import create_default_context
+@@ -6,7 +6,6 @@ from time import sleep
+ from typing import Any, Optional
# external
-import certifi
import requests
- from aiohttp import ClientSession, TCPConnector
-
-@@ -17,11 +16,7 @@ def aiohttp_session(*, auth=None, **kwargs):
- headers = dict()
- if auth:
- headers['Authorization'] = auth.encode()
--ssl_context = create_default_context(cafile=certifi.where())
--try:
--connector = TCPConnector(ssl=ssl_context)
--except TypeError:
--connector = TCPConnector(ssl_context=ssl_context)
-+connector = TCPConnector()
- return ClientSession(headers=headers, connector=connector, **kwargs)
-
-
+ from aiohttp import ClientError, ClientSession, TCPConnector
+ from requests.sessions import Session
+@@ -31,7 +30,7 @@ def aiohttp_session(*, auth: Optional[Auth] = None,
**kwargs: Any) -> ClientSess
+ # setup SSL
+ cafile = config.get('ca')
+ if not cafile:
+-cafile = certifi.where()
++cafile = None
+ ssl_context = create_default_context(cafile=cafile)
+ try:
+ connector = TCPConnector(ssl=ssl_context)
diff --git a/setup.py b/setup.py
-index 704ec43..4babe44 100644
+index 2db6286..7f18120 100644
--- a/setup.py
+++ b/setup.py
-@@ -54,7 +54,7 @@ setup(
+@@ -56,7 +56,7 @@ setup(
package_dir={"": "."},
package_data={"dephell": ["templates/*.j2", "templates/*.sh"]},
install_requires=[
@@ -50,5 +51,5 @@
'dephell-changelogs', 'dephell-discover>=0.2.6',
'dephell-licenses>=0.1.6', 'dephell-links>=0.1.4',
--
-2.25.2
+2.27.0
Modified: PKGBUILD
===
--- PKGBUILD2020-06-11 01:03:28 UTC (rev 641895)
+++ PKGBUILD2020-06-11 01:54:31 UTC (rev 641896)
@@ -2,7 +2,7 @@
_pkgname=dephell
pkgname=python-dephell
-pkgver=0.8.2
+pkgver=0.8.3
pkgrel=1
pkgdesc="universal Python project management: convert between formats, build,
manage venvs"
arch=('any')
@@ -24,10 +24,10 @@
'yapf: make setup.py converter produce google yapf-formatted
output')
source=("https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz";
"0001-Do-not-override-the-system-SSL-certificates-with-the.patch")
-sha256sums=('44896e11545c242b9933ad897468dea0041b84785df41eb39935b7aa931a48a1'
-'1a1157ba7660db1c72e729fd17460a78ed24521e85643ce0097be709bfb48cc5')
-b2sums=('0bb41521d221e2f97352b1b44fbeec9c48f06b05b7f359cdc18eba93d89d5b879aed013c81df2dfdfa27c9b1bac952e67b83ec38e0a6a00f7b07ac8242c1d6a3'
-
'c5bcd919af73efae8f606231003215af778b326617313e04f9bd0cfd653c20a870363a2fae69c9b23f55bf5a58880c972178b04a13d5e414ab42e35939bc5786')
+sha256sums=('a9fcc528a0c6f9f5d721292bdf846e5338e4dca7cd6fef1551fbe71564dfe61e'
+'acbe38854daef23a6cb752bfa98323ae5c
[arch-commits] Commit in python-dephell/trunk (2 files)
Date: Monday, March 30, 2020 @ 18:54:49
Author: eschwartz
Revision: 607109
upgpkg: python-dephell 0.8.2-1: upstream release
A number of dependencies are now lazy-loaded and only required by dephell[full].
Move them to optdepends, and add a few that used to be optdepends anyway.
Drop outdated workaround for pytest .pyc files, as recent versions of dephell
filter them out when creating sdists.
Relax version constraints for pip. pip 20 seems to work without issues, which
is better than not working at all, but I've pinged upstream about where to draw
the line.
Modified:
python-dephell/trunk/0001-Do-not-override-the-system-SSL-certificates-with-the.patch
python-dephell/trunk/PKGBUILD
-+
0001-Do-not-override-the-system-SSL-certificates-with-the.patch | 20 +-
PKGBUILD| 32
++
2 files changed, 38 insertions(+), 14 deletions(-)
Modified: 0001-Do-not-override-the-system-SSL-certificates-with-the.patch
===
--- 0001-Do-not-override-the-system-SSL-certificates-with-the.patch
2020-03-30 18:28:10 UTC (rev 607108)
+++ 0001-Do-not-override-the-system-SSL-certificates-with-the.patch
2020-03-30 18:54:49 UTC (rev 607109)
@@ -1,4 +1,4 @@
-From 4ad8b8276699f7d24178e66d0ea4147b776a0234 Mon Sep 17 00:00:00 2001
+From 34bda6658067630dd28b732cc7b8ba259ebf919a Mon Sep 17 00:00:00 2001
From: Eli Schwartz
Date: Tue, 6 Aug 2019 19:43:13 -0400
Subject: [PATCH] Do not override the system SSL certificates with the certifi
@@ -8,7 +8,8 @@
ssl module will use our packaged ca-certificates.
---
dephell/networking.py | 7 +--
- 1 file changed, 1 insertion(+), 6 deletions(-)
+ setup.py | 2 +-
+ 2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dephell/networking.py b/dephell/networking.py
index 9f862be..b33e1b1 100644
@@ -35,6 +36,19 @@
return ClientSession(headers=headers, connector=connector, **kwargs)
+diff --git a/setup.py b/setup.py
+index 704ec43..4babe44 100644
+--- a/setup.py
b/setup.py
+@@ -54,7 +54,7 @@ setup(
+ package_dir={"": "."},
+ package_data={"dephell": ["templates/*.j2", "templates/*.sh"]},
+ install_requires=[
+-'aiohttp', 'attrs>=19.2.0', 'cerberus>=1.3', 'certifi',
++'aiohttp', 'attrs>=19.2.0', 'cerberus>=1.3',
+ 'dephell-archive>=0.1.5', 'dephell-argparse>=0.1.1',
+ 'dephell-changelogs', 'dephell-discover>=0.2.6',
+ 'dephell-licenses>=0.1.6', 'dephell-links>=0.1.4',
--
-2.22.0
+2.25.2
Modified: PKGBUILD
===
--- PKGBUILD2020-03-30 18:28:10 UTC (rev 607108)
+++ PKGBUILD2020-03-30 18:54:49 UTC (rev 607109)
@@ -2,25 +2,32 @@
_pkgname=dephell
pkgname=python-dephell
-pkgver=0.8.0
+pkgver=0.8.2
pkgrel=1
pkgdesc="universal Python project management: convert between formats, build,
manage venvs"
arch=('any')
url="https://github.com/dephell/${_pkgname}";
license=('ISC')
-_d_deps=('archive' 'argparse' 'discover' 'licenses' 'links' 'markers'
+_d_deps=('archive' 'argparse' 'changelogs' 'discover' 'licenses' 'links'
'markers'
'pythons' 'setuptools' 'shells' 'specifier' 'venvs' 'versioning')
-_deps=('aiohttp' 'appdirs' 'attrs' 'bowler' 'cerberus'
"${_d_deps[@]/#/dephell-}"
- 'docker' 'dockerpty' 'flatdict' 'html5lib' 'jinja' 'packaging'
- 'pip' 'pygments' 'requests' 'ruamel-yaml' 'setuptools' 'tabulate'
'tomlkit' 'yaspin')
+_deps=('aiohttp' 'appdirs' 'attrs' 'bowler' 'cerberus' 'colorama'
"${_d_deps[@]/#/dephell-}"
+ 'html5lib' 'jinja' 'packaging'
+ 'pip' 'pygments' 'requests' 'ruamel-yaml' 'tabulate' 'tomlkit' 'yaspin')
depends=("${_deps[@]/#/python-}" 'm2r')
checkdepends=('git' 'python-pytest' 'python-aioresponses'
'python-requests-mock')
+optdepends=('python-aiofiles: speed up file writes for files downloaded from
warehouse'
+'python-docker: for the docker subcommand'
+'python-dockerpty: for the docker subcommand'
+'python-gnupg: for the package verify subcommand'
+'python-graphviz: print deps tree as a graph'
+'autopep8: make setup.py converter produce formatted pep8 output'
+'yapf: make setup.py converter produce google yapf-formatted
output')
source=("https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz";
"0001-Do-not-override-the-system-SSL-certificates-with-the.patch")
-sha256sums=('2ba41eb46c2915d6c4b2c0cf5ae90a6cc553b3754710b38cbe011f588bd8beb5'
-'4dc2412354c0d96956f88b2e5474652e4a87108588905510d96674ddf939b4c1')
-b2sums=('e57b3b13d82ba755485a9b5754472fc46221423cfc8d984bac6c580d93202ff0ef39d2f4cc6a900a86f0a28fc12dbc23eb6354ac9a61517f9c33085c330ba3e4'
-
'f379265aecef50dd45026f777f68725348083c8fb8aa57e14733883067d52a
[arch-commits] Commit in python-dephell/trunk (2 files)
Date: Wednesday, August 7, 2019 @ 03:45:06
Author: eschwartz
Revision: 498122
upgpkg: python-dephell 0.7.7-1
upstream release
update dependencies in accordance with new features; do not use certifi
Added:
python-dephell/trunk/0001-Do-not-override-the-system-SSL-certificates-with-the.patch
Modified:
python-dephell/trunk/PKGBUILD
-+
0001-Do-not-override-the-system-SSL-certificates-with-the.patch | 40
++
PKGBUILD| 26 --
2 files changed, 59 insertions(+), 7 deletions(-)
Added: 0001-Do-not-override-the-system-SSL-certificates-with-the.patch
===
--- 0001-Do-not-override-the-system-SSL-certificates-with-the.patch
(rev 0)
+++ 0001-Do-not-override-the-system-SSL-certificates-with-the.patch
2019-08-07 03:45:06 UTC (rev 498122)
@@ -0,0 +1,40 @@
+From 4ad8b8276699f7d24178e66d0ea4147b776a0234 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz
+Date: Tue, 6 Aug 2019 19:43:13 -0400
+Subject: [PATCH] Do not override the system SSL certificates with the certifi
+ bundle.
+
+We need to respect the system certification policy, and by default the
+ssl module will use our packaged ca-certificates.
+---
+ dephell/networking.py | 7 +--
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/dephell/networking.py b/dephell/networking.py
+index 9f862be..b33e1b1 100644
+--- a/dephell/networking.py
b/dephell/networking.py
+@@ -2,7 +2,6 @@
+ from ssl import create_default_context
+
+ # external
+-import certifi
+ import requests
+ from aiohttp import ClientSession, TCPConnector
+
+@@ -17,11 +16,7 @@ def aiohttp_session(*, auth=None, **kwargs):
+ headers = dict()
+ if auth:
+ headers['Authorization'] = auth.encode()
+-ssl_context = create_default_context(cafile=certifi.where())
+-try:
+-connector = TCPConnector(ssl=ssl_context)
+-except TypeError:
+-connector = TCPConnector(ssl_context=ssl_context)
++connector = TCPConnector()
+ return ClientSession(headers=headers, connector=connector, **kwargs)
+
+
+--
+2.22.0
+
Modified: PKGBUILD
===
--- PKGBUILD2019-08-07 02:18:19 UTC (rev 498121)
+++ PKGBUILD2019-08-07 03:45:06 UTC (rev 498122)
@@ -2,25 +2,37 @@
_pkgname=dephell
pkgname=python-dephell
-pkgver=0.7.4
+pkgver=0.7.7
pkgrel=1
pkgdesc="universal Python project management: convert between formats, build,
manage venvs"
arch=('any')
url="https://github.com/dephell/${_pkgname}";
license=('ISC')
-_deps=('aiohttp' 'appdirs' 'attrs' 'cerberus' 'dephell-archive'
'dephell-discover'
+_deps=('aiohttp' 'appdirs' 'attrs' 'bowler' 'cerberus' 'dephell-archive'
'dephell-discover'
'dephell-licenses' 'dephell-links' 'dephell-markers' 'dephell-pythons'
- 'dephell-shells' 'dephell-specifier' 'dephell-venvs' 'jinja' 'packaging'
+ 'dephell-shells' 'dephell-specifier' 'dephell-venvs'
'dephell-versioning'
+ 'docker' 'dockerpty' 'html5lib' 'jinja' 'packaging'
'pip' 'requests' 'setuptools' 'tomlkit' 'yaml' 'yaspin')
depends=("${_deps[@]/#/python-}" 'm2r')
-checkdepends=('python-pytest' 'python-aioresponses' 'python-requests-mock')
-source=("https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz";)
-sha256sums=('4e21ccaaa8366c68d7b2351ad9f06cabc381f09031878f8a880698b67885883e')
-b2sums=('8e532ae03fc2e841add6b3ea4a864cdfeafb385cdd8c1b72dc23258e9a48a49d8bd194306202807b055e3143ed51b30e84a19d26fcb0d5ccf38bd3ca5025d2cc')
+checkdepends=('git' 'python-pytest' 'python-aioresponses'
'python-requests-mock')
+source=("https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz";
+
"${url}/pull/250/commits/5cc501da4f3b1873b86d3da606f03503fc79b23f.patch"
+"0001-Do-not-override-the-system-SSL-certificates-with-the.patch")
+sha256sums=('cd3beb4d0827360ce78303d71985fb612406e965fd3b65538550315482f3ffc9'
+'23fb102ce6faf3b94ac0ccf30ea576a2a4a2f225dd11e6e55bc9207f5c8f4e0b'
+'4dc2412354c0d96956f88b2e5474652e4a87108588905510d96674ddf939b4c1')
+b2sums=('60d498f457a1166124384f77f57f08780ab4347e5512ba562c2d18baefaac73f729a963257025380edff2ca524600b067ba5d3ebb0ccda4b07e4047fffc091d2'
+
'dae22561541fd0c99ea0953edbb952da7bb84a4b0cc802b1ac66f3cbe5424190a6c959132a4a3dd7f089a7d1673d6ca6d9cc06a9ad1811e6483b35165cc09fa2'
+
'f379265aecef50dd45026f777f68725348083c8fb8aa57e14733883067d52aa1ea39e1affc2f4b84e7574e64695bb84a1c13ca5a0f691e089ae5a9438eedab07')
prepare() {
cd "${srcdir}"/${_pkgname}-${pkgver}
+# fix tests: https://github.com/dephell/dephell/pull/250
+patch -p1 -i ../5cc501da4f3b1873b86d3da606f03503fc79b23f.patch
+# bad certifi
+patch -p1 -i
../0001-Do-not-override-the-system-S
