[arch-commits] Commit in python-cookiecutter/repos/community-any (5 files)

Levente Polyak anthraxx at archlinux.org
Wed May 12 19:21:48 UTC 2021


    Date: Wednesday, May 12, 2021 @ 19:21:48
  Author: anthraxx
Revision: 932618

archrelease: copy trunk to community-any

Added:
  python-cookiecutter/repos/community-any/PKGBUILD
    (from rev 932617, python-cookiecutter/trunk/PKGBUILD)
  python-cookiecutter/repos/community-any/allow-jinja-3.0.0.patch
    (from rev 932617, python-cookiecutter/trunk/allow-jinja-3.0.0.patch)
  python-cookiecutter/repos/community-any/drop-unneeded-markupsafe-constraints.patch
    (from rev 932617, python-cookiecutter/trunk/drop-unneeded-markupsafe-constraints.patch)
Deleted:
  python-cookiecutter/repos/community-any/PKGBUILD
  python-cookiecutter/repos/community-any/allow-jinja-3.0.0.patch

--------------------------------------------+
 PKGBUILD                                   |   95 +++++++++++++--------------
 allow-jinja-3.0.0.patch                    |   44 ++++++------
 drop-unneeded-markupsafe-constraints.patch |   23 ++++++
 3 files changed, 94 insertions(+), 68 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-12 19:21:36 UTC (rev 932617)
+++ PKGBUILD	2021-05-12 19:21:48 UTC (rev 932618)
@@ -1,46 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-_name=cookiecutter
-pkgname=python-cookiecutter
-pkgver=1.7.2
-pkgrel=4
-pkgdesc="A command-line utility that creates projects from project templates"
-arch=('any')
-url="https://github.com/cookiecutter/cookiecutter"
-license=('BSD')
-depends=('python-binaryornot' 'python-click' 'python-future' 'python-jinja'
-'python-jinja-time' 'python-poyo' 'python-requests' 'python-slugify'
-'python-whichcraft')
-makedepends=('python-setuptools')
-checkdepends=('git' 'python-freezegun' 'python-pytest' 'python-pytest-cov'
-'python-pytest-mock')
-source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"
-        allow-jinja-3.0.0.patch)
-sha512sums=('8fb6db75703a2c6276d275817b81c0e5d5f15226236e8c5442fbda6198aaec19c3fd68c030f79f6bca55258c0c248660b32d1344f7d6b06ecf5563b43474d877'
-            'd83168b30cdec8d3cff6db05ea1e1cd27046d6e296be056571f5ddbcf7dc4574280444ca30dad224a1aee6dfa13e2fa81331f209f8940f71470e99808149c45e')
-
-prepare() {
-  mv -v "${_name}-${pkgver}" "$pkgname-$pkgver"
-  patch -Np1 -d "$pkgname-$pkgver" <allow-jinja-3.0.0.patch
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-  python setup.py build
-}
-
-check() {
-  cd "$pkgname-$pkgver"
-  export PYTHONPATH="build:${PYTHONPATH}"
-  pytest -v
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  python setup.py install --skip-build \
-    --optimize=1 \
-    --prefix=/usr \
-    --root="${pkgdir}"
-  install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-}

Copied: python-cookiecutter/repos/community-any/PKGBUILD (from rev 932617, python-cookiecutter/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-12 19:21:48 UTC (rev 932618)
@@ -0,0 +1,49 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+_name=cookiecutter
+pkgname=python-cookiecutter
+pkgver=1.7.2
+pkgrel=5
+pkgdesc="A command-line utility that creates projects from project templates"
+arch=('any')
+url="https://github.com/cookiecutter/cookiecutter"
+license=('BSD')
+depends=('python-binaryornot' 'python-click' 'python-future' 'python-jinja'
+'python-jinja-time' 'python-poyo' 'python-requests' 'python-slugify'
+'python-whichcraft')
+makedepends=('python-setuptools')
+checkdepends=('git' 'python-freezegun' 'python-pytest' 'python-pytest-cov'
+'python-pytest-mock')
+source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"
+        allow-jinja-3.0.0.patch
+        drop-unneeded-markupsafe-constraints.patch)
+sha512sums=('8fb6db75703a2c6276d275817b81c0e5d5f15226236e8c5442fbda6198aaec19c3fd68c030f79f6bca55258c0c248660b32d1344f7d6b06ecf5563b43474d877'
+            'd83168b30cdec8d3cff6db05ea1e1cd27046d6e296be056571f5ddbcf7dc4574280444ca30dad224a1aee6dfa13e2fa81331f209f8940f71470e99808149c45e'
+            'ec7ff08abed877afd163703dbc362c0cb47bb97539ac464daeaef9b63445a03340a1f35b541977ab4b39f832c13c3846e81890a24b19a624266917abb92a21ee')
+
+prepare() {
+  mv -v "${_name}-${pkgver}" "$pkgname-$pkgver"
+  patch -Np1 -d "$pkgname-$pkgver" <allow-jinja-3.0.0.patch
+  patch -Np1 -d "$pkgname-$pkgver" <drop-unneeded-markupsafe-constraints.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  python setup.py build
+}
+
+check() {
+  cd "$pkgname-$pkgver"
+  export PYTHONPATH="build:${PYTHONPATH}"
+  pytest -v
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  python setup.py install --skip-build \
+    --optimize=1 \
+    --prefix=/usr \
+    --root="${pkgdir}"
+  install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+}

