Skip to content
Snippets Groups Projects
Commit e31b560f authored by Stephen Phillips's avatar Stephen Phillips
Browse files

Merge branch 'clmc-service' into 'integration'

Fixes requirements version conflict error and locks the versions of all package requirements for clmc-service

See merge request FLAME/flame-clmc!42
parents 028c60ab 423192f8
No related branches found
No related tags found
No related merge requests found
...@@ -52,26 +52,27 @@ def get_version(*relative_path): ...@@ -52,26 +52,27 @@ def get_version(*relative_path):
requires = [ requires = [
'plaster_pastedeploy', 'ipython==6.5.0',
'pyramid', 'plaster_pastedeploy==0.6',
'pyramid_debugtoolbar', 'pyramid==1.9.2',
'pyramid_exclog', 'pyramid_debugtoolbar==4.5',
'waitress', 'pyramid_exclog==1.0',
'sqlalchemy', 'waitress==1.1.0',
'zope.sqlalchemy', 'sqlalchemy==1.2.12',
'psycopg2', 'zope.sqlalchemy==1.0',
'influxdb', 'psycopg2==2.7.5',
'neo4j-driver', 'influxdb==5.2.0',
'py2neo', 'neo4j-driver==1.6.2',
'pyyaml', 'py2neo==4.1.0',
'tosca-parser', 'pyyaml==3.13',
'schema', 'tosca-parser==1.1.0',
'requests' 'schema==0.6.8',
'requests==2.19.1'
] ]
tests_require = [ tests_require = [
'pytest', 'pytest==3.8.1',
'pytest-cov' 'pytest-cov==2.6.0'
] ]
setup( setup(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment