diff --git a/debian/changelog b/debian/changelog index d659953..c31fbc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,142 +1,173 @@ +python-cassandra-driver (3.25.0-1+swh1) unstable-swh; urgency=medium + + * New upstream version 3.25.0 + + -- Antoine Lambert Thu, 06 May 2021 18:40:45 +0200 + +python-cassandra-driver (3.24.0-1) unstable; urgency=medium + + [ Ondřej Nový ] + * d/control: Update Maintainer field with new Debian Python Team + contact address. + * d/control: Update Vcs-* fields with new Debian Python Team Salsa + layout. + + [ Emmanuel Arias ] + * d/control: Add Breaks+Replaces python3-cassandra (<< 3.20) + (Closes: #952753). + * d/gbp.conf: set debian/master as default branch. + * d/control: Bump debhelper-compat to 13 + * d/control: Bump Standard-Version to 4.5.1 + * wrap-and-sort + * d/control: No check the version of python3-mock dependency. + * d/copyright: Update year copyright on debian/*. + * d/copyright: Use expat license name instead of MIT license name. + * d/control: Update my contact information on Uploaders field. + * New upstream version 3.24.0 + * d/control: Add python3-pure-sasl dependency. + * d/patches: add patch to skip test that fail on i386 arch. + + -- Emmanuel Arias Fri, 05 Feb 2021 13:27:33 -0300 + python-cassandra-driver (3.20.2-1~swh1~bpo10+1) buster-swh; urgency=medium * Rebuild for buster-swh -- Antoine R. Dumont (@ardumont) Mon, 27 Jan 2020 16:50:38 +0100 python-cassandra-driver (3.20.2-1) unstable; urgency=medium * Team upload. [ Ondřej Nový ] * Bump Standards-Version to 4.4.1. [ Adam Cecile ] * New upstream release 3.20.2. * Add several build-dependencies to run unit tests. * Enable unit tests. * Re-enable Cython which is working fine now. * Enable multi-core compilation of Cython files. * Switch to GitHub tarball instead of PyPi to have docs and unit tests. * Generate Sphinx doc in python3-cassandra-doc package. -- Adam Cecile Tue, 07 Jan 2020 12:43:32 +0100 python-cassandra-driver (3.16.0-2) unstable; urgency=medium * Team upload. [ Ondřej Nový ] * Use debhelper-compat instead of debian/compat. * d/changelog: Remove trailing whitespaces. * Drop Python 2 support. * Use pybuild for building package. * Add python3-six to build depends. * Enable autopkgtest-pkg-python testsuite. * Enable all hardening. * d/copyright: Fix cassandra/cmurmur3.c filename. * Bump standards version to 4.4.0 (no changes). * Bump debhelper compat level to 12. -- Ondřej Nový Fri, 09 Aug 2019 12:49:01 +0200 python-cassandra-driver (3.16.0-1) unstable; urgency=medium [ Ondřej Nový ] * Convert git repository from git-dpm to gbp layout * d/changelog: Remove trailing whitespaces. [ Emmanuel Arias ] * New upstream release. * Add DPMT to Maintainer field on d/control. * Adopt package, add myself to Uploaders (Closes: #888400). * Update Standards Version from 4.1.4 to 4.2.1 on d/control file. * Update on d/copyright file the Copyright file for debian/* files. - Add me to there. * Bump debhelper compatibility to 11 (from 10). * Fix problems on d/copyright: - Fix dep5-copyright-license-name-not-unique tag lintian * Move from old -dbg packages to dbgsym (Closes: #857298). - Delete python-cassandra-dbg and python-cassandra[3]-dbg from d/control - Delete from override_dh_auto_install (on d/rules) the installation of *-dbg - Change existing -dbg to -dbgsym on d/rules -- Emmanuel Arias Wed, 05 Dec 2018 21:16:10 +0200 python-cassandra-driver (3.14.0-1) unstable; urgency=medium [ Ondřej Nový ] * d/control: Set Vcs-* to salsa.debian.org * d/copyright: Use https protocol in Format field * d/control: Deprecating priority extra as per policy 4.0.1 * d/watch: Use https protocol [ Sandro Tosi ] * New upstream release * debian/rules - build for all supported python3 versions; patch by Scott Kitterman; Closes: #867010 - remove cassandra/io/asyncioreactor.py from python2 package, code is meant to be py3k only * debian/copyright - extend packaging copyright years - update upstream copyright years * debian/control - bump Standards-Version to 4.1.4 (no changes needed) -- Sandro Tosi Tue, 12 Jun 2018 19:26:05 -0400 python-cassandra-driver (3.7.1-2) unstable; urgency=medium * debian/rules - remove build and egg-info dirs in clean target, to build the package twice in a row; Closes: #825924 * debian/copyright - extend packaging copyright years -- Sandro Tosi Sun, 08 Jan 2017 11:28:48 -0500 python-cassandra-driver (3.7.1-1) unstable; urgency=medium * New upstream release * debian/rules - dont use cython, cassandra-driver is incompatible with 0.25 we have * compat level 10 -- Sandro Tosi Sat, 17 Dec 2016 13:09:50 -0500 python-cassandra-driver (3.7.0-1) unstable; urgency=medium * New upstream release * debian/control - add dh-python t0 b-d -- Sandro Tosi Sun, 02 Oct 2016 14:23:02 -0400 python-cassandra-driver (3.4.1-1) unstable; urgency=medium [ Sandro Tosi ] * New upstream release * debian/control - adjust Vcs-Browser to DPMT standards - add libev-dev to b-p needed by cassandra.io.libevwrapper - bump Standards-Version to 3.9.8 (no changes needed) * debian/copyright - extend packaging copyright years - update upstream copyright years * build arch:any and debug pkgs now that this prj contains extensions [ Ondřej Nový ] * Fixed VCS URL (https) -- Sandro Tosi Sun, 12 Jun 2016 22:58:39 +0100 python-cassandra-driver (2.5.1-1) unstable; urgency=low * Initial release (Closes: #771065) -- Sandro Tosi Thu, 25 Jun 2015 15:50:21 -0400 diff --git a/debian/control b/debian/control index 4b48998..b3aa4a9 100644 --- a/debian/control +++ b/debian/control @@ -1,65 +1,86 @@ Source: python-cassandra-driver Section: python Priority: optional -Maintainer: Debian Python Modules Team -Uploaders: Emmanuel Arias -Build-Depends: debhelper-compat (= 12), python3-all-dev, python3-all-dbg, python3-setuptools, libev-dev, cython3, dh-python, python3-six, - python3-nose , - python3-mock (>= 2.0.0~) , +Maintainer: Debian Python Team +Uploaders: + Emmanuel Arias , +Build-Depends: + cython3, + debhelper-compat (= 13), + dh-python, + libev-dev, + python3-all-dbg, + python3-all-dev, python3-eventlet , + python3-mock , + python3-nose , + python3-pure-sasl, + python3-setuptools, + python3-six, + python3-sphinx , python3-sure , - python3-yaml , - python3-tz , python3-twisted , - python3-sphinx , -Standards-Version: 4.4.1 + python3-tz , + python3-yaml , +Standards-Version: 4.5.1 Homepage: https://github.com/datastax/python-driver -Vcs-Git: https://salsa.debian.org/python-team/modules/python-cassandra-driver.git -Vcs-Browser: https://salsa.debian.org/python-team/modules/python-cassandra-driver +Vcs-Git: https://salsa.debian.org/python-team/packages/python-cassandra-driver.git +Vcs-Browser: https://salsa.debian.org/python-team/packages/python-cassandra-driver Testsuite: autopkgtest-pkg-python Rules-Requires-Root: no Package: python3-cassandra Architecture: any -Depends: ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends} -Suggests: python3-blist, python3-cassandra-doc +Depends: + ${misc:Depends}, + ${python3:Depends}, + ${shlibs:Depends}, +Suggests: + python3-blist, + python3-cassandra-doc, Description: Python driver for Apache Cassandra (Python 3) A modern, feature-rich and highly-tunable Python client library for Apache Cassandra (1.2+) and DataStax Enterprise (3.1+) using exclusively Cassandra's binary protocol and Cassandra Query Language v3. . Features: * Synchronous and Asynchronous APIs * Simple, Prepared, and Batch statements * Asynchronous IO, parallel execution, request pipelining * Connection pooling * Automatic node discovery * Automatic reconnection * Configurable load balancing and retry policies * Concurrent execution utilities * Object mapper . This package contains the Python 3.x module for python-cassandra Package: python3-cassandra-doc Build-Profiles: Architecture: all Section: doc -Depends: ${sphinxdoc:Depends}, ${misc:Depends} +Depends: + ${misc:Depends}, + ${sphinxdoc:Depends}, +Breaks: + python3-cassandra (<< 3.20), +Replaces: + python3-cassandra (<< 3.20), Description: Python driver for Apache Cassandra (documentation) A modern, feature-rich and highly-tunable Python client library for Apache Cassandra (1.2+) and DataStax Enterprise (3.1+) using exclusively Cassandra's binary protocol and Cassandra Query Language v3. . Features: * Synchronous and Asynchronous APIs * Simple, Prepared, and Batch statements * Asynchronous IO, parallel execution, request pipelining * Connection pooling * Automatic node discovery * Automatic reconnection * Configurable load balancing and retry policies * Concurrent execution utilities * Object mapper . This is the common documentation package. diff --git a/debian/copyright b/debian/copyright index 58beec9..d6d92ab 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,66 +1,67 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: cassandra-driver Source: https://github.com/datastax/python-driver Files: * Copyright: Copyright 2013-2017 DataStax License: Apache-2 Files: debian/* -Copyright:2018-2019 Emmanuel Arias +Copyright:2018-2021 Emmanuel Arias 2015-2018 Sandro Tosi License: Apache-2 Files: cassandra/util.py Copyright: Copyright (c) 2009 Raymond Hettinger License: Apache-2 Files: cassandra/io/eventletreactor.py Copyright: Copyright 2014 Symantec Corporation Copyright 2013-2015 DataStax, Inc. License: Apache-2 License: Apache-2 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. . On Debian-based systems the full text of the Apache version 2.0 license can be found in /usr/share/common-licenses/Apache-2.0. Files: cassandra/cmurmur3.c Copyright: Copyright (c) 2011 Austin Appleby (Murmur3 routine) Copyright (c) 2011 Patrick Hensley (Python wrapper, packaging) Copyright 2013-2016 DataStax (Minor modifications to match Cassandra's MM3 hashes) -License: MIT +License: expat Note: The majority of this code was taken from the python-smhasher library, which can be found here: https://github.com/phensley/python-smhasher -License: MIT +License: expat Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation files - (the "Software"), to deal in the Software without restriction, - including without limitation the rights to use, copy, modify, merge, - publish, distribute, sublicense, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..7f63e3e --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +upstream-branch=debian/upstream +upstream-tag=debian/upstream/%(version)s +debian-branch=debian/unstable-swh +pristine-tar=True diff --git a/debian/patches/0003-Skip-tests-that-fails-on-i386-arch.patch b/debian/patches/0003-Skip-tests-that-fails-on-i386-arch.patch new file mode 100644 index 0000000..91d53d1 --- /dev/null +++ b/debian/patches/0003-Skip-tests-that-fails-on-i386-arch.patch @@ -0,0 +1,69 @@ +From: Emmanuel Arias +Date: Thu, 4 Feb 2021 22:13:39 -0300 +Subject: Skip tests that fails on i386 arch + +This test fail on i386 arch. This is a hotfix to try to have a new upstream +release before Debian Freeze. Need investigation. + +Bug: https://datastax-oss.atlassian.net/browse/PYTHON-1272 +--- + tests/unit/cython/types_testhelper.pyx | 2 ++ + tests/unit/test_types.py | 4 ++++ + 2 files changed, 6 insertions(+) + +diff --git a/tests/unit/cython/types_testhelper.pyx b/tests/unit/cython/types_testhelper.pyx +index 55fd310..7ec2f6d 100644 +--- a/tests/unit/cython/types_testhelper.pyx ++++ b/tests/unit/cython/types_testhelper.pyx +@@ -15,6 +15,7 @@ + import calendar + import datetime + import time ++import unittest + + include '../../../cassandra/ioutils.pyx' + +@@ -28,6 +29,7 @@ from cassandra.buffer cimport Buffer + from cassandra.deserializers cimport from_binary, Deserializer + + ++@unittest.skip("This tests fail on i386 arch.") + def test_datetype(assert_equal): + + cdef Deserializer des = find_deserializer(DateType) +diff --git a/tests/unit/test_types.py b/tests/unit/test_types.py +index 562fd2c..fc8d989 100644 +--- a/tests/unit/test_types.py ++++ b/tests/unit/test_types.py +@@ -646,6 +646,7 @@ class DateRangeDeserializationTests(unittest.TestCase): + upper_value = truncate_last_figures(upper_value) + 999 + self.assertEqual(upper_value, dr.upper_bound.milliseconds) + ++ @unittest.skip("This tests fail on i386 arch.") + def test_deserialize_date_range_minutes(self): + """ + Test rounding from DateRange for seconds +@@ -663,6 +664,7 @@ class DateRangeDeserializationTests(unittest.TestCase): + lambda x: x + 59 * 1000 + 999, + lambda original_value, i: original_value + i * 900 * 50) + ++ @unittest.skip("This tests fail on i386 arch.") + def test_deserialize_date_range_hours(self): + """ + Test rounding from DateRange for hours +@@ -683,6 +685,7 @@ class DateRangeDeserializationTests(unittest.TestCase): + 999, + lambda original_value, i: original_value + i * 900 * 50 * 60) + ++ @unittest.skip("This tests fail on i386 arch.") + def test_deserialize_date_range_day(self): + """ + Test rounding from DateRange for hours +@@ -732,6 +735,7 @@ class DateRangeDeserializationTests(unittest.TestCase): + get_upper_bound, + lambda original_value, i: original_value + i * 900 * 50 * 60 * 24 * 30) + ++ @unittest.skip("This tests fail on i386 arch.") + def test_deserialize_date_range_year(self): + """ + Test rounding from DateRange for year diff --git a/debian/patches/Disable_GitHub_links_in_doc.patch b/debian/patches/Disable_GitHub_links_in_doc.patch new file mode 100644 index 0000000..0e5b279 --- /dev/null +++ b/debian/patches/Disable_GitHub_links_in_doc.patch @@ -0,0 +1,26 @@ +From: Adam Cecile +Date: Thu, 4 Feb 2021 22:02:00 -0300 +Subject: Disable_GitHub_links_in_doc + +Author: Adam Cecile +--- + docs/themes/custom/theme.conf | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/docs/themes/custom/theme.conf b/docs/themes/custom/theme.conf +index b0fbb69..e9aef4d 100644 +--- a/docs/themes/custom/theme.conf ++++ b/docs/themes/custom/theme.conf +@@ -5,7 +5,7 @@ pygments_style = friendly + + [options] + description = Python driver for Cassandra +-github_user = datastax +-github_repo = python-driver +-github_button = true +-github_type = star +\ No newline at end of file ++#github_user = datastax ++#github_repo = python-driver ++#github_button = true ++#github_type = star diff --git a/debian/patches/Make_unittests_loadable.patch b/debian/patches/Make_unittests_loadable.patch new file mode 100644 index 0000000..ad74f00 --- /dev/null +++ b/debian/patches/Make_unittests_loadable.patch @@ -0,0 +1,41 @@ +From: Adam Cecile +Date: Thu, 4 Feb 2021 22:02:00 -0300 +Subject: UnitTest cannot be run at all without CCM + +Because this third party module is imported from __init__ files breaking +nose while analysing available test (so --ignore-file cannot help) +Author: Adam Cecile +--- + tests/integration/__init__.py | 2 +- + tests/integration/upgrade/__init__.py | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py +index 1e1f582..1c403d4 100644 +--- a/tests/integration/__init__.py ++++ b/tests/integration/__init__.py +@@ -47,7 +47,7 @@ try: + from ccmlib.cluster_factory import ClusterFactory as CCMClusterFactory + from ccmlib import common + except ImportError as e: +- CCMClusterFactory = None ++ raise unittest.SkipTest('ccm is a dependency for integration tests:', e) + + log = logging.getLogger(__name__) + +diff --git a/tests/integration/upgrade/__init__.py b/tests/integration/upgrade/__init__.py +index d2b9076..f782a75 100644 +--- a/tests/integration/upgrade/__init__.py ++++ b/tests/integration/upgrade/__init__.py +@@ -23,7 +23,10 @@ from collections import namedtuple + from functools import wraps + import logging + from threading import Thread, Event +-from ccmlib.node import TimeoutError ++try: ++ from ccmlib.node import TimeoutError ++except ImportError: ++ TimeoutError = Exception + import time + import logging + diff --git a/debian/patches/series b/debian/patches/series index 3d46098..2436fb8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ -Make_unittests_loadable -Disable_GitHub_links_in_doc +Make_unittests_loadable.patch +Disable_GitHub_links_in_doc.patch +0003-Skip-tests-that-fails-on-i386-arch.patch diff --git a/debian/python3-cassandra-doc.docs b/debian/python3-cassandra-doc.docs index d0053e3..a20ea9f 100644 --- a/debian/python3-cassandra-doc.docs +++ b/debian/python3-cassandra-doc.docs @@ -1,2 +1,2 @@ -build/html README.rst +build/html diff --git a/debian/rules b/debian/rules index b9b76dd..f802ff1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,49 +1,46 @@ #!/usr/bin/make -f export PYBUILD_NAME=cassandra export DEB_BUILD_MAINT_OPTIONS = hardening=+all # In case there's something wrong during cython generation, you may want to enable this #export CASS_DRIVER_NO_CYTHON=1 # Enable parallel build export CASS_DRIVER_BUILD_CONCURRENCY=$(shell nproc) export PYBUILD_TEST_NOSE=1 -# Requires python3-ccmlib (Cassandra Cluster Manager) which is not available in the archive -PYBUILD_TEST_ARGS := -export PYBUILD_TEST_ARGS # For some reasons evenlet.monkey_patch is not available in dbg version of the package # Careful: Nose --ignore-files is basically not working correctly, adding folders before the file # never worked, no matter how many .* I used... export PYBUILD_TEST_ARGS_python3-dbg=$(PYBUILD_TEST_ARGS) --ignore-files="test_eventletreactor\.py" %: ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),) dh $@ --with python3,sphinxdoc --buildsystem=pybuild else dh $@ --with python3 --buildsystem=pybuild endif override_dh_auto_clean: dh_auto_clean rm -rf build/ cassandra_driver.egg-info/ # Do not delete cmurmur3.c because we don't have proper Python extension # so it cannot be regenerated with cython find cassandra -maxdepth 1 -type f -name '*.c' ! -name 'cmurmur3.c' -delete override_dh_auto_build: dh_auto_build ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),) PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml docs/ build/html endif override_dh_auto_test: ifeq ($(filter nocheck,$(DEB_BUILD_PROFILES)),) dh_auto_test endif override_dh_auto_install: dh_auto_install rm -rf debian/python*-dbg/usr/lib/python*/dist-packages/cassandra/numpyFlags.h diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..33c3a64 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..bf8ff79 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,5 @@ +Bug-Database: https://github.com/datastax/python-driver/issues +Bug-Submit: https://github.com/datastax/python-driver/issues/new +Name: TileDB +Repository: https://github.com/datastax/python-driver.git +Repository-Browse: https://github.com/datastax/python-driver