← Back to branch summary

~ubuntu-core-dev/update-manager/main

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Barry Warsaw
  • Date: 2012-06-11 15:08:35 UTC
  • mto: (2446.1.6 py3)
  • mto: This revision was merged to the branch mainline in revision 2454.
  • Revision ID: barry@python.org-20120611150835-lbx9cjwzfjy3y7bw
Re-integrate the Python 3 Computer Janitor refactoring branch for now.  The
code itself lives in ~computer-janitor-hackers/computer-janitor/py3refactor
and will eventually be ripped out of here, but for now, this unblocks other
folks.

Still getting test failures in `bzr bd -S` though.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
12
12
 
13
13
def plugins():
14
14
    return []
15
 
    ## return [os.path.join('Janitor/plugins', name)
16
 
    ##         for name in os.listdir('Janitor/plugins')
17
 
    ##         if name.endswith('_plugin.py') and name not in disabled]
 
15
    return [os.path.join('janitor/plugincore/plugins', name)
 
16
            for name in os.listdir('janitor/plugincore/plugins')
 
17
            if name.endswith('_plugin.py') and name not in disabled]
18
18
 
19
19
def profiles():
20
20
    profiles = []
37
37
                'UpdateManager.Core',
38
38
                'UpdateManagerText',
39
39
                'DistUpgrade',
40
 
                #'computerjanitor',
 
40
                'janitor',
41
41
                'AutoUpgradeTester',
42
42
                ],
43
 
      ## package_dir={
44
 
      ##              '': '.',
45
 
      ##              'computerjanitor': 'Janitor/computerjanitor',
46
 
      ##             },
 
43
      package_dir={
 
44
                   '': '.',
 
45
                   'janitor.plugincore': 'janitor/plugincore',
 
46
                  },
47
47
      scripts=[
48
48
               'update-manager', 
49
49
               'ubuntu-support-status', 
69
69
                   ['data/update-manager.convert']),
70
70
                  ('../etc/update-manager/',
71
71
                   ['data/release-upgrades', 'data/meta-release']),
72
 
                  ## ('share/computerjanitor/plugins',
73
 
                  ##  plugins()),
 
72
                  ('share/computerjanitor/plugins',
 
73
                   plugins()),
74
74
                  ('share/auto-upgrade-tester/post_upgrade_tests',
75
75
                   glob.glob("AutoUpgradeTester/post_upgrade_tests/*")),
76
76
                  ]+profiles(),