trying to force exact requirements in the reqs.txt file while setup.py is a bit more loose.

This commit is contained in:
Romain Dorgueil
2017-04-30 10:14:44 +02:00
parent a19170ad36
commit 8018f63457
4 changed files with 52 additions and 55 deletions

View File

@ -1,7 +1,7 @@
# This file has been auto-generated. # This file has been auto-generated.
# All changes will be lost, see Projectfile. # All changes will be lost, see Projectfile.
# #
# Updated at 2017-04-28 06:33:29.712011 # Updated at 2017-04-30 10:12:39.793759
PYTHON ?= $(shell which python) PYTHON ?= $(shell which python)
PYTHON_BASENAME ?= $(shell basename $(PYTHON)) PYTHON_BASENAME ?= $(shell basename $(PYTHON))
@ -10,7 +10,6 @@ PYTHON_REQUIREMENTS_DEV_FILE ?= requirements-dev.txt
QUICK ?= QUICK ?=
VIRTUAL_ENV ?= .virtualenv-$(PYTHON_BASENAME) VIRTUAL_ENV ?= .virtualenv-$(PYTHON_BASENAME)
PIP ?= $(VIRTUAL_ENV)/bin/pip PIP ?= $(VIRTUAL_ENV)/bin/pip
PIP_INSTALL_OPTIONS ?=
PYTEST ?= $(VIRTUAL_ENV)/bin/pytest PYTEST ?= $(VIRTUAL_ENV)/bin/pytest
PYTEST_OPTIONS ?= --capture=no --cov=bonobo --cov-report html PYTEST_OPTIONS ?= --capture=no --cov=bonobo --cov-report html
SPHINX_OPTS ?= SPHINX_OPTS ?=
@ -25,13 +24,13 @@ YAPF_OPTIONS ?= -rip
# Installs the local project dependencies. # Installs the local project dependencies.
install: $(VIRTUAL_ENV) install: $(VIRTUAL_ENV)
if [ -z "$(QUICK)" ]; then \ if [ -z "$(QUICK)" ]; then \
$(PIP) install -U pip wheel $(PIP_INSTALL_OPTIONS) -r $(PYTHON_REQUIREMENTS_FILE) ; \ $(PIP) install -U pip wheel -r $(PYTHON_REQUIREMENTS_FILE) ; \
fi fi
# Installs the local project dependencies, including development-only libraries. # Installs the local project dependencies, including development-only libraries.
install-dev: $(VIRTUAL_ENV) install-dev: $(VIRTUAL_ENV)
if [ -z "$(QUICK)" ]; then \ if [ -z "$(QUICK)" ]; then \
$(PIP) install -U pip wheel $(PIP_INSTALL_OPTIONS) -r $(PYTHON_REQUIREMENTS_DEV_FILE) ; \ $(PIP) install -U pip wheel -r $(PYTHON_REQUIREMENTS_DEV_FILE) ; \
fi fi
# Cleans up the local mess. # Cleans up the local mess.

View File

