[packages/python-cassandra] - Updated to 3.7.1 - Removed already applied futures_already_in_py32.patch - Disabled tests as they

matkor matkor at pld-linux.org
Thu Dec 22 16:45:32 CET 2016


commit 516febf1ecf5a2ce8a8211017791462c2c69a178
Author: Mateusz Korniak <matkor at pld-linux.org>
Date:   Thu Dec 22 16:43:33 2016 +0100

    - Updated to 3.7.1
    - Removed already applied futures_already_in_py32.patch
    - Disabled tests as they require mock<=1.0.1

 python-cassandra-futures_already_in_py32.patch | 11 -----------
 python-cassandra.spec                          | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 24 deletions(-)
---
diff --git a/python-cassandra.spec b/python-cassandra.spec
index db15c5b..abe0c47 100644
--- a/python-cassandra.spec
+++ b/python-cassandra.spec
@@ -2,7 +2,8 @@
 #
 # Conditional build:
 %bcond_with	doc		# don't build doc
-%bcond_without	tests	# do not perform "make test"
+%bcond_with	tests	# do not perform "make test"
+# NOTE: 3.7.1 R:  mock<=1.0.1 for tests :/
 %bcond_without	python2 # CPython 2.x module
 %bcond_without	python3 # CPython 3.x module
 
@@ -10,13 +11,13 @@
 Summary:	A Python client driver for Apache Cassandra
 Summary(pl.UTF-8):	Moduł Pythona dla klientów Apache Cassandra
 Name:		python-%{module}
-Version:	2.5.1
-Release:	5
+Version:	3.7.1
+Release:	0.1
 License:	Apache v2.0
 Group:		Libraries/Python
-Source0:	https://pypi.python.org/packages/source/c/cassandra-driver/cassandra-driver-%{version}.tar.gz
-# Source0-md5:	54f6ea0335e27f04fe13eb1036d01944
-Patch0:		%{name}-futures_already_in_py32.patch
+# Source0:	https://pypi.python.org/packages/source/c/cassandra-driver/cassandra-driver-%{version}.tar.gz
+Source0:	https://github.com/datastax/python-driver/archive/%{version}.tar.gz
+# Source0-md5:	6c451069c85490b0f78dcb1f0a0cda5f
 URL:		http://github.com/datastax/python-driver
 BuildRequires:	libev-devel
 BuildRequires:	rpm-pythonprov
@@ -30,6 +31,9 @@ BuildRequires:	python-pytz
 BuildRequires:	python-six
 BuildRequires:	python-sure
 Requires:	python-modules
+Requires:	python-futures
+#  mock<=1.0.1
+
 %endif
 %if %{with python3}
 # BuildRequires:	python3-futures  # Only 3.0 and 3.1
@@ -92,8 +96,7 @@ API documentation for %{module}.
 Dokumentacja API %{module}.
 
 %prep
-%setup -q -n cassandra-driver-%{version}
-%patch0 -p1
+%setup -q -n python-driver-%{version}
 
 %build
 %if %{with python2}
@@ -112,10 +115,8 @@ rm -rf _build/html/_sources
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %if %{with python2}
 %py_install
-
 %py_postclean
 %endif
 
@@ -123,7 +124,6 @@ rm -rf $RPM_BUILD_ROOT
 %py3_install
 %endif
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -133,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.rst
 %dir %{py_sitedir}/%{module}
 %{py_sitedir}/%{module}/*.py[co]
-%attr(755,root,root) %{py_sitedir}/%{module}/murmur3.so
+%attr(755,root,root) %{py_sitedir}/%{module}/*.so
 %dir %{py_sitedir}/%{module}/cqlengine
 %{py_sitedir}/%{module}/cqlengine/*.py[co]
 %dir %{py_sitedir}/%{module}/io
@@ -150,7 +150,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.rst
 %dir %{py3_sitedir}/%{module}
 %{py3_sitedir}/%{module}/*.py
-%attr(755,root,root) %{py3_sitedir}/%{module}/murmur3.cpython-*.so
+%attr(755,root,root) %{py3_sitedir}/%{module}/*.cpython-*.so
 %{py3_sitedir}/%{module}/__pycache__/
 %dir %{py3_sitedir}/%{module}/io
 %{py3_sitedir}/%{module}/io/*.py
diff --git a/python-cassandra-futures_already_in_py32.patch b/python-cassandra-futures_already_in_py32.patch
deleted file mode 100644
index b17c6b7..0000000
--- a/python-cassandra-futures_already_in_py32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./setup.py.futures_already_in_py32	2014-09-09 19:12:13.000000000 +0200
-+++ ./setup.py	2014-10-01 11:46:08.310521057 +0200
-@@ -182,7 +182,7 @@ def run_setup(extensions):
-         kw['cmdclass']['build_ext'] = build_extensions
-         kw['ext_modules'] = extensions
- 
--    dependencies = ['futures', 'six >=1.6']
-+    dependencies = ['six >=1.6']
- 
-     setup(
-         name='cassandra-driver',
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-cassandra.git/commitdiff/516febf1ecf5a2ce8a8211017791462c2c69a178



More information about the pld-cvs-commit mailing list