pkgme-devportal

Merge lp:~jml/pkgme-devportal/dep-cleanup into lp:pkgme-devportal

  1. dep-cleanup
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: James Westby
Approved revision: 181
Merged at revision: 147
Proposed branch: lp:~jml/pkgme-devportal/dep-cleanup
Merge into: lp:pkgme-devportal
Diff against target: 57 lines (+3/-10)
3 files modified
devportalbinary/tests/__init__.py (+2/-5)
setup.py (+1/-3)
versions.cfg (+0/-2)
To merge this branch: bzr merge lp:~jml/pkgme-devportal/dep-cleanup
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+134128@code.launchpad.net

Commit message

Clean up the dependencies

Description of the change

Clean up dependencies.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'devportalbinary/tests/__init__.py'
2--- devportalbinary/tests/__init__.py 2012-09-12 15:04:26 +0000
3+++ devportalbinary/tests/__init__.py 2012-11-13 15:29:11 +0000
4@@ -3,8 +3,6 @@
5
6 from unittest import TestLoader
7
8-from testresources import OptimisingTestSuite
9-
10
11 def test_suite():
12 """Insert an OptimizingTestSuite for testresources."""
13@@ -20,6 +18,5 @@
14 'devportalbinary.tests.test_utils',
15 ]
16 loader = TestLoader()
17- tests = OptimisingTestSuite()
18- tests.addTests(loader.loadTestsFromNames(module_names))
19- return tests
20+ return loader.loadTestsFromNames(module_names)
21+
22
23=== modified file 'setup.py'
24--- setup.py 2012-11-13 14:00:37 +0000
25+++ setup.py 2012-11-13 15:29:11 +0000
26@@ -42,7 +42,7 @@
27 'PIL',
28 'pkgme>=0.4.1',
29 'fixtures',
30- 'storm',
31+ 'storm', # Not actually used, but libdep-service does it wrong
32 ],
33 entry_points = {
34 'console_scripts': [
35@@ -53,8 +53,6 @@
36 },
37 extras_require = {
38 'testing': [
39- 'postgresfixture',
40- 'testresources',
41 'testtools',
42 'treeshape',
43 ],
44
45=== modified file 'versions.cfg'
46--- versions.cfg 2012-11-13 14:21:41 +0000
47+++ versions.cfg 2012-11-13 15:29:11 +0000
48@@ -50,9 +50,7 @@
49 paste = 1.7.5.1
50 pathod = 0.2.1
51 PIL = 1.1.7
52-postgresfixture = 0.1.2
53 pkgme = 0.4.1
54-psycopg2 = 2.4.5
55 pyasn1 = 0.1.4
56 pyopenssl = 0.13
57 python-dateutil = 1.5

Subscribers

People subscribed via source and target branches