Skip to content

Commit

Permalink
Merge pull request #38 from ESGF/limit_vers
Browse files Browse the repository at this point in the history
Limit the versions to support both 8.4 and 9.4, cleanup bad URL
  • Loading branch information
nathanlcarlson authored Mar 19, 2019
2 parents 75cdcd4 + 2e88dec commit f3c125a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion etc/esgf-node-manager.ant.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/python/esgf/setup.py.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ setup(
author = 'ESGF Software Team',
author_email = '[email protected]',
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 = {'@[email protected]_migration': ['migrate.cfg'],
Expand Down

0 comments on commit f3c125a

Please sign in to comment.