From c0e5144a3cc91d30a312120177daeb62f16abeee Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Sun, 1 May 2016 11:10:49 -0700 Subject: [PATCH 1/7] some notes for self --- NOTES.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 NOTES.rst diff --git a/NOTES.rst b/NOTES.rst new file mode 100644 index 0000000..d6dad4c --- /dev/null +++ b/NOTES.rst @@ -0,0 +1,18 @@ +Notes to future self +++++++++++++++++++++ + +To release a new version for different software consumers. + + * commit all of the changes you want + * bump version in tldp/__init__.py + * adjust debian/changelog in accordance with Debian policy + N.B. the version must match what you put in tldp/__init__.py + * run 'python contrib/rpm-release.py' which will regenerate a + contrib/tldp.spec with the correct version + * commit debian/changelog tldp/__init__.py and contrib/tldp.spec + * tag the release + * run 'git push origin master --tags' + * run 'python setup.py sdist upload -r pypi' + * run 'bash contrib/debian-release.py' (on a Debian-ish box) + + From 0908985916de3dd9916252b62c7500d0dbe4c879 Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Wed, 11 May 2016 08:57:29 -0700 Subject: [PATCH 2/7] add py35 to tox list --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 974d8f7..e2abd4f 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,8 @@ # and then run "tox" from this directory. [tox] -envlist = py27, py34 +envlist = py27, py34, py35 +skip_missing_interpreters = True [testenv] commands = {envpython} setup.py test From 83cbeb4cb50319dabe631d878ff5ec2ea5c1376c Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Wed, 11 May 2016 08:57:54 -0700 Subject: [PATCH 3/7] reset mode during testing; specify errnos to expect --- tests/test_utils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/test_utils.py b/tests/test_utils.py index d5b0236..9594716 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -48,14 +48,18 @@ class Test_isreadablefile_and_friends(unittest.TestCase): def test_isreadablefile(self): f = ntf(prefix='readable-file') self.assertTrue(isreadablefile(f.name)) + mode = os.stat(f.name).st_mode os.chmod(f.name, 0) self.assertFalse(isreadablefile(f.name)) + os.chmod(f.name, mode) def test_arg_isreadablefile(self): f = ntf(prefix='readable-file') self.assertEqual(f.name, arg_isreadablefile(f.name)) + mode = os.stat(f.name).st_mode os.chmod(f.name, 0) self.assertIsNone(arg_isreadablefile(f.name)) + os.chmod(f.name, mode) class Test_arg_isstr(unittest.TestCase): @@ -206,8 +210,10 @@ class Test_statfile(TestToolsFilesystem): f = ntf(dir=self.tempdir) omode = os.stat(self.tempdir).st_mode os.chmod(self.tempdir, 0) - with self.assertRaises(OSError): + with self.assertRaises(Exception) as ecm: statfile(f.name) + e = ecm.exception + self.assertIn(e.errno, (errno.EPERM, errno.EACCES)) os.chmod(self.tempdir, omode) stbuf = statfile(f.name) self.assertIsInstance(stbuf, posix.stat_result) From d78b53c91e50531aff2beef48bf5eaadd26bada8 Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Fri, 13 May 2016 12:25:45 -0400 Subject: [PATCH 4/7] accommodate root-run tests --- tests/test_utils.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/test_utils.py b/tests/test_utils.py index 9594716..8366e84 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -50,7 +50,10 @@ class Test_isreadablefile_and_friends(unittest.TestCase): self.assertTrue(isreadablefile(f.name)) mode = os.stat(f.name).st_mode os.chmod(f.name, 0) - self.assertFalse(isreadablefile(f.name)) + if 0 == os.getuid(): + self.assertTrue(isreadablefile(f.name)) + else: + self.assertFalse(isreadablefile(f.name)) os.chmod(f.name, mode) def test_arg_isreadablefile(self): @@ -58,7 +61,10 @@ class Test_isreadablefile_and_friends(unittest.TestCase): self.assertEqual(f.name, arg_isreadablefile(f.name)) mode = os.stat(f.name).st_mode os.chmod(f.name, 0) - self.assertIsNone(arg_isreadablefile(f.name)) + if 0 == os.getuid(): + self.assertEqual(f.name, arg_isreadablefile(f.name)) + else: + self.assertIsNone(arg_isreadablefile(f.name)) os.chmod(f.name, mode) @@ -210,11 +216,12 @@ class Test_statfile(TestToolsFilesystem): f = ntf(dir=self.tempdir) omode = os.stat(self.tempdir).st_mode os.chmod(self.tempdir, 0) - with self.assertRaises(Exception) as ecm: - statfile(f.name) - e = ecm.exception - self.assertIn(e.errno, (errno.EPERM, errno.EACCES)) - os.chmod(self.tempdir, omode) + if 0 != os.getuid(): + with self.assertRaises(Exception) as ecm: + statfile(f.name) + e = ecm.exception + self.assertIn(e.errno, (errno.EPERM, errno.EACCES)) + os.chmod(self.tempdir, omode) stbuf = statfile(f.name) self.assertIsInstance(stbuf, posix.stat_result) From 48daa85fd8fd0bddd8a40fd1c6125ec5a675d5cc Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Fri, 13 May 2016 12:27:17 -0400 Subject: [PATCH 5/7] adjust testing for root-run tests (changelog) --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 333b7f9..6007bb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ +2016-05-13 Martin A. Brown + * bumping version to tldp-0.7.13 + * accommodate root-run tests (used by Deb-O-Matic) + 2016-04-30 Martin A. Brown * bumping version to tldp-0.7.12 * adding ChangeLog (this file) From fb027155ed5bce13dd10659d1fe8fff321d3f1ef Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Fri, 13 May 2016 12:29:20 -0400 Subject: [PATCH 6/7] bumping version to tldp-0.7.13 --- contrib/tldp.spec | 6 +++--- debian/changelog | 4 ++-- tldp/__init__.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/tldp.spec b/contrib/tldp.spec index 5d21496..a6eacbd 100644 --- a/contrib/tldp.spec +++ b/contrib/tldp.spec @@ -1,8 +1,8 @@ %define sourcename tldp %define name python-tldp -%define version 0.7.12 -%define unmangled_version 0.7.12 -%define unmangled_version 0.7.12 +%define version 0.7.13 +%define unmangled_version 0.7.13 +%define unmangled_version 0.7.13 %define release 1 Summary: automatic publishing tool for DocBook, Linuxdoc and Asciidoc diff --git a/debian/changelog b/debian/changelog index c111865..7c4653e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -tldp (0.7.12-1) unstable; urgency=low +tldp (0.7.13-1) unstable; urgency=low * Initial release (Closes: #822181) - -- Martin A. Brown Wed, 27 Apr 2016 17:09:56 +0000 + -- Martin A. Brown Wed, 13 May 2016 16:28:22 +0000 diff --git a/tldp/__init__.py b/tldp/__init__.py index 3b16759..53e5962 100644 --- a/tldp/__init__.py +++ b/tldp/__init__.py @@ -9,4 +9,4 @@ import tldp.outputs import tldp.sources import tldp.inventory -VERSION = "0.7.12" +VERSION = "0.7.13" From d15fe745178121febb00284520e5e9b5cf09a56e Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Fri, 13 May 2016 12:42:18 -0400 Subject: [PATCH 7/7] add .coverage and .tox to "clean" --- debian/clean | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/clean b/debian/clean index fd7860d..7baac01 100644 --- a/debian/clean +++ b/debian/clean @@ -1,2 +1,4 @@ tldp.egg-info/ docs/_build/ +.coverage/ +.tox/