mirror of
https://github.com/wassname/scikit-image.git
synced 2026-06-27 18:25:32 +08:00
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
This commit is contained in:
@@ -35,7 +35,7 @@ DEPENDENCIES = {}
|
||||
with open('requirements.txt', 'rb') as fid:
|
||||
data = fid.read().decode('utf-8', 'replace')
|
||||
for line in data.splitlines():
|
||||
pkg, _, version_info = line.partition('>=')
|
||||
pkg, _, version_info = line.replace('==', '>=').partition('>=')
|
||||
# Only require Cython if we have a developer checkout
|
||||
if pkg.lower() == 'cython' and not VERSION.endswith('dev'):
|
||||
continue
|
||||
@@ -88,22 +88,29 @@ def check_requirements():
|
||||
for (package_name, min_version) in DEPENDENCIES.items():
|
||||
if package_name == 'cython':
|
||||
package_name = 'Cython'
|
||||
dep_error = False
|
||||
dep_error = ''
|
||||
if package_name.lower() == 'pillow':
|
||||
package_name = 'PIL.Image'
|
||||
min_version = '1.1.7'
|
||||
try:
|
||||
package = __import__(package_name,
|
||||
fromlist=[package_name.rpartition('.')[0]])
|
||||
except ImportError:
|
||||
dep_error = True
|
||||
dep_error = ('You need `%s` version %s or later.'
|
||||
% (package_name, min_version))
|
||||
else:
|
||||
package_version = get_package_version(package)
|
||||
if package_name == 'PIL':
|
||||
package_version = package.PILLOW_VERSION
|
||||
else:
|
||||
package_version = get_package_version(package)
|
||||
|
||||
if LooseVersion(min_version) > LooseVersion(package_version):
|
||||
dep_error = True
|
||||
dep_error = ('You need `%s` version %s or later,'
|
||||
'found version %s.'
|
||||
% (package_name, min_version,
|
||||
package_version))
|
||||
if dep_error:
|
||||
raise ImportError('You need `%s` version %s or later.' \
|
||||
% (package_name, min_version))
|
||||
raise ImportError(dep_error)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user