Simplify

Author: WardBrian

cmdstanpy/utils.py

@@ -151,11 +151,6 @@ def validate_cmdstan_path(path: str) -> None:
     """
     if not os.path.isdir(path):
         raise ValueError(f'No CmdStan directory, path {path} does not exist.')
-    if not os.path.isfile(os.path.join(path, "makefile")):
-        raise ValueError(
-            'CmdStan folder does not contain "makefile". '
-            f'Are you sure this is the correct path: {path}?'
-        )
     if not os.path.exists(os.path.join(path, 'bin', 'stanc' + EXTENSION)):
         raise ValueError(
             f'CmdStan installataion missing binaries in {path}/bin. '
@@ -223,6 +218,13 @@ def cmdstan_version() -> Optional[Tuple[int, ...]]:
         get_logger().debug("%s", e)
         return None
 
+    if not os.path.exists(makefile):
+        get_logger().info(
+            'CmdStan installation %s missing makefile, cannot get version.',
+            cmdstan_path(),
+        )
+        return None
+
     with open(makefile, 'r') as fd:
         contents = fd.read()
 

test/test_utils.py

@@ -138,11 +138,6 @@ def test_validate_path(self):
         with self.assertRaisesRegex(ValueError, 'No CmdStan directory'):
             validate_cmdstan_path(path_foo)
 
-        with self.assertRaisesRegex(
-            ValueError, ".*Are you sure this is the correct path.*"
-        ):
-            set_cmdstan_path(str(DATAFILES_PATH))
-
         folder_name = ''.join(
             random.choice(string.ascii_letters) for _ in range(10)
         )
@@ -153,6 +148,7 @@ def test_validate_path(self):
         folder = pathlib.Path(folder_name)
         folder.mkdir(parents=True)
         (folder / "makefile").touch()
+
         with self.assertRaisesRegex(ValueError, 'missing binaries'):
             validate_cmdstan_path(str(folder.absolute()))
         shutil.rmtree(folder)
@@ -216,16 +212,17 @@ def test_cmdstan_version(self):
                     'found: "dont_need_no_mmp".'
                 )
                 with LogCapture() as log:
-                    logging.getLogger()
                     cmdstan_version()
                 log.check_present(('cmdstanpy', 'INFO', expect))
 
                 fake_makefile.unlink()
-                expect = StringComparison('.*does not contain "makefile".*')
+                expect = (
+                    'CmdStan installation {} missing makefile, '
+                    'cannot get version.'.format(fake_path)
+                )
                 with LogCapture() as log:
-                    logging.getLogger()
                     cmdstan_version()
-                log.check_present(('cmdstanpy', 'DEBUG', expect))
+                log.check_present(('cmdstanpy', 'INFO', expect))
         cmdstan_path()