Commit Graph

90 Commits

Author SHA1 Message Date
Steven Silvester 61a78d6c69 Fix setup.py in the presence of no numpy 2015-10-30 15:00:56 -05:00
Jonathan Helmus 64c4252eab BLD: __SKIMAGE_SETUP__ global variable for detecting build
The __SKIMAGE_SETUP__ global variable is set to True if skimage is being build
from the main setup.py file, False if not.  This behavior is modeled after a
similar setup in scikit-learn
2015-07-28 13:16:09 -05:00
Steven Silvester 6c32be45a6 Do not try and upgrade larger dependencies on skimage install 2015-07-16 06:32:20 -05:00
Steven Silvester a032b9d71a Do not try and update scipy on a pip install if already installed 2015-07-16 06:22:50 -05:00
Steven Silvester 09503cd168 Fix docstring 2015-07-12 22:27:41 -05:00
Steven Silvester 39b8198250 Fix typo 2015-07-12 22:26:07 -05:00
Steven Silvester 43168c60a6 Mimic the way scipy handles numpy in setup.py 2015-07-12 22:21:40 -05:00
arve0 b6aa358439 clean up setup.py according to 9cfaf4a
- cython added to setup_requirements
  - setuptools will call easy_install to install it
  - all other build requirements, excluding numpy, will be resolved by pip
- do not parse requirements.txt
  - requirements should be the real runtime requirements
- fail gracefully when missing numpy
  - scipy will be resolved by pip from install_requires
2015-05-25 12:43:36 +02:00
Steven Silvester adac822ee9 Fix setup to allow installing from PyPI
≈
Fix setup to allow installing from PyPi
Another attempt at fixing the setuptools problem

Fix pip incantation

Fix typo

Try updating setuptools too

Try upgrading pip and setuptools after venv install

Rule out install_requires as the source of the problem

Try just requiring the ones that can be built from source

Use explicit install_requires and move version checks to after setup runs

Clean up installation for PyPI compatiblity

Dead end commit

Fix travis to match new installation procedure

Put build_versions check after install

Fix travis syntax

Switch to lower-case cython in version check

Another attempt

Another fix

Fix syntax error

Make header executable

Build inplace on py27

Fix finding of source code version in sphinx

Fix travis syntax

Import setuptools after install

Fix the version check in sphinx

Work around setuptools bug in 2.7

Fix handling of Cython requirement and update release notes

Switch to one Appveyor build and update build method

Add cython back to install_requires

Remove debug lines

Another try for appveyor install

Another attempt at setuptools and Appveyor

Do not let intermittent apt-get failures crash the build

Fix typo

Another appveyor attempt

More fixes for setuptools and Appveyor

Yet another setuptools/appveyor attempt

Put requirements.txt back in order

Fix typo

Fix readlines function call

Try not using a venv for python 2.7

Fix syntax

Try the provided venv for py27

Remove --user

Remove debug info

Another try for python27 fix

Try again

Do not use install_requires with numpy/scipy

Try just avoiding scipy

Try removing scipy (numpy was before)

Avoid both scipy and numpy

Fix qt install on 27

Fix qt install on 27 agin

Revert the scripts to their previous condition

Revert file permission changes

Undo changes to requirements.txt
2015-03-29 15:36:11 -05:00
arve0 2107ab24a9 install_requires from requirements.txt 2015-03-15 09:30:00 +01:00
Stefan van der Walt 1da2446a1d Set master branch to 0.12 2015-03-04 18:41:26 -08:00
Stefan van der Walt d3bb552527 Update version to 0.11.0 2015-03-04 01:54:55 -08:00
Josh Warner (Mac) 7d5ed51935 FIX: Informative IOError if package installed w/mixed permissions. 2015-02-03 15:47:28 -07:00
Stefan van der Walt f82243904f Merge pull request #1253 from blink1073/travis-venv
Use new Virtual Environments for Travis
2014-12-05 13:37:34 +02:00
Steven Silvester 5ed582dd7f Add install_requires for six 2014-12-03 20:57:47 -06:00
Steven Silvester 40d6a51779 Use virtualenv for all builds and install everything from wheelhouse
Use venv for all builds and install everything from wheelhouse

Use venv and all minimum requirements

Edit requirements.txt in place and use one call

Update minimum versions and install exclusively from wheelhouse

Use mpl 1.3.1 on py 3.2

Fix pip invocation

Fix pip invocation again

Another fix to pip invocation

Explicitly use venv python to call build_versions.py

Move venv creation and activation to top level

