← Back to branch summary

~ubuntu-branches/ubuntu/trusty/dh-python/trusty

« back to all changes in this revision

Viewing changes to dh_python3

  • Committer: Package Import Robot
  • Author(s): Piotr Ożarowski, Piotr Ożarowski, Steve Langasek, B. Clausius
  • Date: 2013-09-13 20:47:46 UTC
  • mfrom: (4.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20130913204746-x0xmwljlw215j8tb
Tags: 1.20130913-1
http://bugs.debian.org/722307
http://bugs.debian.org/722045
http://bugs.debian.org/722214
[ Piotr Ożarowski ]
* dh_py*:
  - add --requires option
  - do not generate "python2" dependency while guessing private
    extension's version using shebangs in other files (closes: #722307)

[ Steve Langasek ]
* Adjust dh_python to be multiarch-friendly (closes: 722045)

[ B. Clausius ]
* pybuild: fix --test when LC_ALL=C and setup.py contains non-ascii
  characters (closes: 722214)

Show diffs side-by-side

added added

removed removed

Lines of Context:
dh_python3
103
103
    parser.add_option('--suggests', action='append',
104
104
                      help='translate given requirements into Debian '
105
105
                           'dependencies and add them to ${python3:Suggests}')
 
106
    parser.add_option('--requires', action='append',
 
107
                      help='translate requirements from given file into Debian '
 
108
                           'dependencies and add them to ${python3:Depends}')
106
109
    parser.add_option('--shebang',
107
110
                      help='use given command as shebang in scripts')
108
111
    parser.add_option('--ignore-shebangs', action='store_true', default=False,
216
219
                    ver = str(options.vrange)
217
220
                else:  # try shebang or default Python version
218
221
                    ver = (list(i.version for i in details.get('shebangs', [])
219
 
                                if i.version) or [None])[0] or DEFAULT
 
222
                                if i.version and i.version.minor) or [None])[0] or DEFAULT
220
223
                dependencies.depend("python%s" % ver)
221
224
                args += " -V %s" % ver
222
225
            else: