From 6ff1aeadfad8653ce8afd8b9aca0bf4a3c6fec85 Mon Sep 17 00:00:00 2001 From: Nathan Carlson Date: Thu, 14 Mar 2019 11:43:35 -0700 Subject: [PATCH 1/2] Limit the versions to support both 8.4 and 9.4, cleanup bad URL --- src/python/esgf/setup.py.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python/esgf/setup.py.tmpl b/src/python/esgf/setup.py.tmpl index 1aab650..7526aac 100755 --- a/src/python/esgf/setup.py.tmpl +++ b/src/python/esgf/setup.py.tmpl @@ -16,9 +16,9 @@ setup( author = 'ESGF Software Team', author_email = 'esgf-mechanic@lists.llnl.gov', url = 'http://esgf.org', - install_requires = ["psycopg2>=2.0", "SQLAlchemy>=0.5.3", "sqlalchemy_migrate>=0.6"], + install_requires = ["psycopg2>=2.0,<2.7", "SQLAlchemy>=0.5.3,<1.3", "sqlalchemy_migrate>=0.6,<=0.12"], #setup_requires = ["psycopg2>=2.0", "SQLAlchemy>=0.5.3", "sqlalchemy_migrate>=0.6"], - dependency_links = ["http://rainbow.llnl.gov/dist/externals"], + #dependency_links = ["http://rainbow.llnl.gov/dist/externals"], packages = find_packages(exclude=['ez_setup']), include_package_data = True, package_data = {'@module@.schema_migration': ['migrate.cfg'], From 2e88decd1738d381958df558bf986cdca9e05217 Mon Sep 17 00:00:00 2001 From: Nathan Carlson Date: Tue, 19 Mar 2019 09:31:59 -0700 Subject: [PATCH 2/2] Update database version for new version requirements --- etc/esgf-node-manager.ant.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/esgf-node-manager.ant.properties b/etc/esgf-node-manager.ant.properties index f5fbf7f..fdc6cfc 100644 --- a/etc/esgf-node-manager.ant.properties +++ b/etc/esgf-node-manager.ant.properties @@ -67,7 +67,7 @@ project_name=ESGF Node Manager author=Gavin M. Bell -db_version_num=0.1.6 +db_version_num=0.1.7 #dest.user="nobody" #dest.server="nowhere"