Skip to content

Commit

Permalink
Fixed #89, closes #90.
Browse files Browse the repository at this point in the history
  • Loading branch information
cgddrd committed Apr 2, 2015
1 parent 1c3bc4f commit 32681d2
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 10 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ before_install:
- sudo apt-get install python-opencv
- sudo apt-get install -qq python-numpy python-scipy
- sudo dpkg -L python-opencv
# - sudo pip install coverage
# - sudo pip install cython
# - sudo pip install setuptools_cython

# We want to skip the 'install' stage, as this is handled by the project-specific scripts.
install: true
Expand Down
2 changes: 1 addition & 1 deletion src/template_matching_scaling/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pip==6.0.8
cython
matplotlib
nose
coverage
cython
python-coveralls
5 changes: 0 additions & 5 deletions src/template_matching_scaling/run_travisci_proj_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,5 @@ python setup.py build_ext --inplace
# Run the 'setup.py' script to install dependencies etc.
python setup.py install

# Just checking the 'Cython' files have been compiled.
cd tse_compiled
ls -l
cd ..

# Run the automated unti tests with coverage.
nosetests -w tests/ --with-coverage --cover-package=tse --cover-erase
1 change: 0 additions & 1 deletion src/template_matching_scaling/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
version='2.1.0',
zip_safe=False,
packages=['tse', 'tse_compiled', 'tests'],
# setup_requires=['cython'],
install_requires=reqs,
url='https://github.com/cgddrd/CS39440-major-project',
author='Connor Goddard',
Expand Down

0 comments on commit 32681d2

Please sign in to comment.