Deleted: allow-jinja-3.0.0.patch
===================================================================
--- allow-jinja-3.0.0.patch	2021-05-12 19:21:36 UTC (rev 932617)
+++ allow-jinja-3.0.0.patch	2021-05-12 19:21:48 UTC (rev 932618)
@@ -1,22 +0,0 @@
-From c48119dd015274cc645f27396e645dcc1edb9dca Mon Sep 17 00:00:00 2001
-From: Wouter De Borger <wouter.deborger at inmanta.com>
-Date: Wed, 12 May 2021 15:24:42 +0200
-Subject: [PATCH] allow jinja 3.0.0 (#1548)
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index fca2a82..f36f57b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -9,7 +9,7 @@ with open('README.md', encoding='utf-8') as readme_file:
- 
- requirements = [
-     'binaryornot>=0.4.4',
--    'Jinja2<3.0.0',
-+    'Jinja2<4.0.0',
-     'click>=7.0',
-     'pyyaml>=5.3.1',
-     'jinja2-time>=0.2.0',

Copied: python-cookiecutter/repos/community-any/allow-jinja-3.0.0.patch (from rev 932617, python-cookiecutter/trunk/allow-jinja-3.0.0.patch)
===================================================================
--- allow-jinja-3.0.0.patch	                        (rev 0)
+++ allow-jinja-3.0.0.patch	2021-05-12 19:21:48 UTC (rev 932618)
@@ -0,0 +1,22 @@
+From c48119dd015274cc645f27396e645dcc1edb9dca Mon Sep 17 00:00:00 2001
+From: Wouter De Borger <wouter.deborger at inmanta.com>
+Date: Wed, 12 May 2021 15:24:42 +0200
+Subject: [PATCH] allow jinja 3.0.0 (#1548)
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index fca2a82..f36f57b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -9,7 +9,7 @@ with open('README.md', encoding='utf-8') as readme_file:
+ 
+ requirements = [
+     'binaryornot>=0.4.4',
+-    'Jinja2<3.0.0',
++    'Jinja2<4.0.0',
+     'click>=7.0',
+     'pyyaml>=5.3.1',
+     'jinja2-time>=0.2.0',

Copied: python-cookiecutter/repos/community-any/drop-unneeded-markupsafe-constraints.patch (from rev 932617, python-cookiecutter/trunk/drop-unneeded-markupsafe-constraints.patch)
===================================================================
--- drop-unneeded-markupsafe-constraints.patch	                        (rev 0)
+++ drop-unneeded-markupsafe-constraints.patch	2021-05-12 19:21:48 UTC (rev 932618)
@@ -0,0 +1,23 @@
+From cf0495159a12ca5aa146b625b0083681e9636932 Mon Sep 17 00:00:00 2001
+From: Sorin Sbarnea <ssbarnea at redhat.com>
+Date: Wed, 12 May 2021 14:31:25 +0100
+Subject: [PATCH] Remove direct dependency on markupsafe
+
+This sorts potential dependency conflicts with jinja2 which is the
+only place where markupsafe is used (since version 2.7)
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f36f57be..124dc40c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,6 @@
+     'python-slugify>=4.0.0',
+     'requests>=2.23.0',
+     'six>=1.10',
+-    'MarkupSafe<2.0.0',
+ ]
+ 
+ setup(



More information about the arch-commits mailing list