Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove setuptools-trial from dependencies.

Having this causes setuptools-trial to be installed unconditionally
(at least when `--help-commands` is passed). We shouldn't install anything
unless the user asks us to.
  • Loading branch information...
commit 74e75cf2aace6a1fdb3fde2cf1326017da822712 1 parent 679cc45
@tomprince tomprince authored
Showing with 1 addition and 9 deletions.
  1. +0 −1  .gitignore
  2. +1 −5 master/setup.py
  3. +0 −3  slave/setup.py
View
1  .gitignore
@@ -35,4 +35,3 @@ common/googlecode_upload.py
master/docs/tutorial/_build
_build
.tox
-master/setuptools_trial*
View
6 master/setup.py
@@ -23,7 +23,7 @@
import os
import glob
-from distutils.core import setup, Command
+from distutils.core import setup
from buildbot import version
from distutils.command.install_data import install_data
@@ -195,10 +195,6 @@ def make_release_tree(self, base_dir, files):
'sqlalchemy-migrate ==0.6.1, ==0.7.0, ==0.7.1, ==0.7.2',
'python-dateutil==1.5',
]
- if '--help-commands' in sys.argv or 'trial' in sys.argv or 'test' in sys.argv:
- setup_args['setup_requires'] = [
- 'setuptools_trial',
- ]
setup_args['tests_require'] = [
'mock',
]
View
3  slave/setup.py
@@ -121,9 +121,6 @@ def make_release_tree(self, base_dir, files):
setup_args['install_requires'] = [
'twisted >= 8.0.0',
]
- setup_args['setup_requires'] = [
- 'setuptools_trial',
- ]
setup_args['tests_require'] = [
'mock',
]
Please sign in to comment.
Something went wrong with that request. Please try again.