diff --git a/casacore/.aipsrc b/casacore/.aipsrc index 61c999f..ac4d1e0 100644 --- a/casacore/.aipsrc +++ b/casacore/.aipsrc @@ -1 +1 @@ -measures.directory: ${CASACORE_DATA} \ No newline at end of file +measures.directory: ${CASACORE_DATA} diff --git a/casacore/__init__.py b/casacore/__init__.py index 14878de..c5aaa54 100644 --- a/casacore/__init__.py +++ b/casacore/__init__.py @@ -10,4 +10,4 @@ if "AIPSPATH" not in os.environ: root = os.path.dirname(__file__) os.environ["AIPSPATH"] = root - os.environ["CASACORE_DATA"] = os.path.join(root, "data") \ No newline at end of file + os.environ["CASACORE_DATA"] = os.path.join(root, "data") diff --git a/setup.py b/setup.py index cd53db0..732dda0 100755 --- a/setup.py +++ b/setup.py @@ -254,9 +254,11 @@ def get_extensions(): flag for flag in opt.split() if flag != '-Wstrict-prototypes' ) + def create_symlink(src_dir, dest_dir): """ - Create a symbolic link from `src_dir` to `dest_dir`, unless `dest_dir` already exists. + Create a symbolic link from `src_dir` to `dest_dir`, unless `dest_dir` + already exists. Return `dest_dir` upon success, or an empty string upon failure. """ try: @@ -271,7 +273,7 @@ def create_symlink(src_dir, dest_dir): class my_build_ext(build_ext_module.build_ext): def run(self): casacoreversion = find_casacore_version() - if casacoreversion is not None and LooseVersion(casacoreversion) < LooseVersion(__mincasacoreversion__): + if casacoreversion is not None and LooseVersion(casacoreversion) < LooseVersion(__mincasacoreversion__): errorstr = "Your casacore version is too old. Minimum is " + __mincasacoreversion__ + \ ", you have " + casacoreversion if casacoreversion == "2.5.0":