diff --git a/camb/__init__.py b/camb/__init__.py index 0fe4a5d6..d2f9df6d 100644 --- a/camb/__init__.py +++ b/camb/__init__.py @@ -7,7 +7,7 @@ __author__ = "Antony Lewis" __contact__ = "antony at cosmologist dot info" __url__ = "https://camb.readthedocs.io" -__version__ = "1.1.2.1" +__version__ = "1.1.2" from . import baseconfig diff --git a/camb/cambdll.dll b/camb/cambdll.dll index 1fda83cd..c03e0aa3 100644 Binary files a/camb/cambdll.dll and b/camb/cambdll.dll differ diff --git a/fortran/config.f90 b/fortran/config.f90 index 9cf5d48c..27864b87 100644 --- a/fortran/config.f90 +++ b/fortran/config.f90 @@ -3,7 +3,7 @@ module config use constants, only: const_twopi implicit none - character(LEN=*), parameter :: version = '1.1.2.1' + character(LEN=*), parameter :: version = '1.1.2' integer :: FeedbackLevel = 0 !if >0 print out useful information about the model diff --git a/fortran/tests/CAMB_test_files.py b/fortran/tests/CAMB_test_files.py index c9b7dc93..84a36f5b 100644 --- a/fortran/tests/CAMB_test_files.py +++ b/fortran/tests/CAMB_test_files.py @@ -574,7 +574,7 @@ def num_unequal(filename, cmpFcn): # printlog("Skipped file %s" % (filename)) return False except ValueError as e: - printlog("ValueError: '%s' at %d, %d in file: %s" % (e.message, row, col + 1, filename)) + printlog("ValueError: '%s' at %d, %d in file: %s" % (e, row, col + 1, filename)) return True diff --git a/setup.py b/setup.py index 491c50fa..ae38670e 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ def git_install_forutils(): try: print('forutils not found, attempting to install using git...') os.chdir('..') - fbranch = os.getenv('FORUTILSBRANCH', '1.0.2' if os.environ.get('CONDA_BUILD') else 'master') + fbranch = os.getenv('FORUTILSBRANCH', '1.0.3' if os.environ.get('CONDA_BUILD') else 'master') try: if subprocess.call("git clone --branch %s --depth=1 https://github.com/cmbant/forutils" % fbranch, shell=True) == 0: