Skip to content

Commit

Permalink
Update to Menpo 0.4.0
Browse files Browse the repository at this point in the history
Also, remove master channel from auto-builds.
  • Loading branch information
patricksnape committed Feb 5, 2015
1 parent cb1de05 commit 4a6f9fa
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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:
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.0a3
- menpo 0.4.0|>=0.4.1,<0.5.0 # Make sure we ignore the alpha
- cyassimp 0.2.0
- cyrasterize 0.2.2
- menpo-pyvrml97 2.3.0a4 # [py27]
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
versioneer.tag_prefix = 'v' # tags are like v1.2.0
versioneer.parentdir_prefix = project_name + '-' # dirname like 'menpo-v1.2.0'

install_requires = ['menpo==0.4.0a3',
install_requires = ['menpo>=0.4.0,<0.5',
'cyassimp==0.2.0',
'cyrasterize==0.2.2']

Expand All @@ -30,5 +30,5 @@
packages=find_packages(),
package_data={'menpo3d': ['data/*']},
install_requires=install_requires,
tests_require=['nose==1.3.4', 'mock==1.0.1']
tests_require=['nose', 'mock']
)

0 comments on commit 4a6f9fa

Please sign in to comment.