diff --git a/.gitignore b/.gitignore index 2868b1da..305dc8ef 100644 --- a/.gitignore +++ b/.gitignore @@ -63,5 +63,3 @@ benchmarks.db # Intellij IDE temp project files .project zipline.iml - -.binstar.yml \ No newline at end of file diff --git a/binstar/cyordereddict/.binstar.yml b/binstar/cyordereddict/.binstar.yml deleted file mode 100644 index a86e908b..00000000 --- a/binstar/cyordereddict/.binstar.yml +++ /dev/null @@ -1,22 +0,0 @@ -package: cyordereddict -user: quantopian - -platform: - - linux-64 -engine: - - python=2.7 - - python=3.4 - -install: - - conda config --add channels quantopian - - conda config --set always_yes true - -before_script: - - python -V - -script: - - conda build conda/cyordereddict - -iotimeout: 600 - -build_targets: conda diff --git a/binstar/logbook/.binstar.yml b/binstar/logbook/.binstar.yml deleted file mode 100644 index d8fa621e..00000000 --- a/binstar/logbook/.binstar.yml +++ /dev/null @@ -1,22 +0,0 @@ -package: logbook -user: quantopian - -platform: - - linux-64 -engine: - - python=2.7 - - python=3.4 - -install: - - conda config --add channels quantopian - - conda config --set always_yes true - -before_script: - - python -V - -script: - - conda build conda/logbook/ - -iotimeout: 600 - -build_targets: conda diff --git a/binstar/ta-lib/.binstar.yml b/binstar/ta-lib/.binstar.yml deleted file mode 100644 index fe158bb7..00000000 --- a/binstar/ta-lib/.binstar.yml +++ /dev/null @@ -1,22 +0,0 @@ -package: ta-lib -user: quantopian - -platform: - - linux-64 -engine: - - python=2.7 - - python=3.4 - -install: - - conda config --add channels quantopian - - conda config --set always_yes true - -before_script: - - python -V - -script: - - conda build conda/ta-lib/ - -iotimeout: 600 - -build_targets: conda diff --git a/binstar/zipline/.binstar.yml b/binstar/zipline/.binstar.yml deleted file mode 100644 index 51172ed6..00000000 --- a/binstar/zipline/.binstar.yml +++ /dev/null @@ -1,27 +0,0 @@ -package: zipline -user: quantopian - -platform: - - linux-64 -engine: - - python=2.7 - - python=3.4 - -install: - - conda config --add channels quantopian - - conda config --set always_yes true - - source deactivate - # conda-build built from https://github.com/conda/conda-build/pull/717 - # (conda-build can only be installed in root env.) - - conda install conda-build=1.10alpha.0 - - source activate /home/anaconda/env - -before_script: - - python -V - -script: - - conda build conda/zipline/ - -iotimeout: 600 - -build_targets: conda diff --git a/setup.py b/setup.py index 51c14997..cad73dbd 100644 --- a/setup.py +++ b/setup.py @@ -239,8 +239,13 @@ setup_requires = module_requirements( conda_format=conda_build, ) +conditional_arguments = { + 'setup_requires' if not conda_build else 'build_requires': setup_requires, +} + setup( name='zipline', + url="http://zipline.io", version=versioneer.get_version(), cmdclass=LazyBuildExtCommandClass(versioneer.get_cmdclass()), description='A backtester for financial algorithms.', @@ -266,7 +271,5 @@ setup( ], install_requires=install_requires(conda_format=conda_build), extras_require=extras_requires(conda_format=conda_build), - setup_requires=setup_requires if not conda_build else [], - build_requires=setup_requires, - url="http://zipline.io", + **conditional_arguments )