Skip to content

Commit

Permalink
Merge 503511a into 495b3b0
Browse files Browse the repository at this point in the history
  • Loading branch information
matze committed Aug 9, 2013
2 parents 495b3b0 + 503511a commit 2282d04
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 17 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
language: python

python:
- "2.6"
- "2.7"

virtualenv:
system_site_packages: true

before_install:
- sudo apt-get install -qq gcc gfortran python-dev libatlas-base-dev
- sudo apt-get install -qq python-numpy python-scipy

install:
Expand Down
20 changes: 11 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
argparse>=1.2.1
futures>=2.1.3
logbook>=0.4.0
nose>=1.2.1
prettytable>=0.7.2
pyxdg>=0.20
quantities>=0.10.1
testfixtures>=3.0.0
ipython>=0.13.0
argparse==1.2.1
futures==2.1.4
ipython==0.13.0
logbook==0.4.2
nose==1.3.0
numpy==1.7.1
prettytable==0.7.2
pyxdg==0.25
quantities==0.10.1
scipy
testfixtures==3.0.0
18 changes: 10 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@
exclude_package_data={'': ['README.rst']},
description="Lightweight beamline control system",
long_description=open('README.rst').read(),
install_requires=['argparse >= 1.2.1',
'futures >= 2.1.3',
'logbook >= 0.4.0',
'prettytable >= 0.7.2',
'pyxdg >= 0.20',
'quantities >= 0.10.1'],
tests_require=['nose>=1.2.1',
'testfixtures>=3.0.0'],
install_requires=['argparse',
'futures',
'logbook',
'numpy',
'prettytable',
'pyxdg',
'quantities',
'scipy'],
tests_require=['nose',
'testfixtures'],
test_suite='concert.tests',
)

0 comments on commit 2282d04

Please sign in to comment.