[arch-commits] Commit in python-brotlipy/repos/community-staging-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Thu Nov 12 17:03:26 UTC 2020
Date: Thursday, November 12, 2020 @ 17:03:26
Author: felixonmars
Revision: 752207
archrelease: copy trunk to community-staging-x86_64
Added:
python-brotlipy/repos/community-staging-x86_64/PKGBUILD
(from rev 752202, python-brotlipy/trunk/PKGBUILD)
python-brotlipy/repos/community-staging-x86_64/shared-brotli.patch
(from rev 752202, python-brotlipy/trunk/shared-brotli.patch)
Deleted:
python-brotlipy/repos/community-staging-x86_64/PKGBUILD
python-brotlipy/repos/community-staging-x86_64/shared-brotli.patch
---------------------+
PKGBUILD | 86 +++++++-------
shared-brotli.patch | 296 +++++++++++++++++++++++++-------------------------
2 files changed, 191 insertions(+), 191 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-12 17:03:26 UTC (rev 752206)
+++ PKGBUILD 2020-11-12 17:03:26 UTC (rev 752207)
@@ -1,43 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=python-brotlipy
-pkgver=0.7.0
-pkgrel=7
-pkgdesc='Python binding to the Brotli library'
-arch=('x86_64')
-license=('MIT')
-url='https://github.com/python-hyper/brotlipy'
-depends=('brotli06' 'python-cffi')
-makedepends=('python-setuptools')
-checkdepends=('python-pytest-runner' 'python-hypothesis' 'brotli06-testdata')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/python-hyper/brotlipy/archive/v$pkgver.tar.gz"
- shared-brotli.patch
- brotlipy-disable-hypothesis-timeout.patch::https://github.com/python-hyper/brotlipy/pull/155.patch)
-sha512sums=('bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf'
- 'fc472dfb857d223f1b40edb8182a34c22ed1a8ff02953de934a0cf3b223e072699b100e63bf3ba1848b312743dc302b781b71fcafb3117223439f65f97e334de'
- '9ddc62dcbca5e33ea861f096a364e032622147c277e8a49d94ccf03ef706801b5c5d3d38da93ad39d01be87eafcde958903ac089028c190619a3f78786a11eee')
-
-prepare() {
- patch -d brotlipy-$pkgver -p1 -i ../shared-brotli.patch
- patch -d brotlipy-$pkgver -p1 -i ../brotlipy-disable-hypothesis-timeout.patch
- sed -i 's|^TEST_DATA_DIR = .*|TEST_DATA_DIR = "/usr/share/brotli06/testdata"|' brotlipy-$pkgver/test/conftest.py
-
- export USE_SHARED_BROTLI=1
- export CFLAGS="-I/usr/include/brotli06 -L/usr/lib/brotli06"
-}
-
-build() {
- cd brotlipy-$pkgver
- python setup.py build
-}
-
-check() {
- cd brotlipy-$pkgver
- python setup.py pytest
-}
-
-package() {
- cd brotlipy-$pkgver
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
- install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: python-brotlipy/repos/community-staging-x86_64/PKGBUILD (from rev 752202, python-brotlipy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-12 17:03:26 UTC (rev 752207)
@@ -0,0 +1,43 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=python-brotlipy
+pkgver=0.7.0
+pkgrel=8
+pkgdesc='Python binding to the Brotli library'
+arch=('x86_64')
+license=('MIT')
+url='https://github.com/python-hyper/brotlipy'
+depends=('brotli06' 'python-cffi')
+makedepends=('python-setuptools')
+checkdepends=('python-pytest-runner' 'python-hypothesis' 'brotli06-testdata')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/python-hyper/brotlipy/archive/v$pkgver.tar.gz"
+ shared-brotli.patch
+ brotlipy-disable-hypothesis-timeout.patch::https://github.com/python-hyper/brotlipy/pull/155.patch)
+sha512sums=('bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf'
+ 'fc472dfb857d223f1b40edb8182a34c22ed1a8ff02953de934a0cf3b223e072699b100e63bf3ba1848b312743dc302b781b71fcafb3117223439f65f97e334de'
+ '9ddc62dcbca5e33ea861f096a364e032622147c277e8a49d94ccf03ef706801b5c5d3d38da93ad39d01be87eafcde958903ac089028c190619a3f78786a11eee')
+
+prepare() {
+ patch -d brotlipy-$pkgver -p1 -i ../shared-brotli.patch
+ patch -d brotlipy-$pkgver -p1 -i ../brotlipy-disable-hypothesis-timeout.patch
+ sed -i 's|^TEST_DATA_DIR = .*|TEST_DATA_DIR = "/usr/share/brotli06/testdata"|' brotlipy-$pkgver/test/conftest.py
+
+ export USE_SHARED_BROTLI=1
+ export CFLAGS="-I/usr/include/brotli06 -L/usr/lib/brotli06"
+}
+
+build() {
+ cd brotlipy-$pkgver
+ python setup.py build
+}
+
+check() {
+ cd brotlipy-$pkgver
+ python setup.py pytest
+}
+
+package() {
+ cd brotlipy-$pkgver
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+ install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: shared-brotli.patch
===================================================================
--- shared-brotli.patch 2020-11-12 17:03:26 UTC (rev 752206)
+++ shared-brotli.patch 2020-11-12 17:03:26 UTC (rev 752207)
@@ -1,148 +0,0 @@
-commit ce0d620a03c494c437d989190fe321cc4b9b8b20
-Author: Felix Yan <felixonmars at archlinux.org>
-Date: Tue Jun 6 19:16:36 2017 +0800
-
- Allow to build with shared brotli
-
- It would be nice to allow building with shared brotli since we have one
- in the repositories. This commit would not break the default
- installation.
-
-diff --git a/.travis.yml b/.travis.yml
-index 3498f2b..2b3b7d9 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -13,12 +13,19 @@ cache:
- pip: true
- directories:
- - $HOME/.ccache
--
-+
-+matrix:
-+ include:
-+ - python: "3.6"
-+ - env: USE_SHARED_BROTLI=1
-+ - sudo: true
-+
- env:
- global:
- - PATH="/usr/lib/ccache:$PATH"
-
- install:
-+ - "if [[ $USE_SHARED_BROTLI == 1 ]]; then mkdir build; cd build; cmake ../libbrotli -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib; make; sudo make install; cd ..; fi"
- - "pip install -U pip 'setuptools!=26.*'"
- - "pip install ."
- - "pip install -r test_requirements.txt"
-diff --git a/setup.py b/setup.py
-index 992261a..90d4a8b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,4 +1,5 @@
- #!/usr/bin/env python
-+import os
- from setuptools import find_packages, setup
- from setuptools.command.build_ext import build_ext
-
-@@ -22,37 +23,10 @@ class BuildClibBeforeExt(build_ext):
- self.run_command("build_clib")
- build_ext.run(self)
-
--
--setup(
-- name="brotlipy",
-- version="0.7.0",
--
-- description="Python binding to the Brotli library",
-- long_description=long_description,
-- url="https://github.com/python-hyper/brotlipy/",
-- license="MIT",
--
-- author="Cory Benfield",
-- author_email="cory at lukasa.co.uk",
--
-- setup_requires=[
-- "cffi>=1.0.0",
-- ],
-- install_requires=[
-- "cffi>=1.0.0",
-- ],
-- extras_require={
-- ':python_version == "2.7" or python_version == "3.3"': ['enum34>=1.0.4, <2'],
-- },
--
-- cffi_modules=["src/brotli/build.py:ffi"],
--
-- packages=find_packages('src'),
-- package_dir={'': 'src'},
--
-- ext_package="brotli",
--
-- libraries=[
-+libraries = []
-+USE_SHARED_BROTLI = os.environ.get("USE_SHARED_BROTLI")
-+if USE_SHARED_BROTLI != "1":
-+ libraries = [
- ("libbrotli", {
- "include_dirs": [
- "libbrotli/include",
-@@ -84,7 +58,38 @@ setup(
- 'libbrotli/enc/entropy_encode.c'
- ]
- }),
-+ ]
-+
-+setup(
-+ name="brotlipy",
-+ version="0.7.0",
-+
-+ description="Python binding to the Brotli library",
-+ long_description=long_description,
-+ url="https://github.com/python-hyper/brotlipy/",
-+ license="MIT",
-+
-+ author="Cory Benfield",
-+ author_email="cory at lukasa.co.uk",
-+
-+ setup_requires=[
-+ "cffi>=1.0.0",
-+ ],
-+ install_requires=[
-+ "cffi>=1.0.0",
- ],
-+ extras_require={
-+ ':python_version == "2.7" or python_version == "3.3"': ['enum34>=1.0.4, <2'],
-+ },
-+
-+ cffi_modules=["src/brotli/build.py:ffi"],
-+
-+ packages=find_packages('src'),
-+ package_dir={'': 'src'},
-+
-+ ext_package="brotli",
-+
-+ libraries=libraries,
-
- zip_safe=False,
-
-diff --git a/src/brotli/build.py b/src/brotli/build.py
-index 562376e..0e1bb80 100644
---- a/src/brotli/build.py
-+++ b/src/brotli/build.py
-@@ -1,10 +1,16 @@
- # -*- coding: utf-8 -*-
-+import os
- import sys
-
- from cffi import FFI
- ffi = FFI()
-
--libraries = ['libbrotli']
-+USE_SHARED_BROTLI = os.environ.get("USE_SHARED_BROTLI")
-+if USE_SHARED_BROTLI != "1":
-+ libraries = ['libbrotli']
-+else:
-+ libraries = ['brotlienc', 'brotlidec']
-+
- if 'win32' not in str(sys.platform).lower():
- libraries.append('stdc++')
-
Copied: python-brotlipy/repos/community-staging-x86_64/shared-brotli.patch (from rev 752202, python-brotlipy/trunk/shared-brotli.patch)
===================================================================
--- shared-brotli.patch (rev 0)
+++ shared-brotli.patch 2020-11-12 17:03:26 UTC (rev 752207)
@@ -0,0 +1,148 @@
+commit ce0d620a03c494c437d989190fe321cc4b9b8b20
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Tue Jun 6 19:16:36 2017 +0800
+
+ Allow to build with shared brotli
+
+ It would be nice to allow building with shared brotli since we have one
+ in the repositories. This commit would not break the default
+ installation.
+
+diff --git a/.travis.yml b/.travis.yml
+index 3498f2b..2b3b7d9 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -13,12 +13,19 @@ cache:
+ pip: true
+ directories:
+ - $HOME/.ccache
+-
++
++matrix:
++ include:
++ - python: "3.6"
++ - env: USE_SHARED_BROTLI=1
++ - sudo: true
++
+ env:
+ global:
+ - PATH="/usr/lib/ccache:$PATH"
+
+ install:
++ - "if [[ $USE_SHARED_BROTLI == 1 ]]; then mkdir build; cd build; cmake ../libbrotli -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib; make; sudo make install; cd ..; fi"
+ - "pip install -U pip 'setuptools!=26.*'"
+ - "pip install ."
+ - "pip install -r test_requirements.txt"
+diff --git a/setup.py b/setup.py
+index 992261a..90d4a8b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env python
++import os
+ from setuptools import find_packages, setup
+ from setuptools.command.build_ext import build_ext
+
+@@ -22,37 +23,10 @@ class BuildClibBeforeExt(build_ext):
+ self.run_command("build_clib")
+ build_ext.run(self)
+
+-
+-setup(
+- name="brotlipy",
+- version="0.7.0",
+-
+- description="Python binding to the Brotli library",
+- long_description=long_description,
+- url="https://github.com/python-hyper/brotlipy/",
+- license="MIT",
+-
+- author="Cory Benfield",
+- author_email="cory at lukasa.co.uk",
+-
+- setup_requires=[
+- "cffi>=1.0.0",
+- ],
+- install_requires=[
+- "cffi>=1.0.0",
+- ],
+- extras_require={
+- ':python_version == "2.7" or python_version == "3.3"': ['enum34>=1.0.4, <2'],
+- },
+-
+- cffi_modules=["src/brotli/build.py:ffi"],
+-
+- packages=find_packages('src'),
+- package_dir={'': 'src'},
+-
+- ext_package="brotli",
+-
+- libraries=[
++libraries = []
++USE_SHARED_BROTLI = os.environ.get("USE_SHARED_BROTLI")
++if USE_SHARED_BROTLI != "1":
++ libraries = [
+ ("libbrotli", {
+ "include_dirs": [
+ "libbrotli/include",
+@@ -84,7 +58,38 @@ setup(
+ 'libbrotli/enc/entropy_encode.c'
+ ]
+ }),
++ ]
++
++setup(
++ name="brotlipy",
++ version="0.7.0",
++
++ description="Python binding to the Brotli library",
++ long_description=long_description,
++ url="https://github.com/python-hyper/brotlipy/",
++ license="MIT",
++
++ author="Cory Benfield",
++ author_email="cory at lukasa.co.uk",
++
++ setup_requires=[
++ "cffi>=1.0.0",
++ ],
++ install_requires=[
++ "cffi>=1.0.0",
+ ],
++ extras_require={
++ ':python_version == "2.7" or python_version == "3.3"': ['enum34>=1.0.4, <2'],
++ },
++
++ cffi_modules=["src/brotli/build.py:ffi"],
++
++ packages=find_packages('src'),
++ package_dir={'': 'src'},
++
++ ext_package="brotli",
++
++ libraries=libraries,
+
+ zip_safe=False,
+
+diff --git a/src/brotli/build.py b/src/brotli/build.py
+index 562376e..0e1bb80 100644
+--- a/src/brotli/build.py
++++ b/src/brotli/build.py
+@@ -1,10 +1,16 @@
+ # -*- coding: utf-8 -*-
++import os
+ import sys
+
+ from cffi import FFI
+ ffi = FFI()
+
+-libraries = ['libbrotli']
++USE_SHARED_BROTLI = os.environ.get("USE_SHARED_BROTLI")
++if USE_SHARED_BROTLI != "1":
++ libraries = ['libbrotli']
++else:
++ libraries = ['brotlienc', 'brotlidec']
++
+ if 'win32' not in str(sys.platform).lower():
+ libraries.append('stdc++')
+
More information about the arch-commits
mailing list