Skip to content

Commit

Permalink
Simplify installation of test deps
Browse files Browse the repository at this point in the history
Pip >=6 can handle the functionality of filtering dependencies
within a single requirements files instead of needing to shim
this functionality in externally.
  • Loading branch information
dstufft committed Dec 20, 2016
1 parent 000f4e0 commit 4d85d4f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
nose==1.3.3
mock==1.3.0
wheel==0.24.0
unittest2==0.5.1; python_version == '2.6'
1 change: 0 additions & 1 deletion requirements26.txt

This file was deleted.

10 changes: 0 additions & 10 deletions scripts/ci/install
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,6 @@ os.chdir(REPO_ROOT)
def run(command):
return check_call(command, shell=True)


try:
# Has the form "major.minor"
python_version = os.environ['PYTHON_VERSION']
except KeyError:
python_version = '.'.join([str(i) for i in sys.version_info[:2]])

if python_version == '2.6':
run('pip install -r requirements26.txt')

run('pip install -r requirements.txt')
run('pip install coverage')
if os.path.isdir('dist') and os.listdir('dist'):
Expand Down

0 comments on commit 4d85d4f

Please sign in to comment.