[arch-commits] Commit in python-poetry/repos/community-staging-any (6 files)
Felix Yan
felixonmars at archlinux.org
Fri Nov 20 21:46:19 UTC 2020
Date: Friday, November 20, 2020 @ 21:46:19
Author: felixonmars
Revision: 758152
archrelease: copy trunk to community-staging-any
Added:
python-poetry/repos/community-staging-any/0001-Suppress-dependency-versions-which-are-known-to-be-t.patch
(from rev 758149, python-poetry/trunk/0001-Suppress-dependency-versions-which-are-known-to-be-t.patch)
python-poetry/repos/community-staging-any/PKGBUILD
(from rev 758149, python-poetry/trunk/PKGBUILD)
python-poetry/repos/community-staging-any/poetry-completions-generator
(from rev 758150, python-poetry/trunk/poetry-completions-generator)
Deleted:
python-poetry/repos/community-staging-any/0001-Suppress-dependency-versions-which-are-known-to-be-t.patch
python-poetry/repos/community-staging-any/PKGBUILD
python-poetry/repos/community-staging-any/poetry-completions-generator
-----------------------------------------------------------------+
0001-Suppress-dependency-versions-which-are-known-to-be-t.patch | 136 ++++-----
PKGBUILD | 150 +++++-----
poetry-completions-generator | 30 +-
3 files changed, 160 insertions(+), 156 deletions(-)
Deleted: 0001-Suppress-dependency-versions-which-are-known-to-be-t.patch
===================================================================
--- 0001-Suppress-dependency-versions-which-are-known-to-be-t.patch 2020-11-20 21:46:15 UTC (rev 758151)
+++ 0001-Suppress-dependency-versions-which-are-known-to-be-t.patch 2020-11-20 21:46:19 UTC (rev 758152)
@@ -1,68 +0,0 @@
-From 1ab9a805b13959f1e8702dab919925713643500d 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".
-
-Also fix completely broken dependency pinning which tries to enforce
-minimum versions of dependencies, but pins it twice, once with more
-relaxed pinning for older versions of python. If an old version works,
-it works irrespective of the python version, and you don't need to use
-minimum requirements as your mallet to force people to upgrade to the
-latest version anyway.
-https://github.com/dephell/dephell/issues/330
----
- pyproject.toml | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 7a38469..152e7af 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,19 +49,13 @@ 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"}
-
- [tool.poetry.dev-dependencies]
--pytest = [
-- {version = "^4.1", python = "<3.5"},
-- {version = "^5.4.3", python = ">=3.5"}
--]
-+pytest = { version = ">=4.1" }
- pytest-cov = "^2.5"
- mkdocs = { version = "^1.0", python = "~2.7.9 || ^3.4" }
- pymdown-extensions = "^6.0"
---
-2.27.0
-
Copied: python-poetry/repos/community-staging-any/0001-Suppress-dependency-versions-which-are-known-to-be-t.patch (from rev 758149, 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-11-20 21:46:19 UTC (rev 758152)
@@ -0,0 +1,68 @@
+From 1ab9a805b13959f1e8702dab919925713643500d 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".
+
+Also fix completely broken dependency pinning which tries to enforce
+minimum versions of dependencies, but pins it twice, once with more
+relaxed pinning for older versions of python. If an old version works,
+it works irrespective of the python version, and you don't need to use
+minimum requirements as your mallet to force people to upgrade to the
+latest version anyway.
+https://github.com/dephell/dephell/issues/330
+---
+ pyproject.toml | 16 +++++-----------
+ 1 file changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 7a38469..152e7af 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,19 +49,13 @@ 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"}
+
+ [tool.poetry.dev-dependencies]
+-pytest = [
+- {version = "^4.1", python = "<3.5"},
+- {version = "^5.4.3", python = ">=3.5"}
+-]
++pytest = { version = ">=4.1" }
+ pytest-cov = "^2.5"
+ mkdocs = { version = "^1.0", python = "~2.7.9 || ^3.4" }
+ pymdown-extensions = "^6.0"
+--
+2.27.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-20 21:46:15 UTC (rev 758151)
+++ PKGBUILD 2020-11-20 21:46:19 UTC (rev 758152)
@@ -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.10
-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=('fc6d236cca39c73e66f7467e875a02191fd0664303eff88b3723ab41508cad7c'
- '14362e48099d14530905fe7b65650c7e074bfe10f05fffa516b0d0e095df16a8'
- '970225289188ea8dc49fbec8a2bfe0c891aee80ff56ba6e69bdd8afef8bccab6')
-b2sums=('ffac88837810cc49687530fe8448335806182cdf04ac5a34c610e279c295159f0883f66994f4aa3731dbb5ebaf54bcb2993779738e086747676e3c4ba2859d87'
- '241da60804f7c9a486c3d57efe1984345fa93b697d78d494f1f339fbe27c30e072e853c12cf5def124bfccc42dcc34daa6d393f9c41284352f541956103facce'
- '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
-}
Copied: python-poetry/repos/community-staging-any/PKGBUILD (from rev 758149, python-poetry/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-20 21:46:19 UTC (rev 758152)
@@ -0,0 +1,77 @@
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+
+_pkgname=poetry
+pkgname=python-poetry
+pkgver=1.0.10
+pkgrel=3
+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=('fc6d236cca39c73e66f7467e875a02191fd0664303eff88b3723ab41508cad7c'
+ '14362e48099d14530905fe7b65650c7e074bfe10f05fffa516b0d0e095df16a8'
+ '970225289188ea8dc49fbec8a2bfe0c891aee80ff56ba6e69bdd8afef8bccab6')
+b2sums=('ffac88837810cc49687530fe8448335806182cdf04ac5a34c610e279c295159f0883f66994f4aa3731dbb5ebaf54bcb2993779738e086747676e3c4ba2859d87'
+ '241da60804f7c9a486c3d57efe1984345fa93b697d78d494f1f339fbe27c30e072e853c12cf5def124bfccc42dcc34daa6d393f9c41284352f541956103facce'
+ '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 \
+ --deselect tests/packages/test_locker.py::test_lock_file_data_is_ordered \
+ --deselect tests/packages/test_locker.py::test_lock_packages_with_null_description \
+ --deselect tests/packages/test_locker.py::test_lock_file_should_not_have_mixed_types \
+ --deselect tests/packages/test_locker.py::test_locking_legacy_repository_package_should_include_source_section
+}
+
+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-11-20 21:46:15 UTC (rev 758151)
+++ poetry-completions-generator 2020-11-20 21:46:19 UTC (rev 758152)
@@ -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-staging-any/poetry-completions-generator (from rev 758150, python-poetry/trunk/poetry-completions-generator)
===================================================================
--- poetry-completions-generator (rev 0)
+++ poetry-completions-generator 2020-11-20 21:46:19 UTC (rev 758152)
@@ -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