Skip to content

Commit

Permalink
Update the conda/setup.py with new versions in
Browse files Browse the repository at this point in the history
preparaton for conda-forge
  • Loading branch information
patricksnape committed Jul 14, 2019
1 parent c53d948 commit 02a015c
Show file tree
Hide file tree
Showing 10 changed files with 78 additions and 86 deletions.
32 changes: 19 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
sudo: false
language: generic

os:
- osx
- linux
osx_image: xcode6.4

git:
depth: 200

env:
global:
- BINSTAR_USER: menpo
matrix:
- PYTHON_VERSION: 2.7
- PYTHON_VERSION: 3.5
- CONDACI_PYPI_SDIST_UPLOAD_PY_VER=3.7
- BINSTAR_USER=menpo

matrix:
include:
- os: osx
osx_image: xcode9
env: PYTHON_VERSION=3.6
- os: osx
osx_image: xcode9
env: PYTHON_VERSION=3.7
- os: linux
env: PYTHON_VERSION=3.6
- os: linux
env: PYTHON_VERSION=3.7

install:
- wget https://raw.githubusercontent.com/menpo/condaci/v0.4.x/condaci.py -O condaci.py
- python condaci.py setup
- wget https://raw.githubusercontent.com/menpo/condaci/v0.5.x/condaci.py -O condaci.py
- python condaci.py setup --channels conda-forge

script:
- ~/miniconda/bin/python condaci.py build ./conda
Expand All @@ -27,6 +33,6 @@ notifications:
slack:
rooms:
- menpo:19gyWImMkOfCj0iDAgTbDlDA
on_success: :change
on_failure: :change
on_success: change
on_failure: change
email: false
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
include versioneer.py
include menpofit/_version.py
include LICENSE.txt
23 changes: 0 additions & 23 deletions appveyor.yml

This file was deleted.

11 changes: 11 additions & 0 deletions conda/.coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[run]
branch=True
source=menpofit
omit =
*/_version.*

[report]
exclude_lines =
raise NotImplementedError

ignore_errors=True
5 changes: 0 additions & 5 deletions conda/bld.bat

This file was deleted.

12 changes: 0 additions & 12 deletions conda/build.sh

This file was deleted.

40 changes: 31 additions & 9 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,48 @@ package:
name: menpofit
version: {{ environ['CONDACI_VERSION'] }}

source:
path: ../

build:
number: 0
script: python setup.py install --single-version-externally-managed --record=record.txt && python setup.py sdist

requirements:
build:
host:
- python
- setuptools

run:
- python
- menpo 0.8.*
- scikit-learn >=0.16
- dlib >=18.18
- pandas >=0.16
- menpo>=0.9.0,<0.11.0
- scikit-learn>=0.16
- pandas>=0.24

test:
requires:
- nose
- mock
- pytest >=5.0,<6.0
- pytest-cov >=2.0,<3.0
- mock >=3.0,<4.0

files:
- .coveragerc

imports:
- menpofit
- menpo

commands:
- MPLBACKEND=Agg pytest $SP_DIR/menpofit -v --cov=menpofit --cov-config .coveragerc # [linux]
- MPLBACKEND=TKAgg pytest $SP_DIR/menpofit -v --cov=menpofit --cov-config .coveragerc # [osx]
- pytest %SP_DIR%\\menpofit -v --cov=menpofit --cov-config .coveragerc --junitxml=C:\\menpofit.xml # [win]


about:
home: https://github.com/menpo/menpofit/
license: BSD
license: BSD 3-Clause
summary: A deformable modelling toolkit
description: |
The Menpo Project package for state-of-the-art 2D deformable modelling
techniques including AAMs, SDMs, CLMs
doc_url: https://menpofit.readthedocs.io/en/stable/
dev_url: https://github.com/menpo/menpofit
8 changes: 0 additions & 8 deletions conda/run_test.py

This file was deleted.

8 changes: 4 additions & 4 deletions docs/rtd_environment.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: menpofit_rtd
channels:
- menpo
- conda-forge
dependencies:
- python
- setuptools

- menpo >=0.7,<0.8
- menpo >=0.9,<0.11
- scikit-learn
- dlib
- pip:
- sphinx
- sphinx >=2,<3
- sphinx_rtd_theme
- sphinxmapxrefrole>0.2
- sphinxmapxrefrole >=0.2
24 changes: 12 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
from setuptools import setup, find_packages
import versioneer

import versioneer

setup(
name='menpofit',
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
description="Menpo's image feature point localisation (AAMs, SDMs, "
"CLMs)",
author='The Menpo Development Team',
author_email='[email protected]',
packages=find_packages(),
install_requires=['menpo>=0.8,<0.9',
'scikit-learn>=0.16'],
tests_require=['nose', 'mock']
name='menpofit',
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
description="Menpo's image feature point localisation (AAMs, SDMs, CLMs)",
author='The Menpo Development Team',
author_email='[email protected]',
packages=find_packages(),
install_requires=['menpo>=0.9.0,<0.11.0',
'scikit-learn>=0.16',
'pandas>=0.24'],
tests_require=['pytest>=5.0', 'mock>=3.0']
)

0 comments on commit 02a015c

Please sign in to comment.