[arch-commits] Commit in python-poetry/repos/community-any (5 files)
Eli Schwartz
eschwartz at archlinux.org
Tue Apr 28 02:12:56 UTC 2020
Date: Tuesday, April 28, 2020 @ 02:12:56
Author: eschwartz
Revision: 621957
archrelease: copy trunk to community-any
Added:
python-poetry/repos/community-any/0001-Suppress-dependency-versions-which-are-known-to-be-t.patch
(from rev 621956, python-poetry/trunk/0001-Suppress-dependency-versions-which-are-known-to-be-t.patch)
python-poetry/repos/community-any/PKGBUILD
(from rev 621956, python-poetry/trunk/PKGBUILD)
python-poetry/repos/community-any/poetry-completions-generator
(from rev 621956, python-poetry/trunk/poetry-completions-generator)
Deleted:
python-poetry/repos/community-any/PKGBUILD
python-poetry/repos/community-any/poetry-completions-generator
-----------------------------------------------------------------+
0001-Suppress-dependency-versions-which-are-known-to-be-t.patch | 50 +++
PKGBUILD | 146 +++++-----
poetry-completions-generator | 30 +-
3 files changed, 138 insertions(+), 88 deletions(-)
Copied: python-poetry/repos/community-any/0001-Suppress-dependency-versions-which-are-known-to-be-t.patch (from rev 621956, python-poetry/trunk/0001-Suppress-dependency-versions-which-are-known-to-be-t.patch)
===================================================================
--- 0001-Suppress-dependency-versions-which-are-known-to-be-t.patch (rev 0)
+++ 0001-Suppress-dependency-versions-which-are-known-to-be-t.patch 2020-04-28 02:12:56 UTC (rev 621957)
@@ -0,0 +1,50 @@
+From 983be1fa0e0780c816147d994e97846c8a2f6db9 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at archlinux.org>
+Date: Mon, 27 Apr 2020 21:51:57 -0400
+Subject: [PATCH] Suppress dependency versions which are known to be too
+ pessimistic
+
+These all work just fine in reported use and should not be pinned; we
+package versions in Arch which are "too new".
+---
+ pyproject.toml | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 519fb37..06a31c3 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -27,15 +27,15 @@ cleo = "^0.7.6"
+ clikit = "^0.4.2"
+ requests = "^2.18"
+ cachy = "^0.3.0"
+-requests-toolbelt = "^0.8.0"
++requests-toolbelt = "*"
+ jsonschema = "^3.1"
+-pyrsistent = "^0.14.2"
++pyrsistent = "*"
+ pyparsing = "^2.2"
+ cachecontrol = { version = "^0.12.4", extras = ["filecache"] }
+ pkginfo = "^1.4"
+ html5lib = "^1.0"
+ shellingham = "^1.1"
+-tomlkit = "^0.5.11"
++tomlkit = "*"
+ pexpect = "^4.7.0"
+
+ # The typing module is not in the stdlib in Python 2.7 and 3.4
+@@ -49,10 +49,7 @@ glob2 = { version = "^0.6", python = "~2.7 || ~3.4" }
+ virtualenv = { version = "^16.7.9", python = "~2.7" }
+ # functools32 is needed for Python 2.7
+ functools32 = { version = "^3.2.3", python = "~2.7" }
+-keyring = [
+- { version = "^18.0.1", python = "~2.7 || ~3.4" },
+- { version = "^20.0.1", python = "^3.5" }
+-]
++keyring = "*"
+ # Use subprocess32 for Python 2.7 and 3.4
+ subprocess32 = { version = "^3.5", python = "~2.7 || ~3.4" }
+ importlib-metadata = {version = "~1.1.3", python = "<3.8"}
+--
+2.26.2
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-28 02:12:32 UTC (rev 621956)
+++ PKGBUILD 2020-04-28 02:12:56 UTC (rev 621957)
@@ -1,73 +0,0 @@
-# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-
-_pkgname=poetry
-pkgname=python-poetry
-pkgver=1.0.5
-pkgrel=1
-pkgdesc="Python dependency management and packaging made easy"
-arch=('any')
-url="https://poetry.eustace.io/"
-license=('MIT')
-_deps=('cachecontrol' 'cachy' 'cleo' 'html5lib' 'jsonschema' 'lockfile'
- 'pkginfo' 'pyparsing' 'pyrsistent' 'requests' 'requests-toolbelt'
- 'shellingham' 'tomlkit' 'keyring' 'pexpect')
-depends=("${_deps[@]/#/python-}")
-checkdepends=('git' 'python-pytest' 'python-pytest-mock' 'python-httpretty')
-provides=('poetry')
-conflicts=('poetry')
-replaces=('poetry')
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/sdispater/${_pkgname}/archive/${pkgver}.tar.gz"
- "poetry-completions-generator")
-sha256sums=('9743e98177552ee6229cc05a35e6a8c7e4506280db66f0f7822ae1e48e651fdc'
- '970225289188ea8dc49fbec8a2bfe0c891aee80ff56ba6e69bdd8afef8bccab6')
-b2sums=('7a53b6b60ec04e45b40bbf1be4147aa0f05fe34258c8dedc1235a8b2e67bdb13adc5e7fca48899a62c2fa822dc4124ac53aaabd0094244aa44ddff95bdd83173'
- '3fd62e7936d7547dcd06a1a7519f176a1597553ecc959144a4be799bb7e2d688e187f14604d3e359ed10c128c722ebd588c07ca318e0be0a31d276dcb388e2e1')
-
-prepare() {
- cd "${srcdir}"/${_pkgname}-${pkgver}
-
- python -m poetry build -f sdist
- tar xf dist/${_pkgname}-${pkgver}.tar.gz
-}
-
-build() {
- cd "${srcdir}"/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}
-
- python setup.py build
-}
-
-check() {
- cd "${srcdir}"/${_pkgname}-${pkgver}
-
- # only works inside git repositories
- pytest \
- -k 'not test_default_with_excluded_data ' \
- --ignore tests/console/commands/test_add.py \
- --ignore tests/console/commands/test_export.py \
- --ignore tests/console/commands/test_show.py
-}
-
-package() {
- cd "${srcdir}"/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}
-
- python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
- # install completions, which for some crazy reason hardcode the filename
- # used to invoke which is __main__.py if we use python -m poetry, and also
- # adds the full directory path???
- install -m755 "${srcdir}"/poetry-completions-generator ./poetry-completions-generator
- ./poetry-completions-generator completions bash | sed "\|${srcdir}|d" | \
- install -Dm644 /dev/stdin "${pkgdir}"/usr/share/bash-completion/completions/poetry
- ./poetry-completions-generator completions zsh | sed "\|${srcdir}|d" | \
- install -Dm644 /dev/stdin "${pkgdir}"/usr/share/zsh/site-functions/_poetry
- ./poetry-completions-generator completions fish | \
- install -Dm644 /dev/stdin "${pkgdir}"/usr/share/fish/vendor_completions.d/poetry.fish
-
- sed -i \
- -e "s/pyrsistent.*/pyrsistent/g" \
- -e "s/requests-toolbelt.*/requests-toolbelt/g" \
- -e "s/keyring.*/keyring/g" \
- "${pkgdir}"/usr/lib/python3.8/site-packages/poetry-${pkgver}-py3.8.egg-info/requires.txt
-}
Copied: python-poetry/repos/community-any/PKGBUILD (from rev 621956, python-poetry/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-28 02:12:56 UTC (rev 621957)
@@ -0,0 +1,73 @@
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+
+_pkgname=poetry
+pkgname=python-poetry
+pkgver=1.0.5
+pkgrel=2
+pkgdesc="Python dependency management and packaging made easy"
+arch=('any')
+url="https://poetry.eustace.io/"
+license=('MIT')
+_deps=('cachecontrol' 'cachy' 'cleo' 'html5lib' 'jsonschema' 'lockfile'
+ 'pkginfo' 'pyparsing' 'pyrsistent' 'requests' 'requests-toolbelt'
+ 'shellingham' 'tomlkit' 'keyring' 'pexpect')
+depends=("${_deps[@]/#/python-}")
+makedepends=('python-dephell')
+checkdepends=('git' 'python-pytest' 'python-pytest-mock' 'python-httpretty')
+provides=('poetry')
+conflicts=('poetry')
+replaces=('poetry')
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/sdispater/${_pkgname}/archive/${pkgver}.tar.gz"
+ "0001-Suppress-dependency-versions-which-are-known-to-be-t.patch"
+ "poetry-completions-generator")
+sha256sums=('9743e98177552ee6229cc05a35e6a8c7e4506280db66f0f7822ae1e48e651fdc'
+ 'c53954bd03a76c72e279f046646b9144a592bd64d24717d778fda70eae75a519'
+ '970225289188ea8dc49fbec8a2bfe0c891aee80ff56ba6e69bdd8afef8bccab6')
+b2sums=('7a53b6b60ec04e45b40bbf1be4147aa0f05fe34258c8dedc1235a8b2e67bdb13adc5e7fca48899a62c2fa822dc4124ac53aaabd0094244aa44ddff95bdd83173'
+ '1c4c3aa93a2be5bb586e9dbac34b808c417541261743042906a334a647103359302a5d68e9b3bd837907ea6ea3b86bc4b6b0b415cd2dff94bd64899f76aacbda'
+ '3fd62e7936d7547dcd06a1a7519f176a1597553ecc959144a4be799bb7e2d688e187f14604d3e359ed10c128c722ebd588c07ca318e0be0a31d276dcb388e2e1')
+
+prepare() {
+ cd "${srcdir}"/${_pkgname}-${pkgver}
+
+ # fix various overly restrictive version pinning
+ patch -p1 -i ../0001-Suppress-dependency-versions-which-are-known-to-be-t.patch
+
+ dephell deps convert --from pyproject.toml --to setup.py
+}
+
+build() {
+ cd "${srcdir}"/${_pkgname}-${pkgver}
+
+ python setup.py build
+}
+
+check() {
+ cd "${srcdir}"/${_pkgname}-${pkgver}
+
+ # only works inside git repositories
+ pytest \
+ -k 'not test_default_with_excluded_data ' \
+ --ignore tests/console/commands/test_add.py \
+ --ignore tests/console/commands/test_export.py \
+ --ignore tests/console/commands/test_show.py
+}
+
+package() {
+ cd "${srcdir}"/${_pkgname}-${pkgver}
+
+ python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+ # install completions, which for some crazy reason hardcode the filename
+ # used to invoke which is __main__.py if we use python -m poetry, and also
+ # adds the full directory path???
+ install -m755 "${srcdir}"/poetry-completions-generator ./poetry-completions-generator
+ ./poetry-completions-generator completions bash | sed "\|${srcdir}|d" | \
+ install -Dm644 /dev/stdin "${pkgdir}"/usr/share/bash-completion/completions/poetry
+ ./poetry-completions-generator completions zsh | sed "\|${srcdir}|d" | \
+ install -Dm644 /dev/stdin "${pkgdir}"/usr/share/zsh/site-functions/_poetry
+ ./poetry-completions-generator completions fish | \
+ install -Dm644 /dev/stdin "${pkgdir}"/usr/share/fish/vendor_completions.d/poetry.fish
+}
Deleted: poetry-completions-generator
===================================================================
--- poetry-completions-generator 2020-04-28 02:12:32 UTC (rev 621956)
+++ poetry-completions-generator 2020-04-28 02:12:56 UTC (rev 621957)
@@ -1,15 +0,0 @@
-#!/usr/bin/python3
-
-# This is a dummy script that fakes its own sys.argv[0] to make the completions
-# subcommand do the correct thing when run from the build directory. cleo's
-# completion generator uses this to generate completions for sys.argv[0] as well
-# as (???) os.path.join(os.getcwd(), sys.argv[0]) for mysterious reasons.
-#
-# We don't want to complete 'poetry/__main__.py'....
-
-import sys
-from poetry.console import main
-
-sys.argv = ['poetry', 'completions', sys.argv.pop()]
-
-main()
Copied: python-poetry/repos/community-any/poetry-completions-generator (from rev 621956, python-poetry/trunk/poetry-completions-generator)
===================================================================
--- poetry-completions-generator (rev 0)
+++ poetry-completions-generator 2020-04-28 02:12:56 UTC (rev 621957)
@@ -0,0 +1,15 @@
+#!/usr/bin/python3
+
+# This is a dummy script that fakes its own sys.argv[0] to make the completions
+# subcommand do the correct thing when run from the build directory. cleo's
+# completion generator uses this to generate completions for sys.argv[0] as well
+# as (???) os.path.join(os.getcwd(), sys.argv[0]) for mysterious reasons.
+#
+# We don't want to complete 'poetry/__main__.py'....
+
+import sys
+from poetry.console import main
+
+sys.argv = ['poetry', 'completions', sys.argv.pop()]
+
+main()
More information about the arch-commits
mailing list