[Python-modules-commits] r33223 - in packages/pycparser/trunk/debian (7 files)

stefanor at users.alioth.debian.org stefanor at users.alioth.debian.org
Sat Jul 4 00:58:07 UTC 2015 

    Date: Saturday, July 4, 2015 @ 00:58:06
  Author: stefanor
Revision: 33223

* New upstream release.
* Refresh patches.
* Bump copyright years, and add a copyright holder.
* Drop patch relative-tests, superseded upstream.
* Point watch file at pypi.debian.net.
* Drop XS-Testsuite control header, no longer needed.
* Bump Standards-Version to 3.9.6, no changes needed.

Modified:
  packages/pycparser/trunk/debian/changelog
  packages/pycparser/trunk/debian/control
  packages/pycparser/trunk/debian/copyright
  packages/pycparser/trunk/debian/patches/series
  packages/pycparser/trunk/debian/patches/system-ply
  packages/pycparser/trunk/debian/watch
Deleted:
  packages/pycparser/trunk/debian/patches/relative-tests

Modified: packages/pycparser/trunk/debian/changelog
===================================================================
--- packages/pycparser/trunk/debian/changelog	2015-07-04 00:40:37 UTC (rev 33222)
+++ packages/pycparser/trunk/debian/changelog	2015-07-04 00:58:06 UTC (rev 33223)
@@ -1,7 +1,14 @@
-pycparser (2.10+dfsg-4) UNRELEASED; urgency=medium
+pycparser (2.14+dfsg-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
+  * Refresh patches.
+  * Bump copyright years, and add a copyright holder.
+  * Drop patch relative-tests, superseded upstream.
   * Switch watch file to use dversionmangle and repacksuffix, now that it
     exists.
+  * Point watch file at pypi.debian.net.
+  * Drop XS-Testsuite control header, no longer needed.
+  * Bump Standards-Version to 3.9.6, no changes needed.
 
  -- Stefano Rivera <stefanor at debian.org>  Fri, 20 Jun 2014 00:16:11 +0200
 

Modified: packages/pycparser/trunk/debian/control
===================================================================
--- packages/pycparser/trunk/debian/control	2015-07-04 00:40:37 UTC (rev 33222)
+++ packages/pycparser/trunk/debian/control	2015-07-04 00:58:06 UTC (rev 33223)
@@ -10,11 +10,10 @@
  python-ply (>= 3.4-1~),
  python3-all (>= 3.1.2-6~),
  python3-ply
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://github.com/eliben/pycparser
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
-XS-Testsuite: autopkgtest
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pycparser/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pycparser/trunk/
 

Modified: packages/pycparser/trunk/debian/copyright
===================================================================
--- packages/pycparser/trunk/debian/copyright	2015-07-04 00:40:37 UTC (rev 33222)
+++ packages/pycparser/trunk/debian/copyright	2015-07-04 00:58:06 UTC (rev 33223)
@@ -4,17 +4,22 @@
 Files-Excluded:
  utils/*.exe
  pycparser/ply
+ pycparser/*.pyc
 Source: http://pypi.python.org/pypi/pycparser
  lcc.exe was removed from the source package, as the license isn't DFSG-free
  and it isn't needed on Debian.
  The bundled ply was also dropped.
 
 Files: *
-Copyright: 2008-2013, Eli Bendersky <eliben at gmail.com>
+Copyright: 2008-2015, Eli Bendersky <eliben at gmail.com>
 License: bsd-3-bendersky
 
+Files: examples/rewrite_ast.py
+Copyright: 2014, Akira Hayakawa
+License: bsd-3-bendersky
+
 Files: debian/*
-Copyright: 2012-2014, Stefano Rivera <stefanor at debian.org>
+Copyright: 2012-2015, Stefano Rivera <stefanor at debian.org>
 License: bsd-3-bendersky
 
 License: bsd-3-bendersky

Deleted: packages/pycparser/trunk/debian/patches/relative-tests
===================================================================
--- packages/pycparser/trunk/debian/patches/relative-tests	2015-07-04 00:40:37 UTC (rev 33222)
+++ packages/pycparser/trunk/debian/patches/relative-tests	2015-07-04 00:58:06 UTC (rev 33223)
@@ -1,74 +0,0 @@
-Description: Locate test data from __file__
- Find c_files and fake_libc_include from __file__ of the unit test, rather than
- expecting the test suite to be run from a particular directory.
-Author: Stefano Rivera <stefanor at debian.org>
-Forwarded: https://github.com/eliben/pycparser/pull/13
-Last-Update: 2013-08-08
-
---- a/tests/test_c_parser.py
-+++ b/tests/test_c_parser.py
-@@ -1518,13 +1518,10 @@
-         """ Find a c file by name, taking into account the current dir can be
-             in a couple of typical places
-         """
--        fullnames = [
--            os.path.join('c_files', name),
--            os.path.join('tests', 'c_files', name)]
--        for fullname in fullnames:
--            if os.path.exists(fullname):
--                return open(fullname, 'rU')
--        assert False, "Unreachable"
-+        testdir = os.path.dirname(__file__)
-+        name = os.path.join(testdir, 'c_files', name)
-+        assert os.path.exists(name)
-+        return open(name, 'rU')
- 
-     def test_whole_file(self):
-         # See how pycparser handles a whole, real C file.
---- a/tests/test_general.py
-+++ b/tests/test_general.py
-@@ -15,31 +15,29 @@
-         """ Find a c file by name, taking into account the current dir can be
-             in a couple of typical places
-         """
--        fullnames = [
--            os.path.join('c_files', name),
--            os.path.join('tests', 'c_files', name)]
--        for fullname in fullnames:
--            if os.path.exists(fullname):
--                return fullname
--        assert False, "Unreachable"
-+        testdir = os.path.dirname(__file__)
-+        name = os.path.join(testdir, 'c_files', name)
-+        assert os.path.exists(name)
-+        return name
- 
-     def test_without_cpp(self):
-         ast = parse_file(self._find_file('example_c_file.c'))
-         self.assertTrue(isinstance(ast, c_ast.FileAST))
- 
-     def test_with_cpp(self):
--        c_files_path = os.path.join('tests', 'c_files')
--        ast = parse_file(self._find_file('memmgr.c'), use_cpp=True,
-+        memmgr_path = self._find_file('memmgr.c')
-+        c_files_path = os.path.dirname(memmgr_path)
-+        ast = parse_file(memmgr_path, use_cpp=True,
-             cpp_path=CPPPATH,
-             cpp_args='-I%s' % c_files_path)
-         self.assertTrue(isinstance(ast, c_ast.FileAST))
--    
-+
-+        fake_libc = os.path.join(c_files_path, '..', '..',
-+                                 'utils', 'fake_libc_include')
-         ast2 = parse_file(self._find_file('year.c'), use_cpp=True,
--            cpp_path=CPPPATH, 
--            cpp_args=[
--                r'-Iutils/fake_libc_include',
--                r'-I../utils/fake_libc_include'])
--    
-+            cpp_path=CPPPATH,
-+            cpp_args=[r'-I%s' % fake_libc])
-+
-         self.assertTrue(isinstance(ast2, c_ast.FileAST))
- 
-     def test_cpp_funkydir(self):

Modified: packages/pycparser/trunk/debian/patches/series
===================================================================
--- packages/pycparser/trunk/debian/patches/series	2015-07-04 00:40:37 UTC (rev 33222)
+++ packages/pycparser/trunk/debian/patches/series	2015-07-04 00:58:06 UTC (rev 33223)
@@ -1,2 +1 @@
 system-ply
-relative-tests

Modified: packages/pycparser/trunk/debian/patches/system-ply
===================================================================
--- packages/pycparser/trunk/debian/patches/system-ply	2015-07-04 00:40:37 UTC (rev 33222)
+++ packages/pycparser/trunk/debian/patches/system-ply	2015-07-04 00:58:06 UTC (rev 33223)
@@ -30,12 +30,12 @@
  from .c_lexer import CLexer
 --- a/setup.py
 +++ b/setup.py
-@@ -22,7 +22,7 @@
+@@ -49,7 +49,7 @@
      classifiers = [
          'Programming Language :: Python :: 2',
          'Programming Language :: Python :: 3',],
 -    packages=['pycparser', 'pycparser.ply'],
 +    packages=['pycparser'],
      package_data={'pycparser': ['*.cfg']},
+     cmdclass={'install': install, 'sdist': sdist},
  )
- 

Modified: packages/pycparser/trunk/debian/watch
===================================================================
--- packages/pycparser/trunk/debian/watch	2015-07-04 00:40:37 UTC (rev 33222)
+++ packages/pycparser/trunk/debian/watch	2015-07-04 00:58:06 UTC (rev 33223)
@@ -1,4 +1,4 @@
 version=3
 
-opts=dversionmangle=s/\+dfsg$//,repacksuffix=+dfsg \
-https://pypi.python.org/packages/source/p/pycparser/pycparser-(.+).tar.gz
+opts=dversionmangle=s/\+dfsg$//,repacksuffix=+dfsg,uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/pycparser/pycparser-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

More information about the Python-modules-commits mailing list