[med-svn] [Git][med-team/pyqi][master] 8 commits: Switch packaging to Python3
Andreas Tille
gitlab at salsa.debian.org
Wed Sep 11 12:44:59 BST 2019
Andreas Tille pushed to branch master at Debian Med / pyqi
Commits:
3bdccb76 by Andreas Tille at 2019-09-11T09:44:46Z
Switch packaging to Python3
- - - - -
0e3cf7ef by Andreas Tille at 2019-09-11T11:12:41Z
buildsystem=pybuild
- - - - -
41c1257d by Andreas Tille at 2019-09-11T11:29:43Z
Use 2to3 to port to Python3
- - - - -
7c2b64b1 by Andreas Tille at 2019-09-11T11:30:45Z
debhelper-compat 12
- - - - -
ce631f36 by Andreas Tille at 2019-09-11T11:30:59Z
Standards-Version: 4.4.0
- - - - -
9ee9bbe9 by Andreas Tille at 2019-09-11T11:31:00Z
Trim trailing whitespace.
Fixes lintian: file-contains-trailing-whitespace
See https://lintian.debian.org/tags/file-contains-trailing-whitespace.html for more details.
- - - - -
f4fa0669 by Andreas Tille at 2019-09-11T11:38:59Z
Let dh_auto_clean succeed in any case
- - - - -
2ffe0449 by Andreas Tille at 2019-09-11T11:40:55Z
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/2to3.patch
- + debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+pyqi (0.3.2+dfsg-4) unstable; urgency=medium
+
+ * Use 2to3 to port to Python3
+ Closes: #937512
+ * buildsystem=pybuild
+ * debhelper-compat 12
+ * Standards-Version: 4.4.0
+ * Trim trailing whitespace.
+
+ -- Andreas Tille <tille at debian.org> Wed, 11 Sep 2019 13:39:34 +0200
+
pyqi (0.3.2+dfsg-3) unstable; urgency=medium
* debhelper 11
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -5,14 +5,15 @@ Uploaders: Andreas Tille <tille at debian.org>,
Section: python
Testsuite: autopkgtest-pkg-python
Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
+ dh-python,
dh-linktree,
- python,
+ python3,
python3-sphinx,
- python-setuptools,
+ python3-setuptools,
sphinx-common,
libjs-sphinxdoc
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
Vcs-Browser: https://salsa.debian.org/med-team/pyqi
Vcs-Git: https://salsa.debian.org/med-team/pyqi.git
Homepage: https://pypi.python.org/pypi/pyqi/
@@ -20,7 +21,7 @@ Homepage: https://pypi.python.org/pypi/pyqi/
Package: pyqi
Architecture: all
Depends: ${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
${js:Depends}
Description: Python framework for wrapping general commands in multiple interfaces
pyqi (canonically pronounced pie chee) is a Python framework designed to
=====================================
debian/patches/2to3.patch
=====================================
@@ -0,0 +1,764 @@
+Description: Use 2to3 to port to Python3
+Bug-Debian: https://bugs.debian.org/937512
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 11 Sep 2019 11:43:51 +0200
+
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -40,8 +40,8 @@ source_suffix = '.rst'
+ master_doc = 'index'
+
+ # General information about the project.
+-project = u'pyqi'
+-copyright = u'2013, The BiPy Development Team'
++project = 'pyqi'
++copyright = '2013, The BiPy Development Team'
+
+ # The version info for the project you're documenting, acts as replacement for
+ # |version| and |release|, also used in various other places throughout the
+@@ -181,8 +181,8 @@ latex_elements = {
+ # Grouping the document tree into LaTeX files. List of tuples
+ # (source start file, target name, title, author, documentclass [howto/manual]).
+ latex_documents = [
+- ('index', 'pyqi.tex', u'pyqi Documentation',
+- u'The BiPy Development Team', 'manual'),
++ ('index', 'pyqi.tex', 'pyqi Documentation',
++ 'The BiPy Development Team', 'manual'),
+ ]
+
+ # The name of an image file (relative to this directory) to place at the top of
+@@ -211,8 +211,8 @@ latex_documents = [
+ # One entry per manual page. List of tuples
+ # (source start file, name, description, authors, manual section).
+ man_pages = [
+- ('index', 'pyqi', u'pyqi Documentation',
+- [u'The BiPy Development Team'], 1)
++ ('index', 'pyqi', 'pyqi Documentation',
++ ['The BiPy Development Team'], 1)
+ ]
+
+ # If true, show URL addresses after external links.
+@@ -225,8 +225,8 @@ man_pages = [
+ # (source start file, target name, title, author,
+ # dir menu entry, description, category)
+ texinfo_documents = [
+- ('index', 'pyqi', u'pyqi Documentation',
+- u'The BiPy Development Team', 'pyqi', 'One line description of project.',
++ ('index', 'pyqi', 'pyqi Documentation',
++ 'The BiPy Development Team', 'pyqi', 'One line description of project.',
+ 'Miscellaneous'),
+ ]
+
+--- a/doc/tutorials/defining_new_commands.rst
++++ b/doc/tutorials/defining_new_commands.rst
+@@ -20,7 +20,7 @@ To create our sequence collection summar
+
+ If you run this command locally, substituting your own name where applicable, you'll have a new file called ``sequence_collection_summarizer.py``, which will look roughly like the following::
+
+- #!/usr/bin/env python
++ #!/usr/bin/python3
+ from __future__ import division
+
+ __credits__ = ["Greg Caporaso"]
+@@ -117,7 +117,7 @@ A complete example Command
+
+ The following illustrates a complete python file defining a new pyqi ``Command``::
+
+- #!/usr/bin/env python
++ #!/usr/bin/python3
+ from __future__ import division
+
+ __credits__ = ["Greg Caporaso"]
+@@ -180,11 +180,11 @@ At this stage you have defined a new com
+ >>> r
+ {'max_length': 12, 'min_length': 6, 'num_seqs': 2}
+ # Alternatively, you can access each value independently, as with any dictionary.
+- >>> print r['num_seqs']
++ >>> print(r['num_seqs'])
+ 2
+- >>> print r['min_length']
++ >>> print(r['min_length'])
+ 6
+- >>> print r['max_length']
++ >>> print(r['max_length'])
+ 12
+ # You can call this command again with different input.
+ # For example, we can call the command again passing the
+--- a/doc/tutorials/defining_new_interfaces.rst
++++ b/doc/tutorials/defining_new_interfaces.rst
+@@ -24,7 +24,7 @@ To create your interface, you'll need to
+
+ The resulting file will look something like this::
+
+- #!/usr/bin/env python
++ #!/usr/bin/python3
+ from __future__ import division
+
+ __credits__ = ["Greg Caporaso"]
+@@ -281,7 +281,7 @@ Complete OptparseInterface configuration
+
+ At this stage we've fully configured our interface. The final interface configuration file should look like this::
+
+- #!/usr/bin/env python
++ #!/usr/bin/python3
+ from __future__ import division
+
+ __credits__ = ["Greg Caporaso"]
+--- a/pyqi/__init__.py
++++ b/pyqi/__init__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/commands/__init__.py
++++ b/pyqi/commands/__init__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/commands/code_header_generator.py
++++ b/pyqi/commands/code_header_generator.py
+@@ -1,5 +1,5 @@
+-#!/usr/bin/env python
+-from __future__ import division
++#!/usr/bin/python3
++
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -61,12 +61,12 @@ class CodeHeaderGenerator(Command):
+ credits = [head['author']]
+ if kwargs['credits'] is not None:
+ credits.extend(kwargs['credits'])
+- credits = filter(lambda x: x is not None, credits)
++ credits = [x for x in credits if x is not None]
+ f = lambda x: '"%s"' % x
+ head['credits'] = ', '.join(map(f, credits))
+
+ header_lines = []
+- header_lines.append("#!/usr/bin/env python")
++ header_lines.append("#!/usr/bin/python3")
+ header_lines.append("from __future__ import division")
+ header_lines.append("")
+
+--- a/pyqi/commands/make_bash_completion.py
++++ b/pyqi/commands/make_bash_completion.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -8,7 +8,7 @@
+ # The full license is in the file COPYING.txt, distributed with this software.
+ #-----------------------------------------------------------------------------
+
+-from __future__ import division
++
+
+ __credits__ = ["Daniel McDonald", "Jai Ram Rideout", "Doug Wendel",
+ "Greg Caporaso"]
+--- a/pyqi/commands/make_command.py
++++ b/pyqi/commands/make_command.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/commands/make_optparse.py
++++ b/pyqi/commands/make_optparse.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -8,7 +8,7 @@
+ # The full license is in the file COPYING.txt, distributed with this software.
+ #-----------------------------------------------------------------------------
+
+-from __future__ import division
++
+ from operator import attrgetter
+ from pyqi.core.command import (Command, CommandIn, CommandOut,
+ ParameterCollection)
+@@ -137,7 +137,7 @@ class MakeOptparse(CodeHeaderGenerator):
+
+ # construct inputs based off of CommandIns
+ cmdin_formatted = []
+- for cmdin in sorted(kwargs['command'].CommandIns.values(),
++ for cmdin in sorted(list(kwargs['command'].CommandIns.values()),
+ key=attrgetter('Name')):
+ if cmdin.Required:
+ default_block = ''
+@@ -162,7 +162,7 @@ class MakeOptparse(CodeHeaderGenerator):
+ cmdin_formatted.append(input_format % fmt)
+
+ cmdout_formatted = []
+- for cmdin in sorted(kwargs['command'].CommandOuts.values(),
++ for cmdin in sorted(list(kwargs['command'].CommandOuts.values()),
+ key=attrgetter('Name')):
+ fmt = {'name':cmdin.Name}
+ cmdout_formatted.append(output_format % fmt)
+--- a/pyqi/commands/make_release.py
++++ b/pyqi/commands/make_release.py
+@@ -1,5 +1,5 @@
+-#!/usr/bin/env python
+-from __future__ import division
++#!/usr/bin/python3
++
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -74,7 +74,7 @@ class MakeRelease(Command):
+
+ def _bump_version(self, version):
+ try:
+- parts = map(int, version.split('.'))
++ parts = list(map(int, version.split('.')))
+ except ValueError:
+ self._fail('Current version is not numeric')
+ parts[-1] += 1
+--- a/pyqi/commands/serve_html_interface.py
++++ b/pyqi/commands/serve_html_interface.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -8,7 +8,7 @@
+ # The full license is in the file COPYING.txt, distributed with this software.
+ #-----------------------------------------------------------------------------
+
+-from __future__ import division
++
+
+ __credits__ = ["Evan Bolyen"]
+
+--- a/pyqi/core/__init__.py
++++ b/pyqi/core/__init__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/core/command.py
++++ b/pyqi/core/command.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -7,7 +7,7 @@
+ #
+ # The full license is in the file COPYING.txt, distributed with this software.
+ #-----------------------------------------------------------------------------
+-from __future__ import division
++
+
+ __credits__ = ["Greg Caporaso", "Daniel McDonald", "Doug Wendel",
+ "Jai Ram Rideout"]
+@@ -162,7 +162,7 @@ class Command(object):
+ self_str = str(self.__class__)
+
+ # check required parameters
+- for p in self.CommandIns.values():
++ for p in list(self.CommandIns.values()):
+ if p.Required and p.Name not in kwargs:
+ err_msg = 'Missing required CommandIn %s in %s' % (p.Name,
+ self_str)
+@@ -187,7 +187,7 @@ class Command(object):
+ """Validate the result from a ``Command.run``"""
+ self_str = str(self.__class__)
+
+- for p in self.CommandOuts.values():
++ for p in list(self.CommandOuts.values()):
+ if p.Name not in result:
+ err_msg = "CommandOut %s not in %s" % (p.Name, self_str)
+ self._logger.fatal(err_msg)
+@@ -200,7 +200,7 @@ class Command(object):
+
+ def _set_defaults(self, kwargs):
+ """Set defaults for optional parameters"""
+- for p in self.CommandIns.values():
++ for p in list(self.CommandIns.values()):
+ if not p.Required and p.Name not in kwargs:
+ kwargs[p.Name] = p.Default
+
+--- a/pyqi/core/container.py
++++ b/pyqi/core/container.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/core/exception.py
++++ b/pyqi/core/exception.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/core/factory.py
++++ b/pyqi/core/factory.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/core/interface.py
++++ b/pyqi/core/interface.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/core/interfaces/__init__.py
++++ b/pyqi/core/interfaces/__init__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/core/interfaces/html/__init__.py
++++ b/pyqi/core/interfaces/html/__init__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -18,7 +18,7 @@ import sys
+
+ from pyqi.util import is_py2
+ if is_py2():
+- from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
++ from http.server import BaseHTTPRequestHandler, HTTPServer
+ else:
+ from http.server import BaseHTTPRequestHandler, HTTPServer
+
+@@ -125,7 +125,7 @@ class HTMLInputOption(InterfaceInputOpti
+ if self.Choices is None:
+ raise IncompetentDeveloperError(
+ "must supply a list of Choices for type '%s'" % self.type, self)
+- elif type(self.Choices) not in (types.TupleType, types.ListType):
++ elif type(self.Choices) not in (tuple, list):
+ raise IncompetentDeveloperError(
+ "choices must be a list of strings ('%s' supplied)"
+ % str(type(self.Choices)).split("'")[1], self)
+@@ -513,7 +513,7 @@ def get_http_handler(module):
+ def start_server(port, module):
+ """Start a server for the HTMLInterface on the specified port"""
+ interface_server = HTTPServer(("", port), get_http_handler(module))
+- print("-- Starting server at http://localhost:%d --" % port)
++ print(("-- Starting server at http://localhost:%d --" % port))
+ print("To close the server, type 'ctrl-c' into this window.")
+ try:
+ interface_server.serve_forever()
+--- a/pyqi/core/interfaces/html/input_handler.py
++++ b/pyqi/core/interfaces/html/input_handler.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+
+ #-----------------------------------------------------------------------------
+--- a/pyqi/core/interfaces/html/output_handler.py
++++ b/pyqi/core/interfaces/html/output_handler.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+
+ #-----------------------------------------------------------------------------
+--- a/pyqi/core/interfaces/optparse/__init__.py
++++ b/pyqi/core/interfaces/optparse/__init__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/core/interfaces/optparse/input_handler.py
++++ b/pyqi/core/interfaces/optparse/input_handler.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ """Command line interface input handlers
+
+--- a/pyqi/core/interfaces/optparse/output_handler.py
++++ b/pyqi/core/interfaces/optparse/output_handler.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ """Command line interface output handlers
+
+--- a/pyqi/core/log.py
++++ b/pyqi/core/log.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -7,7 +7,7 @@
+ #
+ # The full license is in the file COPYING.txt, distributed with this software.
+ #-----------------------------------------------------------------------------
+-from __future__ import division
++
+
+ from sys import stderr
+ from datetime import datetime
+--- a/pyqi/core/parallel.py
++++ b/pyqi/core/parallel.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ """Manage IPython.parallel clusters in the notebook.
+
+@@ -73,7 +73,7 @@ class ClusterManager(LoggingConfigurable
+ def update_profiles(self):
+ """List all profiles in the ipython_dir and cwd.
+ """
+- for path in [get_ipython_dir(), os.getcwdu()]:
++ for path in [get_ipython_dir(), os.getcwd()]:
+ for profile in list_profiles_in(path):
+ pd = self.get_profile_dir(profile, path)
+ if profile not in self.profiles:
+@@ -94,7 +94,7 @@ class ClusterManager(LoggingConfigurable
+
+ def check_profile(self, profile):
+ if profile not in self.profiles:
+- raise IOError(u'profile not found')
++ raise IOError('profile not found')
+
+ def profile_info(self, profile):
+ self.check_profile(profile)
+@@ -112,7 +112,7 @@ class ClusterManager(LoggingConfigurable
+ self.check_profile(profile)
+ data = self.profiles[profile]
+ if data['status'] == 'running':
+- raise ValueError(u'cluster already running')
++ raise ValueError('cluster already running')
+ cl, esl, default_n = self.build_launchers(data['profile_dir'])
+ n = n if n is not None else default_n
+
+@@ -154,7 +154,7 @@ class ClusterManager(LoggingConfigurable
+ self.check_profile(profile)
+ data = self.profiles[profile]
+ if data['status'] == 'stopped':
+- raise ValueError(u'cluster not running')
++ raise ValueError('cluster not running')
+ data = self.profiles[profile]
+ cl = data['controller_launcher']
+ esl = data['engine_set_launcher']
+@@ -172,7 +172,7 @@ class ClusterManager(LoggingConfigurable
+ return result
+
+ def stop_all_clusters(self):
+- for p in self.profiles.keys():
++ for p in list(self.profiles.keys()):
+ self.stop_cluster(p)
+
+
+--- a/pyqi/functional.py
++++ b/pyqi/functional.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ from pyqi.core.interface import Interface, InterfaceOption
+ from testing import FilterSamples, FilterObservations
+@@ -7,6 +7,7 @@ from types import NoneType
+ from pyqi.core.factory import general_factory
+ from biom.table import Table as BIOMTable
+ from biom.parse import parse_biom_table
++from functools import reduce
+
+
+ class Functional(Interface):
+@@ -67,11 +68,11 @@ t3 = parse_biom_table(
+ open('/Users/mcdonadt/ResearchWork/software/biom-format/examples/rich_sparse_otu_table.biom'))
+
+ res = g(f("asdasdasd", seqs_per_sample=3), seqs_per_observation=1)
+-res2 = map(lambda x: f(x, seqs_per_sample=3), [t1, t2, t3])
++res2 = [f(x, seqs_per_sample=3) for x in [t1, t2, t3]]
+ res3 = reduce(lambda x, y: x.merge(f(y, seqs_per_sample=3)), [t1, t2, t3])
+
+-print res
++print(res)
+ for i in res2:
+- print i
+-print "***"
+-print res3
++ print(i)
++print("***")
++print(res3)
+--- a/pyqi/interfaces/__init__.py
++++ b/pyqi/interfaces/__init__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -7,7 +7,7 @@
+ #
+ # The full license is in the file COPYING.txt, distributed with this software.
+ #-----------------------------------------------------------------------------
+-from __future__ import division
++
+
+ __credits__ = ["Greg Caporaso", "Daniel McDonald", "Doug Wendel",
+ "Jai Ram Rideout"]
+--- a/pyqi/interfaces/html/config/make_bash_completion.py
++++ b/pyqi/interfaces/html/config/make_bash_completion.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/interfaces/html/config/make_command.py
++++ b/pyqi/interfaces/html/config/make_command.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/interfaces/html/config/make_optparse.py
++++ b/pyqi/interfaces/html/config/make_optparse.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/interfaces/optparse/__init__.py
++++ b/pyqi/interfaces/optparse/__init__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -7,7 +7,7 @@
+ #
+ # The full license is in the file COPYING.txt, distributed with this software.
+ #-----------------------------------------------------------------------------
+-from __future__ import division
++
+
+ __credits__ = ["Greg Caporaso", "Daniel McDonald", "Doug Wendel",
+ "Jai Ram Rideout"]
+--- a/pyqi/interfaces/optparse/config/__init__.py
++++ b/pyqi/interfaces/optparse/config/__init__.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/interfaces/optparse/config/make_bash_completion.py
++++ b/pyqi/interfaces/optparse/config/make_bash_completion.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/interfaces/optparse/config/make_command.py
++++ b/pyqi/interfaces/optparse/config/make_command.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/interfaces/optparse/config/make_optparse.py
++++ b/pyqi/interfaces/optparse/config/make_optparse.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/interfaces/optparse/config/make_release.py
++++ b/pyqi/interfaces/optparse/config/make_release.py
+@@ -1,5 +1,5 @@
+-#!/usr/bin/env python
+-from __future__ import division
++#!/usr/bin/python3
++
+
+ __credits__ = ["Daniel McDonald"]
+
+--- a/pyqi/interfaces/optparse/config/serve_html_interface.py
++++ b/pyqi/interfaces/optparse/config/serve_html_interface.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/pyqi/interfaces/optparse/input_handler.py
++++ b/pyqi/interfaces/optparse/input_handler.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -7,7 +7,7 @@
+ #
+ # The full license is in the file COPYING.txt, distributed with this software.
+ #-----------------------------------------------------------------------------
+-from __future__ import division
++
+
+ __credits__ = ["Greg Caporaso", "Daniel McDonald", "Doug Wendel",
+ "Jai Ram Rideout"]
+--- a/pyqi/interfaces/optparse/output_handler.py
++++ b/pyqi/interfaces/optparse/output_handler.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -7,7 +7,7 @@
+ #
+ # The full license is in the file COPYING.txt, distributed with this software.
+ #-----------------------------------------------------------------------------
+-from __future__ import division
++
+
+ __credits__ = ["Greg Caporaso", "Daniel McDonald", "Doug Wendel",
+ "Jai Ram Rideout"]
+--- a/pyqi/util.py
++++ b/pyqi/util.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -88,7 +88,7 @@ def old_to_new_command(driver_name, proj
+
+ Use like this (put in the script you want to deprecate):
+
+- #!/usr/bin/env python
++ #!/usr/bin/python3
+ import sys
+ from pyqi.util import old_to_new_command
+
+--- a/scripts/bar
++++ b/scripts/bar
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ __author__ = "b"
+ __copyright__ = "q"
+--- a/scripts/direct_make_command.py
++++ b/scripts/direct_make_command.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/scripts/foo
++++ b/scripts/foo
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ from __future__ import division
+
+ __author__ = "b"
+--- a/scripts/optparse
++++ b/scripts/optparse
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/scripts/pyqi
++++ b/scripts/pyqi
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/scripts/qiime
++++ b/scripts/qiime
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+--- a/scripts/test_bar
++++ b/scripts/test_bar
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ __author__ = "b"
+ __copyright__ = "q"
+--- a/scripts/testing
++++ b/scripts/testing
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ from pyqi.core.interfaces.optparse import (OptparseOption,
+ OptparseUsageExample,
+--- a/setup.py
++++ b/setup.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2013, The BiPy Development Team.
+@@ -32,7 +32,7 @@ classes = """
+ Topic :: Software Development :: Libraries :: Application Frameworks
+ Topic :: Software Development :: User Interfaces
+ Programming Language :: Python
+- Programming Language :: Python :: 2.7
++ Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3.3
+ Programming Language :: Python :: Implementation :: CPython
+ Operating System :: OS Independent
+@@ -43,8 +43,8 @@ classifiers = [s.strip() for s in classe
+
+ # Verify Python version
+ ver = '.'.join(map(str, [sys.version_info.major, sys.version_info.minor]))
+-if ver not in ['2.7', '3.3']:
+- sys.stderr.write("Only Python 2.7 and 3.3 are supported.")
++if ver not in ['3.7', '3.3']:
++ sys.stderr.write("Only Python 3.7 and 3.3 are supported.")
+ sys.exit(1)
+
+ long_description = """pyqi (canonically pronounced pie chee) is a Python framework designed to support wrapping general commands in multiple types of interfaces, including at the command line, HTML, and API levels."""
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+2to3.patch
=====================================
debian/rules
=====================================
@@ -3,13 +3,12 @@
export DH_OPTIONS
%:
- dh $@ --with python2 --with linktree
+ dh $@ --with python3 --with linktree --buildsystem=pybuild
override_dh_auto_build:
dh_auto_build
cd doc && make man htmlhelp
override_dh_auto_clean:
- dh_auto_clean
+ dh_auto_clean || true
cd doc && make clean
-
View it on GitLab: https://salsa.debian.org/med-team/pyqi/compare/4654191be1bac7d43fea41ad98600aeefd094ede...2ffe04496faccc14c028872972df12740e41a2c4
--
View it on GitLab: https://salsa.debian.org/med-team/pyqi/compare/4654191be1bac7d43fea41ad98600aeefd094ede...2ffe04496faccc14c028872972df12740e41a2c4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190911/9b78ae02/attachment-0001.html>
More information about the debian-med-commit
mailing list