diff --git a/.travis.yml b/.travis.yml index efa9e18..d8b647e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,28 +7,26 @@ matrix: - secure: XGsoak/JpYKSsVBC1X+k6Ve6bO5hl0fKF2t03VlHI1FkU0i4UGjKAKB57qkYr58+u9xXqyphzq3x5L0aMshzUTSHjdWC+0qDk2asvkTuf+BbSZrtEjw0/Pn5Ig6stxe/LrEmuowQ6DTtqBAEItWhxnI1AMZ5xK8MmQ4yk6fwQ8o= - secure: ReBB4//PaNVLJZAwneo41REoDLuLnmsX5888JW3uFrP3vv0gSlKCSlxknbyvj52WOJrfa+NnSr/K85RSA+LfrbH4S/DRXJxMTStxjGvsUgzbmD9Wm8o1bXHF6ak4YDWws/b6c4QXatqkSHpF57NuzSIcAKIQ+xa7ENbJPWM1aW0= - BOB_DOCUMENTATION_SERVER=https://www.idiap.ch/software/bob/docs/latest/bioidiap/%s/master - - python: 3.2 - env: - - NUMPYSPEC===1.8.0 - - SPHINXSPEC===1.2 + - BOB_UPLOAD_WHEEL="--universal" - python: 3.3 - env: - - NUMPYSPEC===1.8.0 + - python: 3.4 before_install: - sudo add-apt-repository -y ppa:biometrics/bob - sudo apt-get update -qq - sudo apt-get install -qq --force-yes libboost-all-dev libblitz1-dev libhdf5-serial-dev libatlas-dev libatlas-base-dev liblapack-dev libsvm-dev texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended -- if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq gfortran; fi -- if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC; fi -- pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel matplotlib==1.3.1 sphinx$SPHINXSPEC nose==1.3.0 jinja2==2.6 coveralls pygments==1.6 +- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy matplotlib coverage +- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r requirements.txt coveralls install: - python bootstrap-buildout.py -- ./bin/buildout +- ./bin/buildout buildout:develop=. buildout:extensions=bob.buildout buildout:auto-checkout= script: -- ./bin/python -c 'from bob.db.casia_fasd import get_config; print(get_config())' +- ./bin/python -c 'import pkg_resources; from bob.db.casia_fasd import get_config; print(get_config())' - ./bin/coverage run --source=bob.db.casia_fasd ./bin/nosetests -sv - ./bin/sphinx-build -b doctest doc sphinx - ./bin/sphinx-build -b html doc sphinx after_success: - coveralls -- ./src/bob.extension/scripts/upload-sphinx.sh +- wget https://raw.githubusercontent.com/bioidiap/bob.extension/master/scripts/upload-{sphinx,wheel}.sh +- chmod a+x upload-sphinx.sh upload-wheel.sh +- ./upload-sphinx.sh +- ./upload-wheel.sh diff --git a/MANIFEST.in b/MANIFEST.in index b8e5261..7823bdd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -include README.rst bootstrap-buildout.py version.txt +include README.rst bootstrap-buildout.py buildout.cfg version.txt requirements.txt recursive-include bob *.txt recursive-include doc *.py *.rst recursive-include bob *.sql3 diff --git a/bob/db/casia_fasd/__init__.py b/bob/db/casia_fasd/__init__.py index 44d2c53..fc8a92f 100644 --- a/bob/db/casia_fasd/__init__.py +++ b/bob/db/casia_fasd/__init__.py @@ -459,19 +459,9 @@ def save_by_filename(self, filename, obj, directory, extension): def get_config(): """Returns a string containing the configuration information. """ + import bob.extension + return bob.extension.get_config(__name__) - import pkg_resources - - packages = pkg_resources.require(__name__) - this = packages[0] - deps = packages[1:] - - retval = "%s: %s (%s)\n" % (this.key, this.version, this.location) - retval += " - python dependencies:\n" - for d in deps: retval += " - %s: %s (%s)\n" % (d.key, d.version, d.location) - - return retval.strip() # gets sphinx autodoc done right - don't remove it __all__ = [_ for _ in dir() if not _.startswith('_')] - diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..40779d8 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +setuptools +six +bob.db.base +antispoofing.utils diff --git a/setup.py b/setup.py index 0d5e223..6545163 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,11 @@ # Andre Anjos # Sex 10 Ago 2012 14:22:33 CEST -from setuptools import setup, find_packages +from setuptools import setup, find_packages, dist +dist.Distribution(dict(setup_requires=['bob.extension'])) + +from bob.extension.utils import load_requirements +install_requires = load_requirements() # Define package version version = open("version.txt").read().rstrip() @@ -31,12 +35,7 @@ 'bob.db', ], - install_requires=[ - 'setuptools', - 'six', - 'bob.db.base', - 'antispoofing.utils', - ], + install_requires = install_requires, entry_points={ diff --git a/version.txt b/version.txt index 0d0f1af..be54dc9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.0.4b0 \ No newline at end of file +2.0.4b1