Squash and merge (#317)

.github/workflows/automerge.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Enable auto-merge for Dependabot PRs
         if: ${{contains(steps.metadata.outputs.update-type,'version-update:semver')}}
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --merge --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

nuztf/ampel_api.py

@@ -75,7 +75,7 @@ def ampel_api_cone(
     chunk_size: int = 500,
     logger=None,
 ) -> list:
-    """Function to query ampel via a cone search"""
+    """Query ampel via a cone search"""
 
     if logger is None:
         logger = logging.getLogger(__name__)

nuztf/paths.py

@@ -1,22 +1,30 @@
+import os
 from pathlib import Path
 
 CONFIG_DIR = Path(__file__).parent.joinpath("config")
 
-NUZTF_OUTPUT_DIR = Path.home().joinpath("Data/nuztf/")
+NUZTF_OUTPUT_DIR_STR = os.environ.get("NUZTF_DIR")
 
-SKYMAP_DIR = NUZTF_OUTPUT_DIR.joinpath(f"skymaps")
-SKYMAP_DIR.mkdir(exist_ok=True, parents=True)
-RESULTS_DIR = NUZTF_OUTPUT_DIR.joinpath("results")
+if NUZTF_OUTPUT_DIR_STR is None:
+    NUZTF_OUTPUT_DIR = Path.home() / "Data" / "nuztf"
+else:
+    NUZTF_OUTPUT_DIR = Path(NUZTF_OUTPUT_DIR_STR)
 
-CACHE_DIR = NUZTF_OUTPUT_DIR.joinpath(f"cache")
+SKYMAP_DIR = NUZTF_OUTPUT_DIR / "skymaps"
+SKYMAP_DIR.mkdir(exist_ok=True, parents=True)
 
-BASE_CANDIDATE_DIR = CACHE_DIR.joinpath("candidates")
+RESULTS_DIR = NUZTF_OUTPUT_DIR / "results"
+CACHE_DIR = NUZTF_OUTPUT_DIR / "cache"
+BASE_CANDIDATE_DIR = CACHE_DIR / "candidates"
 
-CROSSMATCH_CACHE = CACHE_DIR.joinpath("crossmatch")
+CROSSMATCH_CACHE = CACHE_DIR / "crossmatch"
 CROSSMATCH_CACHE.mkdir(exist_ok=True, parents=True)
-CUTOUT_CACHE_DIR = CACHE_DIR.joinpath("cutouts")
+
+CUTOUT_CACHE_DIR = CACHE_DIR / "cutouts"
 CUTOUT_CACHE_DIR.mkdir(exist_ok=True, parents=True)
-FLATPIX_CACHE_DIR = CACHE_DIR.joinpath("flatpix")
+
+FLATPIX_CACHE_DIR = CACHE_DIR / "flatpix"
 FLATPIX_CACHE_DIR.mkdir(exist_ok=True, parents=True)
-PREPROCESSED_CACHE_DIR = CACHE_DIR.joinpath("preprocessed")
+
+PREPROCESSED_CACHE_DIR = CACHE_DIR / "preprocessed"
 PREPROCESSED_CACHE_DIR.mkdir(exist_ok=True, parents=True)