commit python-brotlipy for openSUSE:Factory
Hello community,
here is the log from the commit of package python-brotlipy for openSUSE:Factory
checked in at 2020-03-27 00:25:04
Comparing /work/SRC/openSUSE:Factory/python-brotlipy (Old)
and /work/SRC/openSUSE:Factory/.python-brotlipy.new.3160 (New)
Package is "python-brotlipy"
Fri Mar 27 00:25:04 2020 rev:6 rq:785562 version:0.7.0
Changes:
--- /work/SRC/openSUSE:Factory/python-brotlipy/python-brotlipy.changes
2019-11-04 17:14:33.812783998 +0100
+++
/work/SRC/openSUSE:Factory/.python-brotlipy.new.3160/python-brotlipy.changes
2020-03-27 00:25:12.780254238 +0100
@@ -1,0 +2,5 @@
+Mon Mar 16 10:21:09 UTC 2020 - Tomáš Chvátal
+
+- Fix build without python2
+
+---
Other differences:
--
++ python-brotlipy.spec ++
--- /var/tmp/diff_new_pack.TeToUx/_old 2020-03-27 00:25:14.892255308 +0100
+++ /var/tmp/diff_new_pack.TeToUx/_new 2020-03-27 00:25:14.892255308 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-brotlipy
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without python2
Name: python-brotlipy
Version:0.7.0
Release:0
Summary:Python binding to the Brotli library
License:MIT
-Group: Development/Languages/Python
-Url:https://github.com/python-hyper/brotlipy
-Source0:
https://pypi.io/packages/source/b/brotlipy/brotlipy-%{version}.tar.gz
+URL:https://github.com/python-hyper/brotlipy
+Source0:
https://files.pythonhosted.org/packages/source/b/brotlipy/brotlipy-%{version}.tar.gz
# Copy of
https://github.com/google/brotli/tree/46c1a881b41bb638c76247558aa04b1591af3aa7/tests/testdata
Source1:testdata.tgz
Source2:
https://raw.githubusercontent.com/python-hyper/brotlipy/master/test/conftest.py
@@ -37,9 +37,11 @@
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: libbrotli-devel
-BuildRequires: python-enum34
BuildRequires: python-rpm-macros
Requires: python-cffi >= 1.0.0
+%if %{with python2}
+BuildRequires: python-enum34
+%endif
%ifpython2
Requires: python-enum34
%endif
@@ -77,7 +79,7 @@
%check
# the skipped tests are benchmarks which can be flaky in OBS
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m pytest -k
'not (test_streaming_compression or test_streaming_compression_flush)'
+%pytest_arch -k 'not (test_streaming_compression or
test_streaming_compression_flush)'
%files %{python_files}
%license LICENSE
commit python-brotlipy for openSUSE:Factory
Hello community,
here is the log from the commit of package python-brotlipy for openSUSE:Factory
checked in at 2019-11-04 17:14:32
Comparing /work/SRC/openSUSE:Factory/python-brotlipy (Old)
and /work/SRC/openSUSE:Factory/.python-brotlipy.new.2990 (New)
Package is "python-brotlipy"
Mon Nov 4 17:14:32 2019 rev:5 rq:744883 version:0.7.0
Changes:
--- /work/SRC/openSUSE:Factory/python-brotlipy/python-brotlipy.changes
2019-03-22 15:13:27.457283161 +0100
+++
/work/SRC/openSUSE:Factory/.python-brotlipy.new.2990/python-brotlipy.changes
2019-11-04 17:14:33.812783998 +0100
@@ -1,0 +2,9 @@
+Fri Nov 1 11:37:53 UTC 2019 - John Vandenberg
+
+- Replace builtin libbrotli v0.6 with system libbrotli 1.x with patches:
+ - merged_pr_94.patch
+ - pr_154-brotli-v1.patch
+- Remove build dependency stdc++
+- Remove brotli/build.py from installed package
+
+---
New:
merged_pr_94.patch
pr_154-brotli-v1.patch
Other differences:
--
++ python-brotlipy.spec ++
--- /var/tmp/diff_new_pack.dddlxD/_old 2019-11-04 17:14:34.864785122 +0100
+++ /var/tmp/diff_new_pack.dddlxD/_new 2019-11-04 17:14:34.888785147 +0100
@@ -28,13 +28,15 @@
# Copy of
https://github.com/google/brotli/tree/46c1a881b41bb638c76247558aa04b1591af3aa7/tests/testdata
Source1:testdata.tgz
Source2:
https://raw.githubusercontent.com/python-hyper/brotlipy/master/test/conftest.py
+Patch0: merged_pr_94.patch
+Patch1: pr_154-brotli-v1.patch
BuildRequires: %{python_module cffi >= 1.0.0}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module hypothesis}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
-BuildRequires: gcc-c++
+BuildRequires: libbrotli-devel
BuildRequires: python-enum34
BuildRequires: python-rpm-macros
Requires: python-cffi >= 1.0.0
@@ -51,7 +53,11 @@
%prep
%setup -q -n brotlipy-%{version}
-mv libbrotli/LICENSE LICENSE.libbrotli
+%autopatch -p1
+# Remove unnecessary dependency on stdc++
+# See https://github.com/python-hyper/brotlipy/pull/151
+sed -i 's/libraries.append.*stdc++.*$/pass/' src/brotli/build.py
+
cp %{SOURCE2} test/
cd libbrotli
mkdir -p tests
@@ -60,21 +66,23 @@
%build
export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
+export USE_SHARED_BROTLI=1
%python_build
%install
%python_install
-%python_expand %fdupes %{buildroot}%{$python_sitearch}
+%{python_expand rm -f %{buildroot}%{$python_sitearch}/brotli/build.py*
%{buildroot}%{$python_sitearch}/brotli/__pycache__/build.*
+%fdupes %{buildroot}%{$python_sitearch}
+}
%check
# the skipped tests are benchmarks which can be flaky in OBS
%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m pytest -k
'not (test_streaming_compression or test_streaming_compression_flush)'
%files %{python_files}
-%license LICENSE LICENSE.libbrotli
+%license LICENSE
%doc README.rst
%{python_sitearch}/brotli
-%{python_sitearch}/brotlipy-%{version}-py%{py_ver}.egg-info
+%{python_sitearch}/brotlipy-%{version}-py*.egg-info
%changelog
++ merged_pr_94.patch ++
>From bd202a98e44947aaed2345278955a86ca8f42f8c Mon Sep 17 00:00:00 2001
From: Felix Yan
Date: Tue, 6 Jun 2017 19:16:36 +0800
Subject: [PATCH] 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.
---
.travis.yml | 8 +-
setup.py| 67 -
src/brotli/build.py | 8 +-
3 files changed, 50 insertions(+), 33 deletions(-)
Index: brotlipy-0.7.0/setup.py
===
--- brotlipy-0.7.0.orig/setup.py
+++ brotlipy-0.7.0/setup.py
@@ -1,41 +1,15 @@
#!/usr/bin/env python
+import os
from setuptools import find_packages, setup
long_description = (
open("README.rst").read() + '\n\n' + open("HISTORY.rst").read()
)
-
-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="c...@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=[
commit python-brotlipy for openSUSE:Factory
Hello community,
here is the log from the commit of package python-brotlipy for openSUSE:Factory
checked in at 2019-03-22 15:13:22
Comparing /work/SRC/openSUSE:Factory/python-brotlipy (Old)
and /work/SRC/openSUSE:Factory/.python-brotlipy.new.25356 (New)
Package is "python-brotlipy"
Fri Mar 22 15:13:22 2019 rev:4 rq:687646 version:0.7.0
Changes:
--- /work/SRC/openSUSE:Factory/python-brotlipy/python-brotlipy.changes
2019-03-01 20:30:50.113990890 +0100
+++
/work/SRC/openSUSE:Factory/.python-brotlipy.new.25356/python-brotlipy.changes
2019-03-22 15:13:27.457283161 +0100
@@ -1,0 +2,5 @@
+Fri Mar 22 12:49:36 UTC 2019 - Tomáš Chvátal
+
+- Skip failing tests in OBS due to the speed of CPUs there
+
+---
Other differences:
--
++ python-brotlipy.spec ++
--- /var/tmp/diff_new_pack.TyLOTs/_old 2019-03-22 15:13:29.033282959 +0100
+++ /var/tmp/diff_new_pack.TyLOTs/_new 2019-03-22 15:13:29.033282959 +0100
@@ -65,10 +65,11 @@
%install
%python_install
-%python_expand %fdupes -s %{buildroot}%{$python_sitearch}
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
%check
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m pytest
+# the skipped tests are benchmarks which can be flaky in OBS
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m pytest -k
'not (test_streaming_compression or test_streaming_compression_flush)'
%files %{python_files}
%license LICENSE LICENSE.libbrotli
commit python-brotlipy for openSUSE:Factory
Hello community,
here is the log from the commit of package python-brotlipy for openSUSE:Factory
checked in at 2019-03-01 20:30:33
Comparing /work/SRC/openSUSE:Factory/python-brotlipy (Old)
and /work/SRC/openSUSE:Factory/.python-brotlipy.new.28833 (New)
Package is "python-brotlipy"
Fri Mar 1 20:30:33 2019 rev:3 rq:680141 version:0.7.0
Changes:
--- /work/SRC/openSUSE:Factory/python-brotlipy/python-brotlipy.changes
2018-02-27 16:56:33.115090019 +0100
+++
/work/SRC/openSUSE:Factory/.python-brotlipy.new.28833/python-brotlipy.changes
2019-03-01 20:30:50.113990890 +0100
@@ -1,0 +2,7 @@
+Thu Feb 28 06:43:41 UTC 2019 - John Vandenberg
+
+- Add missing runtime dependency enum34
+- Use %license, and add the libbrotli LICENSE
+- Activate test suite
+
+---
New:
conftest.py
testdata.tgz
Other differences:
--
++ python-brotlipy.spec ++
--- /var/tmp/diff_new_pack.GQrE5P/_old 2019-03-01 20:30:52.041990416 +0100
+++ /var/tmp/diff_new_pack.GQrE5P/_new 2019-03-01 20:30:52.061990411 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-brotlipy
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -25,14 +25,22 @@
Group: Development/Languages/Python
Url:https://github.com/python-hyper/brotlipy
Source0:
https://pypi.io/packages/source/b/brotlipy/brotlipy-%{version}.tar.gz
+# Copy of
https://github.com/google/brotli/tree/46c1a881b41bb638c76247558aa04b1591af3aa7/tests/testdata
+Source1:testdata.tgz
+Source2:
https://raw.githubusercontent.com/python-hyper/brotlipy/master/test/conftest.py
BuildRequires: %{python_module cffi >= 1.0.0}
BuildRequires: %{python_module devel}
+BuildRequires: %{python_module hypothesis}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: gcc-c++
+BuildRequires: python-enum34
BuildRequires: python-rpm-macros
Requires: python-cffi >= 1.0.0
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%ifpython2
+Requires: python-enum34
+%endif
%python_subpackages
%description
@@ -43,6 +51,12 @@
%prep
%setup -q -n brotlipy-%{version}
+mv libbrotli/LICENSE LICENSE.libbrotli
+cp %{SOURCE2} test/
+cd libbrotli
+mkdir -p tests
+cd tests
+tar -xzf %{SOURCE1}
%build
export CFLAGS="%{optflags}"
@@ -53,9 +67,12 @@
%python_install
%python_expand %fdupes -s %{buildroot}%{$python_sitearch}
+%check
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m pytest
+
%files %{python_files}
-%defattr(-,root,root,-)
-%doc LICENSE README.rst
+%license LICENSE LICENSE.libbrotli
+%doc README.rst
%{python_sitearch}/brotli
%{python_sitearch}/brotlipy-%{version}-py%{py_ver}.egg-info
++ conftest.py ++
# -*- coding: utf-8 -*-
import os
import os.path
import pytest
# Statically look for all the files.
curdir = os.path.split(os.path.dirname(__file__))[0]
TEST_DATA_DIR = os.path.join(curdir, 'libbrotli', 'tests', 'testdata')
simple_test_files = [
os.path.join(TEST_DATA_DIR, p) for p in os.listdir(TEST_DATA_DIR)
]
compressed_simple_test_files = set(
f for f in simple_test_files if f.endswith('.compressed')
)
@pytest.fixture(params=compressed_simple_test_files)
def simple_compressed_file(request):
"""
Returns a two-tuple: (uncompressed_file, compressed_file), from the Brotli
test fixtures.
"""
file = request.param
return (file[:-len('.compressed')], file)
@pytest.fixture()
def one_compressed_file():
return os.path.join(TEST_DATA_DIR, 'alice29.txt')
commit python-brotlipy for openSUSE:Factory
Hello community,
here is the log from the commit of package python-brotlipy for openSUSE:Factory
checked in at 2018-02-27 16:56:29
Comparing /work/SRC/openSUSE:Factory/python-brotlipy (Old)
and /work/SRC/openSUSE:Factory/.python-brotlipy.new (New)
Package is "python-brotlipy"
Tue Feb 27 16:56:29 2018 rev:2 rq:580059 version:0.7.0
Changes:
--- /work/SRC/openSUSE:Factory/python-brotlipy/python-brotlipy.changes
2017-04-20 20:49:21.477471277 +0200
+++ /work/SRC/openSUSE:Factory/.python-brotlipy.new/python-brotlipy.changes
2018-02-27 16:56:33.115090019 +0100
@@ -1,0 +2,5 @@
+Sun Feb 25 16:33:51 UTC 2018 - aloi...@gmx.com
+
+- Update to 0.7.0 (no changelog supplied)
+
+---
Old:
brotlipy-0.6.0.tar.gz
New:
brotlipy-0.7.0.tar.gz
Other differences:
--
++ python-brotlipy.spec ++
--- /var/tmp/diff_new_pack.KqmKR0/_old 2018-02-27 16:56:34.655034378 +0100
+++ /var/tmp/diff_new_pack.KqmKR0/_new 2018-02-27 16:56:34.655034378 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-brotlipy
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,18 +18,18 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-brotlipy
-Version:0.6.0
+Version:0.7.0
Release:0
Summary:Python binding to the Brotli library
License:MIT
Group: Development/Languages/Python
Url:https://github.com/python-hyper/brotlipy
Source0:
https://pypi.io/packages/source/b/brotlipy/brotlipy-%{version}.tar.gz
-BuildRequires: gcc-c++
BuildRequires: %{python_module cffi >= 1.0.0}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
+BuildRequires: gcc-c++
BuildRequires: python-rpm-macros
Requires: python-cffi >= 1.0.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++ brotlipy-0.6.0.tar.gz -> brotlipy-0.7.0.tar.gz ++
49791 lines of diff (skipped)
