[arch-commits] Commit in python-dephell/repos/community-any (4 files)
Eli Schwartz
eschwartz at archlinux.org
Mon Mar 30 18:55:09 UTC 2020
Date: Monday, March 30, 2020 @ 18:55:08
Author: eschwartz
Revision: 607110
archrelease: copy trunk to community-any
Added:
python-dephell/repos/community-any/0001-Do-not-override-the-system-SSL-certificates-with-the.patch
(from rev 607109, python-dephell/trunk/0001-Do-not-override-the-system-SSL-certificates-with-the.patch)
python-dephell/repos/community-any/PKGBUILD
(from rev 607109, python-dephell/trunk/PKGBUILD)
Deleted:
python-dephell/repos/community-any/0001-Do-not-override-the-system-SSL-certificates-with-the.patch
python-dephell/repos/community-any/PKGBUILD
-----------------------------------------------------------------+
0001-Do-not-override-the-system-SSL-certificates-with-the.patch | 94 +++---
PKGBUILD | 136 +++++-----
2 files changed, 127 insertions(+), 103 deletions(-)
Deleted: 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:54:49 UTC (rev 607109)
+++ 0001-Do-not-override-the-system-SSL-certificates-with-the.patch 2020-03-30 18:55:08 UTC (rev 607110)
@@ -1,40 +0,0 @@
-From 4ad8b8276699f7d24178e66d0ea4147b776a0234 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
- 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
-
Copied: python-dephell/repos/community-any/0001-Do-not-override-the-system-SSL-certificates-with-the.patch (from rev 607109, python-dephell/trunk/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 2020-03-30 18:55:08 UTC (rev 607110)
@@ -0,0 +1,54 @@
+From 34bda6658067630dd28b732cc7b8ba259ebf919a 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
+ 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 +------
+ setup.py | 2 +-
+ 2 files changed, 2 insertions(+), 7 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)
+
+
+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.25.2
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-30 18:54:49 UTC (rev 607109)
+++ PKGBUILD 2020-03-30 18:55:08 UTC (rev 607110)
@@ -1,63 +0,0 @@
-# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
-
-_pkgname=dephell
-pkgname=python-dephell
-pkgver=0.8.0
-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' 'bowler' 'cerberus' 'dephell-archive' 'dephell-argparse' 'dephell-discover'
- 'dephell-licenses' 'dephell-links' 'dephell-markers' 'dephell-pythons' 'dephell-setuptools'
- 'dephell-shells' 'dephell-specifier' 'dephell-venvs' 'dephell-versioning'
- 'docker' 'dockerpty' 'flatdict' 'html5lib' 'jinja' 'packaging'
- 'pip' 'pygments' 'requests' 'ruamel-yaml' 'setuptools' 'tabulate' 'tomlkit' 'yaspin')
-depends=("${_deps[@]/#/python-}" 'm2r')
-checkdepends=('git' 'python-pytest' 'python-aioresponses' 'python-requests-mock')
-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'
- 'f379265aecef50dd45026f777f68725348083c8fb8aa57e14733883067d52aa1ea39e1affc2f4b84e7574e64695bb84a1c13ca5a0f691e089ae5a9438eedab07')
-
-prepare() {
- cd "${srcdir}"/${_pkgname}-${pkgver}
-
- # bad certifi
- patch -p1 -i ../0001-Do-not-override-the-system-SSL-certificates-with-the.patch
-
- # pycache slipped into release tarballs
- find . -name \*.pyc -delete
-}
-
-build(){
- cd "${srcdir}"/${_pkgname}-${pkgver}
-
- python setup.py build
-}
-
-check() {
- 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'
-}
-
-package() {
- cd "${srcdir}"/${_pkgname}-${pkgver}
-
- python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
- # make shell completions
- python -c 'from dephell.actions._autocomplete import make_bash_autocomplete as comp; print(comp())' | \
- install -Dm644 /dev/stdin "${pkgdir}"/usr/share/bash-completion/completions/dephell
-
- # rewrite zsh completion to support autoloading
- { printf '#compdef dephell\n'
- python -c 'from dephell.actions._autocomplete import make_zsh_autocomplete as comp; print(comp())' | \
- sed 's/^compdef _dephell dephell$/_dephell/'
- } | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/zsh/site-functions/_dephell
-}
Copied: python-dephell/repos/community-any/PKGBUILD (from rev 607109, python-dephell/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-30 18:55:08 UTC (rev 607110)
@@ -0,0 +1,73 @@
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+
+_pkgname=dephell
+pkgname=python-dephell
+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' 'changelogs' 'discover' 'licenses' 'links' 'markers'
+ 'pythons' 'setuptools' 'shells' 'specifier' 'venvs' 'versioning')
+_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=('44896e11545c242b9933ad897468dea0041b84785df41eb39935b7aa931a48a1'
+ '1a1157ba7660db1c72e729fd17460a78ed24521e85643ce0097be709bfb48cc5')
+b2sums=('0bb41521d221e2f97352b1b44fbeec9c48f06b05b7f359cdc18eba93d89d5b879aed013c81df2dfdfa27c9b1bac952e67b83ec38e0a6a00f7b07ac8242c1d6a3'
+ 'c5bcd919af73efae8f606231003215af778b326617313e04f9bd0cfd653c20a870363a2fae69c9b23f55bf5a58880c972178b04a13d5e414ab42e35939bc5786')
+
+prepare() {
+ cd "${srcdir}"/${_pkgname}-${pkgver}
+
+ # bad certifi
+ patch -p1 -i ../0001-Do-not-override-the-system-SSL-certificates-with-the.patch
+
+ # don't lock pip version to below pip 20:
+ # https://github.com/dephell/dephell/pull/363#issuecomment-606150965
+ # because https://github.com/pypa/pip/issues/7629 seems insufficient
+ # to hold up non-PyPY platforms :/
+ sed -i 's/pip<=19.3.1,>=18.0/pip/' setup.py
+}
+
+build(){
+ cd "${srcdir}"/${_pkgname}-${pkgver}
+
+ python setup.py build
+}
+
+check() {
+ 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'
+}
+
+package() {
+ cd "${srcdir}"/${_pkgname}-${pkgver}
+
+ python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+ # make shell completions
+ python -c 'from dephell.actions._autocomplete import make_bash_autocomplete as comp; print(comp())' | \
+ install -Dm644 /dev/stdin "${pkgdir}"/usr/share/bash-completion/completions/dephell
+
+ # rewrite zsh completion to support autoloading
+ { printf '#compdef dephell\n'
+ python -c 'from dephell.actions._autocomplete import make_zsh_autocomplete as comp; print(comp())' | \
+ sed 's/^compdef _dephell dephell$/_dephell/'
+ } | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/zsh/site-functions/_dephell
+}
More information about the arch-commits
mailing list