[arch-commits] Commit in python-dephell/trunk (2 files)

[Eli Schwartz]

    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 <eschwartz at archlinux.org>
 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
===================================================================
--- PKGBUILD	2020-06-11 01:03:28 UTC (rev 641895)
+++ PKGBUILD	2020-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'
+            'acbe38854daef23a6cb752bfa98323ae5c7f85cca8562cb070d59e11e05991b0')
+b2sums=('7ab8e2022134ff11a39476e121388e627b434b5568bd39879f60a9f14cb27cfee153d27df880fd755c5ab0b0c44fa960a9330df4d2bb15c55b03ffaaa600cbf2'
+        'b69a0f264700c93144adddf86ee133ca15a5e373dc077bc9d24010cce6238a779435e48cab41bf47b72482c357e790ac9bafeafb89b85a36c29769601300a2cf')
 
 prepare() {
     cd "${srcdir}"/${_pkgname}-${pkgver}
@@ -52,7 +52,8 @@
     cd "${srcdir}"/${_pkgname}-${pkgver}
 
     # skip git tests, which rely on being run from dephell's own git repo
-    python -m pytest -k 'not test_git_git'
+    # skip doc test, which tests whether html docs not in the tarball, cover all commands
+    python -m pytest -k 'not test_git_git and not test_docs' --no-network
 }
 
 package() {