[Python-modules-commits] [django-celery-transactions] 01/07: Revert "Merge SVN HEAD"
Michael Fladischer
fladi at moszumanska.debian.org
Mon Oct 12 10:39:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository django-celery-transactions.
commit f2e50475dd1fb259d02dd53f9a18d707728c5380
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Mon Oct 12 12:32:35 2015 +0200
Revert "Merge SVN HEAD"
This reverts commit 5c71ed8766a0daab00b46017698d39cbfe4b4cea, reversing
changes made to 10b2b3a07e74ced224f5685a0159dc94cd6a899a.
---
debian/changelog | 6 +++---
debian/clean | 1 -
debian/control | 49 +++++++++++++++++++++++++++++++++++++------------
debian/copyright | 10 +++-------
debian/docs | 1 -
debian/rules | 19 ++++++++++---------
debian/watch | 4 +++-
7 files changed, 56 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f2c0c4a..3ba93e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-django-celery-transactions (0.1.3-1) unstable; urgency=low
+django-celery-transactions (0.3.2-1) unstable; urgency=low
- * Initial release (Closes: #726990).
+ * Initial release (Closes: #791675).
- -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 21 Oct 2013 11:32:47 +0200
+ -- Michael Fladischer <fladi at debian.org> Tue, 07 Jul 2015 16:09:46 +0200
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 4bf49a8..0000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-django_celery_transactions.egg-info/SOURCES.txt
diff --git a/debian/control b/debian/control
index 9736e0c..8e8203d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,30 +2,34 @@ Source: django-celery-transactions
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
+Uploaders: Michael Fladischer <fladi at debian.org>
Build-Depends: debhelper (>= 9),
+ dh-python,
python-all,
+ python-django,
python-celery,
- python-django (>= 1.2.4),
- python-django-celery,
- python-setuptools
-Standards-Version: 3.9.4
+ python-setuptools,
+ python3-all,
+ python3-django,
+ python3-celery,
+ python3-setuptools
+Standards-Version: 3.9.6
X-Python-Version: >= 2.6
-Homepage: https://github.com/chrisdoble/django-celery-transactions
-Vcs-Git: git://anonscm.debian.org/python-modules/packages/django-celery-transactions.git
+X-Python3-Version: >= 3.3
+Homepage: https://github.com/fellowshipofone/django-celery-transactions
Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/django-celery-transactions.git
+Vcs-Git: git://anonscm.debian.org/python-modules/packages/django-celery-transactions.git
Package: python-django-celery-transactions
Architecture: all
-Depends: python-celery,
- python-django (>= 1.2.4),
- python-django-celery,
+Depends: python-django,
+ python-celery,
${misc:Depends},
${python:Depends}
Description: Django transaction support for Celery tasks
django-celery-transactions holds on to Celery tasks until the current database
- transaction is committed, avoiding potential race conditions where the task is
- executed before the transaction is committed in the database.
+ transaction is committed, avoiding potential race conditions as described in
+ Celery's user guide.
.
Features:
* If the transaction is rolled back, the tasks are discarded. Django's
@@ -34,3 +38,24 @@ Description: Django transaction support for Celery tasks
that sending tasks from within Django's shell will work as expected, as
will the various transaction decorators commit_manually, commit_on_success,
etc.
+
+Package: python3-django-celery-transactions
+Architecture: all
+Depends: python3-django,
+ python3-celery,
+ ${misc:Depends},
+ ${python3:Depends}
+Description: Django transaction support for Celery tasks (Python3 version)
+ django-celery-transactions holds on to Celery tasks until the current database
+ transaction is committed, avoiding potential race conditions as described in
+ Celery's user guide.
+ .
+ Features:
+ * If the transaction is rolled back, the tasks are discarded. Django's
+ transaction middleware does this if an exception is raised.
+ * If transactions aren't being managed, tasks are sent as normal. This means
+ that sending tasks from within Django's shell will work as expected, as
+ will the various transaction decorators commit_manually, commit_on_success,
+ etc.
+ .
+ This package contains the Python 3 version of the library.
diff --git a/debian/copyright b/debian/copyright
index 23328a0..0087994 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,14 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: django-celery-transactions
-Upstream-Contact: Chris Doble <chris at chrisdoble.com>
-Source: https://github.com/chrisdoble/django-celery-transactions
+Upstream-Contact: Nicolas Grasset <nicolas.grasset at gmail.com>
+Source: https://github.com/fellowshipofone/django-celery-transactions
Files: *
Copyright: 2012, Chris Doble
License: BSD-2-clause
Files: debian/*
-Copyright: 2013, Fladischer Michael <FladischerMichael at fladi.at>
+Copyright: 2015, Fladischer Michael <fladi at debian.org>
License: BSD-2-clause
License: BSD-2-clause
@@ -31,7 +31,3 @@ License: BSD-2-clause
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- .
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index b43bf86..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/debian/rules b/debian/rules
index a7b190f..1a1a6b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,15 @@
#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export PYBUILD_NAME=django-celery-transactions
+
%:
- dh $@ --with python2
+ dh $@ --with python2,python3 --buildsystem=pybuild
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- set -e; \
- for python in $(shell pyversions -r); do \
- PYTHONPATH="." $$python setup.py test; \
- done
-endif
+override_dh_installchangelogs:
+ dh_installchangelogs -- CHANGELOG
+override_dh_auto_test:
+ PYBUILD_SYSTEM=custom PYBUILD_TEST_ARGS="python{version} runtests.py" dh_auto_test
diff --git a/debian/watch b/debian/watch
index 5cc452a..e534132 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
version=3
-https://pypi.python.org/packages/source/d/django-celery-transactions/django-celery-transactions-([\d\.]+)\.tar\.gz
+opts=filenamemangle=s/.+\/([\d\.]+)\.tar\.gz/django-celery-transactions-$1.tar.gz/ \
+https://github.com/fellowshipofone/django-celery-transactions/releases \
+/fellowshipofone/django-celery-transactions/archive/([\d\.]+)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-celery-transactions.git
More information about the Python-modules-commits
mailing list