← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
401
401
    # PyQt4 itself still escapes the plugin detection code for some reason...
402
402
    packages.append('PyQt4')
403
403
    excludes.append('PyQt4.elementtree.ElementTree')
 
404
    excludes.append('PyQt4.uic.port_v3')
404
405
    includes.append('sip') # extension module required for Qt.
405
406
    packages.append('pygments') # colorizer for qbzr
406
407
    packages.append('docutils') # html formatting