diff --git a/.travis.yml b/.travis.yml index 54dde0e..84c8814 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: - wget https://raw.githubusercontent.com/jabooth/condaci/v0.2.0/condaci.py -O condaci.py - python condaci.py setup $PYTHON_VERSION --channel $BINSTAR_USER - export PATH=$HOME/miniconda/bin:$PATH -- conda config --add channels $BINSTAR_USER/channel/master +#- conda config --add channels $BINSTAR_USER/channel/master script: - python condaci.py auto ./conda --binstaruser $BINSTAR_USER --binstarkey $BINSTAR_KEY diff --git a/appveyor.yml b/appveyor.yml index 87a076a..5a66e99 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,7 @@ platform: init: - ps: Start-FileDownload 'https://raw.githubusercontent.com/jabooth/condaci/v0.2.0/condaci.py' C:\\condaci.py; echo "Done" - cmd: python C:\\condaci.py setup %PYTHON_VERSION% --channel %BINSTAR_USER% -- cmd: C:\\Miniconda\\Scripts\\conda config --add channels %BINSTAR_USER%/channel/master +#- cmd: C:\\Miniconda\\Scripts\\conda config --add channels %BINSTAR_USER%/channel/master install: - cmd: C:\\Miniconda\\python C:\\condaci.py auto ./conda --binstaruser %BINSTAR_USER% --binstarkey %BINSTAR_KEY% diff --git a/conda/meta.yaml b/conda/meta.yaml index be5e232..3c423b1 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -9,7 +9,7 @@ requirements: run: - python - - menpo # 0.4.0 upon release + - menpo 0.4.0a1 - numpy 1.9.0 - scipy 0.14.0 - scikit-learn 0.15.2 diff --git a/setup.py b/setup.py index e5be3ee..3312f19 100644 --- a/setup.py +++ b/setup.py @@ -15,11 +15,15 @@ setup(name=project_name, version=versioneer.get_version(), cmdclass=versioneer.get_cmdclass(), - description='Pickle anything to HDF5', - author='James Booth', + description="Menpo's image feature point localisation (AAMs, SDMs, " + "CLMs)", + author='The Menpo Development Team', author_email='james.booth08@imperial.ac.uk', packages=find_packages(), install_requires=['numpy==1.9.0', 'scipy==0.14.0', - 'wrapt==1.9.0' - ]) + 'wrapt==1.9.0', + 'menpo==0.4.0a1' + ], + tests_require=['nose==1.3.4', 'mock==1.0.1'] + )