[Python-modules-commits] [txfixtures] 02/02: Update changelog for 0.1.4-1 release

Free Ekanayaka freee at moszumanska.debian.org
Tue Nov 22 10:21:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

freee pushed a commit to branch master
in repository txfixtures.

commit eddbf2d7ea9643893f4341342c8530c8cdefd70e
Author: Free Ekanayaka <freee at debian.org>
Date:   Tue Nov 22 10:09:19 2016 +0000

    Update changelog for 0.1.4-1 release
---
 .gitignore                               |   2 +
 .travis.yml                              |  11 ++++
 debian/changelog                         |   5 ++
 debian/compat                            |   1 +
 debian/control                           |  47 ++++++++++++++
 debian/copyright                         |  28 ++++++++
 debian/patches/0001-python3-compat.patch | 108 +++++++++++++++++++++++++++++++
 debian/patches/series                    |   1 +
 debian/rules                             |   8 +++
 debian/source/format                     |   1 +
 debian/source/options                    |   1 +
 debian/watch                             |   4 ++
 12 files changed, 217 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a295864
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.pyc
+__pycache__
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..cf2f794
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+sudo: required
+
+services:
+  - docker
+
+script:
+  - wget -O- http://travis.debian.net/script.sh | sh -
+
+branches:
+  except:
+    - /^debian\/\d/
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..ae5efeb
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+txfixtures (0.1.4-1) unstable; urgency=low
+
+  * Initial release (Closes: #845305)
+
+ -- Free Ekanayaka <freee at debian.org>  Tue, 22 Nov 2016 09:38:56 +0000
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..27e0b7c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,47 @@
+Source: txfixtures
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Free Ekanayaka <freee at debian.org>
+Section: python
+Priority: optional
+Build-Depends: dh-python,
+               debhelper (>= 9),
+               python-all (>= 2.6.6-3),
+               python-setuptools (>= 0.6b3),
+               python-fixtures,
+               python-testtools,
+               python-twisted-core,
+               python3-all,
+               python3-setuptools,
+               python3-fixtures,
+               python3-testtools,
+               python3-twisted,
+Standards-Version: 3.9.8
+Homepage: https://launchpad.net/txfixtures
+Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/txfixtures.git
+Vcs-Git: git://anonscm.debian.org/python-modules/packages/txfixtures.git
+
+Package: python-txfixtures
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Description: Twisted integration with Python test fixtures
+ The txfixtures package hooks into the Python testtools "test fixture"
+ interface, allowing you to write integration tests that rely on having
+ external Twisted service processes (or other types of service processes or
+ external resources in general) and possibly interact with them using
+ blocking APIs from test cases, that will run asynchronously in the
+ background.
+ .
+ This package provides the Python 2.x modules.
+
+Package: python3-txfixtures
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: Twisted integration with Python test fixtures
+ The txfixtures package hooks into the Python testtools "test fixture"
+ interface, allowing you to write integration tests that rely on having
+ external Twisted service processes (or other types of service processes or
+ external resources in general) and possibly interact with them using
+ blocking APIs from test cases, that will run asynchronously in the
+ background.
+ .
+ This package provides the Python 3.x modules.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..e85e7c9
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,28 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: systemfixtures
+Upstream-Contact: Free Ekanayaka <free at ekanayaka.io>
+Source: https://github.com/freeekanayaka/systemfixtures
+
+Files: *
+Copyright: (c) 2011 Martin Pool <martinpool at gmail.com>
+License: GPL-3
+
+Files: debian/*
+Copyright: (c) 2016 Free Ekanayaka <freee at debian.org>
+License: GPL-3
+
+License: GPL-3
+ This package is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, version 3 dated 29 June 2007.
+ .
+ This package is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The GNU General Public License version 3 may be found on Debian systems
+ in /usr/share/common-licenses/GPL-3.
diff --git a/debian/patches/0001-python3-compat.patch b/debian/patches/0001-python3-compat.patch
new file mode 100644
index 0000000..3275883
--- /dev/null
+++ b/debian/patches/0001-python3-compat.patch
@@ -0,0 +1,108 @@
+From: Free Ekanayaka <freee at debian.org>
+Date: Tue, 22 Nov 2016 10:13:38 +0000
+Subject: python3-compat
+
+Adapt syntax to be compatible with Python 3.
+---
+ txfixtures/osutils.py    | 13 +++++++------
+ txfixtures/tachandler.py | 10 ++++++----
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/txfixtures/osutils.py b/txfixtures/osutils.py
+index c5e22ed..2c68c96 100644
+--- a/txfixtures/osutils.py
++++ b/txfixtures/osutils.py
+@@ -21,7 +21,7 @@ def _kill_may_race(pid, signal_number):
+     """Kill a pid accepting that it may not exist."""
+     try:
+         os.kill(pid, signal_number)
+-    except OSError, e:
++    except OSError as e:
+         if e.errno in (errno.ESRCH, errno.ECHILD):
+             # Process has already been killed.
+             return
+@@ -34,7 +34,8 @@ def get_pid_from_file(pidfile_path):
+     if not os.path.exists(pidfile_path):
+         return None
+     # Get the pid.
+-    pid = open(pidfile_path, 'r').read().split()[0]
++    with open(pidfile_path, 'r') as fd:
++        pid = fd.read().split()[0]
+     try:
+         pid = int(pid)
+     except ValueError:
+@@ -63,7 +64,7 @@ def two_stage_kill(pid, poll_interval=0.1, num_polls=50):
+             if new_pid:
+                 return result
+             time.sleep(poll_interval)
+-        except OSError, e:
++        except OSError as e:
+             if e.errno in (errno.ESRCH, errno.ECHILD):
+                 # Raised if the process is gone by the time we try to get the
+                 # return value.
+@@ -92,7 +93,7 @@ def remove_if_exists(path):
+     """Remove the given file if it exists."""
+     try:
+         os.remove(path)
+-    except OSError, e:
++    except OSError as e:
+         if e.errno != errno.ENOENT:
+             raise
+ 
+@@ -111,11 +112,11 @@ def until_no_eintr(retries, function, *args, **kwargs):
+     for i in range(retries):
+         try:
+             return function(*args, **kwargs)
+-        except (IOError, OSError), e:
++        except (IOError, OSError) as e:
+             if e.errno == errno.EINTR:
+                 continue
+             raise
+-        except socket.error, e:
++        except socket.error as e:
+             # In Python 2.6 we can use IOError instead.  It also has
+             # reason.errno but we might be using 2.5 here so use the
+             # index hack.
+diff --git a/txfixtures/tachandler.py b/txfixtures/tachandler.py
+index 70f8b0f..cf6f591 100644
+--- a/txfixtures/tachandler.py
++++ b/txfixtures/tachandler.py
+@@ -96,17 +96,17 @@ class TacTestFixture(Fixture):
+ 
+         # Run twistd, and raise an error if the return value is non-zero or
+         # stdout/stderr are written to.
+-        proc = subprocess.Popen(
++        self._proc = subprocess.Popen(
+             args,
+             stdout=subprocess.PIPE,
+             stderr=subprocess.STDOUT,
+             )
+         self.addCleanup(self.killTac)
+-        stdout = until_no_eintr(10, proc.stdout.read)
++        stdout = until_no_eintr(10, self._proc.stdout.read)
+         if stdout:
+             raise TacException('Error running %s: unclean stdout/err: %s'
+                                % (args, stdout))
+-        rv = proc.wait()
++        rv = self._proc.wait()
+         # twistd will normally fork off into the background with the
+         # originally-spawned process exiting 0.
+         if rv != 0:
+@@ -132,7 +132,7 @@ class TacTestFixture(Fixture):
+             s.connect((host, port))
+             s.close()
+             return True
+-        except socket.error, e:
++        except socket.error as e:
+             if e.errno == errno.ECONNREFUSED:
+                 return False
+             else:
+@@ -166,6 +166,8 @@ class TacTestFixture(Fixture):
+         """Kill the TAC file if it is running."""
+         pidfile = self.pidfile
+         kill_by_pidfile(pidfile)
++        # Close the pipe
++        self._proc.stdout.close()
+ 
+     def sendSignal(self, sig):
+         """Send the given signal to the tac process."""
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6768dfe
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-python3-compat.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..03540f1
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+# This file was automatically generated by stdeb 0.8.5 at
+# Tue, 22 Nov 2016 09:38:56 +0000
+export PYBUILD_NAME=txfixtures
+%:
+	dh $@ --with python2,python3 --buildsystem=pybuild
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..aa96de8
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "^\.travis\.yml$"
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..857a88c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+# please also check http://pypi.debian.net/txfixtures/watch
+version=3
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/txfixtures/txfixtures-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/txfixtures.git



More information about the Python-modules-commits mailing list