This is an automated email from the ASF dual-hosted git repository. skperez pushed a commit to branch SDAP-473a in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 56407c31fcaaff9e32daf4af4294b65fb10fc858 Author: skorper <[email protected]> AuthorDate: Thu Jun 29 20:03:30 2023 -0700 fix typo --- analysis/setup.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/analysis/setup.py b/analysis/setup.py index c09fe4a..8fbc617 100644 --- a/analysis/setup.py +++ b/analysis/setup.py @@ -17,19 +17,18 @@ import setuptools from subprocess import check_call, CalledProcessError -# with open('../VERSION.txt', 'r') as f: -# __version__ = f.read() -__version__ = '1.1.0a3' +with open('../VERSION.txt', 'r') as f: + __version__ = f.read() -# try: -# check_call(['mamba', 'install', '-y', '-c', 'conda-forge', '--file', 'conda-requirements.txt']) -# except (CalledProcessError, IOError) as e: -# print('Failed install with mamba; falling back to conda') -# try: -# check_call(['conda', 'install', '-y', '-c', 'conda-forge', '--file', 'conda-requirements.txt']) -# except (CalledProcessError, IOError) as e: -# raise EnvironmentError("Error installing conda packages", e) +try: + check_call(['mamba', 'install', '-y', '-c', 'conda-forge', '--file', 'conda-requirements.txt']) +except (CalledProcessError, IOError) as e: + print('Failed install with mamba; falling back to conda') + try: + check_call(['conda', 'install', '-y', '-c', 'conda-forge', '--file', 'conda-requirements.txt']) + except (CalledProcessError, IOError) as e: + raise EnvironmentError("Error installing conda packages", e) setuptools.setup(
