Date: Saturday, December 11, 2021 @ 19:31:04 Author: alerque Revision: 1068313
upgpkg: python-poetry 1.1.12-1 Modified: python-poetry/trunk/0001-Suppress-dependency-versions-which-are-known-to-be-t.patch python-poetry/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-Suppress-dependency-versions-which-are-known-to-be-t.patch | 24 + PKGBUILD | 126 +++++----- 2 files changed, 79 insertions(+), 71 deletions(-) Modified: 0001-Suppress-dependency-versions-which-are-known-to-be-t.patch =================================================================== --- 0001-Suppress-dependency-versions-which-are-known-to-be-t.patch 2021-12-11 19:26:06 UTC (rev 1068312) +++ 0001-Suppress-dependency-versions-which-are-known-to-be-t.patch 2021-12-11 19:31:04 UTC (rev 1068313) @@ -1,8 +1,3 @@ -From cc5b938f7f9e3c536f4a60c35cdd2085b3933618 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <[email protected]> -Date: Mon, 27 Apr 2020 21:51:57 -0400 -Subject: [PATCH] Fix completely broken dependencies. - poetry habitually engages in: - dependency versions which are known to be too pessimistic - multiple editions of dependencies per python version @@ -25,7 +20,19 @@ index 8c1f137..81ebc89 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -51,20 +51,13 @@ futures = { version = "^3.3.0", python = "~2.7" } +@@ -31,10 +31,7 @@ + requests = "^2.18" + cachy = "^0.3.0" + requests-toolbelt = "^0.9.1" +-cachecontrol = [ +- { version = "^0.12.4", extras = ["filecache"], python = "<3.6" }, +- { version = "^0.12.9", extras = ["filecache"], python = "^3.6" } +-] ++cachecontrol = { version = "*", extras = ["filecache"] } + pkginfo = "^1.4" + html5lib = "^1.0" + shellingham = "^1.1" +@@ -54,20 +51,13 @@ glob2 = { version = "^0.6", python = "~2.7" } # functools32 is needed for Python 2.7 functools32 = { version = "^3.2.3", python = "~2.7" } @@ -44,10 +51,7 @@ - {version = "^4.1", python = "<3.5"}, - {version = "^5.4.3", python = ">=3.5"} -] -+pytest = { version = ">=4.1" } ++pytest = "*" pytest-cov = "^2.5" pytest-mock = "^1.9" pre-commit = { version = "^2.6", python = "^3.6.1" } --- -2.28.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-11 19:26:06 UTC (rev 1068312) +++ PKGBUILD 2021-12-11 19:31:04 UTC (rev 1068313) @@ -1,79 +1,83 @@ -# Maintainer: Eli Schwartz <[email protected]> -# Maintainer: Sven-Hendrik Haase <[email protected]> +# Maintainer: Caleb Maclennan <[email protected]> +# Contributor: Sven-Hendrik Haase <[email protected]> +# Contributor: Eli Schwartz <[email protected]> _pkgname=poetry pkgname=python-poetry -pkgver=1.1.11 -pkgrel=3 -pkgdesc="Python dependency management and packaging made easy" -arch=('any') -url="https://poetry.eustace.io/"; -license=('MIT') -_deps=('cachecontrol' 'cachy' 'cleo' 'html5lib' 'lockfile' - 'packaging' 'pkginfo' 'poetry-core' 'requests' 'requests-toolbelt' - 'shellingham' 'tomlkit' 'keyring' 'pexpect' 'virtualenv') +pkgver=1.1.12 +pkgrel=1 +pkgdesc='Python dependency management and packaging made easy' +arch=(any) +url='https://poetry.eustace.io' +license=(MIT) +_deps=(cachecontrol + cachy + cleo + html5lib + keyring + lockfile + packaging + pexpect + pkginfo + poetry-core + requests + requests-toolbelt + shellingham + tomlkit + virtualenv) 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" - "0001-tests-cleanup-cache-and-http-usage.patch" - "poetry-completions-generator") -sha256sums=('abe56468c0ac989c9c6c4e02265806b8fb40decbf6635f1ab2515b354114705c' - '8bb321ae9ad06d4829c71727af7979bc68d7f325ccdaec919dda4fe8ac92f1a7' +makedepends=(python-dephell) +checkdepends=(git + python-httpretty + python-pytest + python-pytest-mock) +provides=(poetry) +_archive="$_pkgname-$pkgver" +source=("$_archive.tar.gz::https://github.com/sdispater/$_pkgname/archive/$pkgver.tar.gz"; + 0001-Suppress-dependency-versions-which-are-known-to-be-t.patch + 0001-tests-cleanup-cache-and-http-usage.patch + poetry-completions-generator) +sha256sums=('9e43946a1a1e021ad7ed579470dc847d53dc3f7db5aeeec380c1064a7d5bff3d' + 'db185e7c46a2c747baa4ed19f131a47f072aa149607a6076d23e64e0c766496a' '4658321c04f36fb3aced9acc44b61f2cf22c5f9d8b8c715111881b24c3e0c99b' '970225289188ea8dc49fbec8a2bfe0c891aee80ff56ba6e69bdd8afef8bccab6') -b2sums=('852a9fa3a4308515121fa77a7fc58d76f7786a5b3b0493c30bc4a72e5353bb252f7d506f3dd6fd344e93722552bea3c71bff647b7e5f4b41977b97b5ffe52298' - 'c1c65fdfa1153d3e4c872adc00f02aea055268d28cd385918a5a3d60fb355c39b15eab895cf4aebd1b74f126cc225f870d60aa971a6593855ce094b448786a02' - '8750de6ee2748a7dac079af1ff35b43dbce3f2c48249322f3322290d03f46ea95513dfd223adc232f7f73cf0ac19554de96a3b8793a0dc13b38041e87569ca19' - '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 - - # fix tests trying to write to the root directory - # See: https://github.com/python-poetry/poetry/issues/1645 - patch -p1 -i ../0001-tests-cleanup-cache-and-http-usage.patch - - dephell deps convert --from pyproject.toml --to setup.py + cd "$_archive" + # fix various overly restrictive version pinning + patch -p1 -i ../0001-Suppress-dependency-versions-which-are-known-to-be-t.patch + # fix tests trying to write to the root directory + # See: https://github.com/python-poetry/poetry/issues/1645 + patch -p1 -i ../0001-tests-cleanup-cache-and-http-usage.patch + dephell deps convert --from pyproject.toml --to setup.py } build() { - cd "${srcdir}"/${_pkgname}-${pkgver} - - python setup.py build + cd "$_archive" + python setup.py build } check() { - cd "${srcdir}"/${_pkgname}-${pkgver} - - # tries to write all over sys.executable's containing directory, and fails - # use venv instead - # See (again): https://github.com/python-poetry/poetry/issues/1645 - # python -m venv --system-site-packages --without-pip poetrytests - # ./poetrytests/bin/python -m pytest + cd "$_archive" + # tries to write all over sys.executable's containing directory, and fails + # use venv instead + # See (again): https://github.com/python-poetry/poetry/issues/1645 + # python -m venv --system-site-packages --without-pip poetrytests + # ./poetrytests/bin/python -m pytest } 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 + cd "$_archive" + 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 }
