From 3d8625e5440fe21a29448422901400566cf4120d Mon Sep 17 00:00:00 2001 From: Brian Cappello Date: Tue, 27 Sep 2016 23:40:11 -0400 Subject: [PATCH 1/3] do not force python version in makefile install ta-lib for travis travis doesnt yet support python on osx --- .travis.yml | 10 +++++++++- Makefile | 14 ++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 028ecadb8..69f95040f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,17 @@ python: - "3.5" os: - linux - - osx +env: + global: + - TA_INCLUDE_PATH=$HOME/dependencies/include + - TA_LIBRARY_PATH=$HOME/dependencies/lib + - LD_LIBRARY_PATH=$HOME/dependencies/lib install: - pip install -r requirements.txt + - mkdir $HOME/dependencies + - wget http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz + - tar -xvzf ta-lib-0.4.0-src.tar.gz + - pushd ta-lib && ./configure --prefix=$HOME/dependencies && make install && popd script: - make - make test diff --git a/Makefile b/Makefile index ce09021bf..c840022f2 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,20 @@ -VERSION?=2.7 - build: - python$(VERSION) setup.py build_ext --inplace + python setup.py build_ext --inplace install: - python$(VERSION) setup.py install + python setup.py install generate: - python$(VERSION) tools/generate.py > talib/func.pyx + python tools/generate.py > talib/func.pyx clean: rm -rf build talib/func*.so talib/abstract*.so talib/common*.so talib/stream*.so talib/*.pyc perf: - python$(VERSION) tools/perf_talib.py + python tools/perf_talib.py test: - LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH} nosetests-$(VERSION) + LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH} nosetests sdist: - python$(VERSION) setup.py sdist --formats=gztar,zip + python setup.py sdist --formats=gztar,zip From 3fd76345bed14fd8a8dfb222b58107f0d6e8d245 Mon Sep 17 00:00:00 2001 From: Brian Cappello Date: Wed, 28 Sep 2016 01:04:17 -0400 Subject: [PATCH 2/3] add pandas for test requirements --- .travis.yml | 2 +- requirements_dev.txt | 3 +-- requirements_test.txt | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 requirements_test.txt diff --git a/.travis.yml b/.travis.yml index 69f95040f..ac186228b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - TA_LIBRARY_PATH=$HOME/dependencies/lib - LD_LIBRARY_PATH=$HOME/dependencies/lib install: - - pip install -r requirements.txt + - pip install -r requirements_test.txt - mkdir $HOME/dependencies - wget http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz - tar -xvzf ta-lib-0.4.0-src.tar.gz diff --git a/requirements_dev.txt b/requirements_dev.txt index cdd535305..7e474d496 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,5 +1,4 @@ -numpy==1.11.1 +-r requirements.txt beautifulsoup4==4.5.1 mistune==0.7.3 -Cython==0.24.1 Pygments==2.1.3 diff --git a/requirements_test.txt b/requirements_test.txt new file mode 100644 index 000000000..b4734b463 --- /dev/null +++ b/requirements_test.txt @@ -0,0 +1,2 @@ +-r requirements.txt +pandas==0.18.1 From 91fd95cc9671c9cc8fc786a80120c3d48b772f41 Mon Sep 17 00:00:00 2001 From: Brian Cappello Date: Wed, 28 Sep 2016 01:28:07 -0400 Subject: [PATCH 3/3] specify compatibility with python 2.7 and 3.3+ --- .travis.yml | 2 -- setup.py | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac186228b..8550eb908 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: python python: - - "2.6" - "2.7" - - "3.2" - "3.3" - "3.4" - "3.5" diff --git a/setup.py b/setup.py index 206562bb1..a43027686 100644 --- a/setup.py +++ b/setup.py @@ -107,8 +107,10 @@ "Operating System :: MacOS :: MacOS X", "Operating System :: Microsoft :: Windows", "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 3", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", "Programming Language :: Cython", "Topic :: Office/Business :: Financial", "Topic :: Scientific/Engineering :: Mathematics",