@ -20,12 +20,13 @@ enable_features = {
'yapf', 'yapf',
} }
# stricts deendencies in requirements.txt
install_requires = [ install_requires = [
'colorama ==0.3.9', 'colorama >=0.3,<1.0',
'fs ==2.0.3', 'fs >=2.0,<3.0',
'psutil ==5.2.2', 'psutil >=5.2,<6.0',
'requests ==2.13.0', 'requests >=2.0,<3.0',
'stevedore ==1.21.0', 'stevedore >=1.21,<2.0',
] ]
extras_require = { extras_require = {

View File

@ -1 +1,7 @@
-e . -e .
colorama ==0.3.9
fs ==2.0.3
psutil ==5.2.2
requests ==2.13.0
stevedore ==1.21.0

View File

@ -8,68 +8,59 @@ root_dir = os.path.dirname(os.path.abspath(__file__))
tolines = lambda c: list(filter(None, map(lambda s: s.strip(), c.split('\n')))) tolines = lambda c: list(filter(None, map(lambda s: s.strip(), c.split('\n'))))
def read(filename, flt=None): def read(filename, flt=None):
try: try:
with open(filename) as f: with open(filename) as f:
content = f.read().strip() content = f.read().strip()
return flt(content) if callable(flt) else content return flt(content) if callable(flt) else content
except EnvironmentError: except FileNotFoundError:
return '' return ''
# Py3 compatibility hacks, borrowed from IPython. # Py3 compatibility hacks, borrowed from IPython.
try: try:
execfile execfile
except NameError: except NameError:
def execfile(fname, globs, locs=None): def execfile(fname, globs, locs=None):
locs = locs or globs locs = locs or globs
exec(compile(open(fname).read(), fname, "exec"), globs, locs) exec(compile(open(fname).read(), fname, "exec"), globs, locs)
version_ns = {} version_ns = {}
try: execfile(os.path.join(root_dir, 'bonobo/_version.py'), version_ns)
execfile(os.path.join(root_dir, 'bonobo/_version.py'), version_ns) version = version_ns.get('__version__', 'dev')
except EnvironmentError:
version = 'dev'
else:
version = version_ns.get('__version__', 'dev')
setup( setup(
name='bonobo', name = 'bonobo',
description='Bonobo', description = 'Bonobo',
license='Apache License, Version 2.0', license = 'Apache License, Version 2.0',
install_requires=['colorama ==0.3.9', 'fs ==2.0.3', 'psutil ==5.2.2', 'requests ==2.13.0', 'stevedore ==1.21.0'], install_requires = ['colorama >=0.3,<1.0',
version=version, 'fs >=2.0,<3.0',
long_description=read('README.rst'), 'psutil >=5.2,<6.0',
classifiers=read('classifiers.txt', tolines), 'requests >=2.0,<3.0',
packages=find_packages(exclude=['ez_setup', 'example', 'test']), 'stevedore >=1.21,<2.0'],
include_package_data=True, version = version,
data_files=[ long_description = read('README.rst'),
( classifiers = read('classifiers.txt', tolines),
'share/jupyter/nbextensions/bonobo-jupyter', [ packages = find_packages(exclude=['ez_setup', 'example', 'test']),
'bonobo/ext/jupyter/static/extension.js', 'bonobo/ext/jupyter/static/index.js', include_package_data = True,
'bonobo/ext/jupyter/static/index.js.map' data_files = [('share/jupyter/nbextensions/bonobo-jupyter',
] ['bonobo/ext/jupyter/static/extension.js',
) 'bonobo/ext/jupyter/static/index.js',
], 'bonobo/ext/jupyter/static/index.js.map'])],
extras_require={ extras_require = {'dev': ['coverage >=4,<5',
'dev': [ 'pylint >=1,<2',
'coverage >=4,<5', 'pylint >=1,<2', 'pytest >=3,<4', 'pytest-cov >=2,<3', 'pytest-timeout >=1,<2', 'sphinx', 'pytest >=3,<4',
'sphinx_rtd_theme', 'yapf' 'pytest-cov >=2,<3',
], 'pytest-timeout >=1,<2',
'jupyter': ['jupyter >=1.0,<1.1', 'ipywidgets >=6.0.0.beta5'] 'sphinx',
}, 'sphinx_rtd_theme',
entry_points={ 'yapf'],
'bonobo.commands': [ 'jupyter': ['jupyter >=1.0,<1.1', 'ipywidgets >=6.0.0.beta5']},
'init = bonobo.commands.init:register', 'run = bonobo.commands.run:register', entry_points = {'bonobo.commands': ['init = bonobo.commands.init:register',
'version = bonobo.commands.version:register' 'run = bonobo.commands.run:register',
], 'version = bonobo.commands.version:register'],
'console_scripts': ['bonobo = bonobo.commands:entrypoint'], 'console_scripts': ['bonobo = bonobo.commands:entrypoint'],
'edgy.project.features': ['bonobo = ' 'edgy.project.features': ['bonobo = '
'bonobo.ext.edgy.project.feature:BonoboFeature'] 'bonobo.ext.edgy.project.feature:BonoboFeature']},
}, url = 'https://www.bonobo-project.org/',
url='https://www.bonobo-project.org/', download_url = 'https://github.com/python-bonobo/bonobo/tarball/{version}'.format(version=version),
download_url='https://github.com/python-bonobo/bonobo/tarball/{version}'.format(version=version),
) )