Skip to content

Commit

Permalink
preparing for alpha release
Browse files Browse the repository at this point in the history
  • Loading branch information
jabooth committed Nov 2, 2014
1 parent bc4cd07 commit 7199541
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
2 changes: 1 addition & 1 deletion conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 8 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='[email protected]',
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']
)

0 comments on commit 7199541

Please sign in to comment.