Do not use site-packages

Fix minimum matplotlib ver and Pillow version check

Fix minimum matplotlib ver

Improve error message on version check

Add more debug info

Even more debug info

More debug info

Yet another debug print

Fix python 2.7 installation problem

check for PIL.Image version on install

Add debug to before_install

Try a pip install virtualenv first

Clean up virtualenv creation, add debug info, fix PySide script install

Fix virtualenv path for PySide install

Fix venv location and activation

Try no site packages and fix python 2.7 install
2014-12-02 05:39:35 -06:00
Stefan van der Walt 92929fc417 Print correct version when dependency is not satisfied 2014-10-29 13:39:42 +02:00
Steven Silvester c74b652e1e Remove install_requires altogether 2014-10-12 16:28:31 -05:00
Steven Silvester 7d171a8e37 Fix install_requires 2014-10-12 16:08:42 -05:00
Steven Silvester 967b1912c2 Remove print statements 2014-10-06 18:30:39 -05:00
Steven Silvester c3ffc5ed51 Fix handling of version_attr for python3 2014-10-05 21:48:44 -05:00
Steven Silvester 4b18721c48 Fix syntax for python3 in setup.py 2014-10-05 16:40:32 -05:00
Steven Silvester 7cb883999c Use strings as required by LooseVersion 2014-10-05 15:34:33 -05:00
Steven Silvester 99f5fd8f6e Use distutils LooseVersion for version check 2014-10-05 15:14:15 -05:00
Steven Silvester 558dfad3f0 Fix __import__ fromlist 2014-10-05 13:07:35 -05:00
Steven Silvester 1ae929224e Fix setup version requirement handling 2014-10-05 10:31:18 -05:00
Steven Silvester ec55adf4ea Add pillow to requirements (but allow for PIL) 2014-10-05 10:03:34 -05:00
Steven Silvester 3d4a081281 Print full required version str 2014-10-04 22:36:23 -05:00
Steven Silvester 1ce325008a Allow for 3-part dependency versions 2014-10-04 22:33:44 -05:00
Steven Silvester ac6fbaa4ef Allow for unicode version info 2014-10-04 15:24:01 -05:00
Steven Silvester 78bcf17c18 Look for version instead of version 2014-09-27 07:31:52 -05:00
Steven Silvester 075b40b92e Fix python3.3+ builds 2014-09-27 06:35:35 -05:00
Steven Silvester 984782ee54 Remove unicode decode 2014-09-27 05:59:48 -05:00
Steven Silvester 75448b8579 Fix python 3 unicode error 2014-09-27 05:45:12 -05:00
Steven Silvester c92f54c54d Fix install_requires string formatting 2014-09-27 05:31:45 -05:00
Steven Silvester cb7187e3ca Update build requirements and documentation 2014-09-24 16:34:50 -05:00
Fedor Baart 7d14f5cbcf setup 2014-07-24 13:10:50 +02:00
Stefan van der Walt 992a12f968 Only import numpy after dependency check 2014-06-27 23:37:28 +02:00
Johannes Schönberger c026b21a66 Increase version to 0.11dev 2014-05-27 21:46:41 -04:00
Johannes Schönberger 24be78e433 Set version 0.10 2014-05-27 21:46:41 -04:00
Thomas Robitaille 5abc13d3e2 Only require Cython if using a developer version 2014-01-10 13:45:40 +01:00
Stefan van der Walt eb6867cfe2 Make six an external dependency. 2013-10-27 14:06:26 +02:00
Stefan van der Walt 4b002d7e79 Set version numbers for 0.10 development cycle. 2013-10-19 16:27:42 +02:00
Stefan van der Walt 332bcac2f3 Update versions for 0.9.0 release. 2013-10-19 16:08:42 +02:00
Stefan van der Walt dcea65325a Merge pull request #611 from mkcor/install_pip-requirements
Document another way of building for virtualenv users.
2013-07-15 17:37:33 -07:00
Stefan van der Walt 2ef6f0ae73 Remove 2to3. 2013-06-29 10:16:42 -05:00
Marianne Corvellec edee15054b Edited after Stefan's comments. 2013-06-28 16:50:43 -04:00
Johannes Schönberger 4854dc830f Increase version number to 0.9 2013-03-04 21:22:20 +01:00
Johannes Schönberger 96e5c1b1b8 Update version number for 0.8 2013-03-04 20:41:19 +01:00
Christoph Gohlke fe6d3d500c Do not install the doc package 2013-01-18 19:48:30 -08:00