ratt-ru · o-smirnov · Aug 20, 2024 · Aug 20, 2024 · Aug 20, 2024 · Aug 20, 2024
diff --git a/.github/workflows/poetry-publish.yml b/.github/workflows/poetry-publish.yml
@@ -25,7 +25,7 @@ jobs:
         run: poetry config pypi-token.pypi ${{secrets.PYPI_TOKEN}}
 
       - name: Publish cabs
-        run: cd suricat_cabs && poetry publish --build
+        run: cd suricat-beams && poetry publish --build
 
       - name: Publish main package
         run: poetry publish --build
diff --git a/.github/workflows/publish-cargo.yml b/.github/workflows/publish-cargo.yml
@@ -2,7 +2,7 @@ name: Build docker images
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "repackage" ]
     # Publish semver tags as releases.
     # tags: [ 'v*.*.*' ]
   pull_request:
@@ -31,11 +31,11 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install cabs package
-        run: pip install -e suricat_cabs      
+        run: pip install -e suricat-beams      
 
       - name: Install cult-cargo
         # replace with normal install when 0.1.4 is out
         run: pip install git+https://github.com/caracal-pipeline/cult-cargo.git@issue-51
 
       - name: Run build and push image
-        run: build-cargo -m suricat_cabs/suricat/cargo/cargo-manifest.yml -a
+        run: build-cargo -m suricat-beams/suricat/cargo/cargo-manifest.yml -a
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,16 +1,15 @@
 [tool.poetry]
 name = "suricat-beams"
-version = "0.0.5"
+version = "0.0.6"
 description = "MeerKAT primary beam model handling utilities"
 authors = ["Oleg Smirnov <osmirnov@gmail.com>"]
 license = "MIT"
 readme = "README.md"
-packages = [{include = "suricat"}]
+packages = [{include = "suricat", from = "suricat"}]
 
 [tool.poetry.dependencies]
 python = "^3.8"
 stimela = "^2.0"
-suricat-beams-cabs = "*"
 xarray-fits = "*"
 astro-tigger-lsm = "*"
 matplotlib = "*"

diff --git a/suricat_cabs/LICENSE → suricat-beams/LICENSE b/suricat_cabs/LICENSE → suricat-beams/LICENSE
diff --git a/suricat_cabs/MANIFEST.in → suricat-beams/MANIFEST.in b/suricat_cabs/MANIFEST.in → suricat-beams/MANIFEST.in
diff --git a/suricat_cabs/README.md → suricat-beams/README.md b/suricat_cabs/README.md → suricat-beams/README.md
diff --git a/suricat_cabs/pyproject.toml → suricat-beams/pyproject.toml b/suricat_cabs/pyproject.toml → suricat-beams/pyproject.toml
@@ -1,11 +1,11 @@
 [tool.poetry]
 name = "suricat-beams-cabs"
-version = "0.0.5"
+version = "0.0.6"
 description = "MeerKAT primary beam model handling utilities -- Stimela cabs"
 authors = ["Oleg Smirnov <osmirnov@gmail.com>"]
 license = "MIT"
 readme = "README.md"
-packages = [{include = "suricat"}]
+packages = [{ include = "suricat/cabs" }]
 
 [tool.poetry.dependencies]
 python = "^3.8"

diff --git a/suricat/__init__.py → suricat-beams/suricat/__init__.py b/suricat/__init__.py → suricat-beams/suricat/__init__.py
diff --git a/suricat-beams/suricat/__pycache__/__init__.cpython-310.pyc b/suricat-beams/suricat/__pycache__/__init__.cpython-310.pyc
diff --git a/suricat/beamplots.py → suricat-beams/suricat/beamplots.py b/suricat/beamplots.py → suricat-beams/suricat/beamplots.py
diff --git a/suricat/beams.py → suricat-beams/suricat/beams.py b/suricat/beams.py → suricat-beams/suricat/beams.py
diff --git a/suricat_cabs/suricat/__init__.py → suricat-beams/suricat/cabs/__init__.py b/suricat_cabs/suricat/__init__.py → suricat-beams/suricat/cabs/__init__.py
diff --git a/suricat_cabs/suricat/cabs/suricat.yml → suricat-beams/suricat/cabs/suricat.yml b/suricat_cabs/suricat/cabs/suricat.yml → suricat-beams/suricat/cabs/suricat.yml
diff --git a/suricat-beams/suricat/cargo/.persistent_history b/suricat-beams/suricat/cargo/.persistent_history
@@ -0,0 +1,4 @@
+2024-08-18 10:54:53 | cd suricat_cabs/suricat/cargo/
+2024-08-18 10:54:54 | ls
+2024-08-18 10:55:07 | git push
+2024-08-18 10:55:53 | ls ../cabs/
diff --git a/suricat_cabs/suricat/cargo/__init__.py → suricat-beams/suricat/cargo/__init__.py b/suricat_cabs/suricat/cargo/__init__.py → suricat-beams/suricat/cargo/__init__.py
diff --git a/...cat_cabs/suricat/cargo/cargo-manifest.yml → ...at-beams/suricat/cargo/cargo-manifest.yml b/...cat_cabs/suricat/cargo/cargo-manifest.yml → ...at-beams/suricat/cargo/cargo-manifest.yml
diff --git a/...t/cargo/suricat/Dockerfile.branch-install → ...t/cargo/suricat/Dockerfile.branch-install b/...t/cargo/suricat/Dockerfile.branch-install → ...t/cargo/suricat/Dockerfile.branch-install
diff --git a/suricat/main.py → suricat-beams/suricat/main.py b/suricat/main.py → suricat-beams/suricat/main.py