Merge pull request #18 from miguelcarcamov/development

Development

Author: miguelcarcamov

.github/workflows/build.yaml

@@ -45,8 +45,6 @@ jobs:
         python3 -m pip install build
     - name: Build package
       run: python3 -m build
-    - name: Build bdist package
-      run: python3 setup.py bdist_wheel
     - name: Install snow
       run: pip install dist/*.tar.gz
     - name: Upload artifacts

.github/workflows/build_base_container.yaml

@@ -6,12 +6,12 @@ on:
     - feature/refactoring
     - development
     paths:
+    - .github/build_base_container.yaml
     - Dockerfile
   pull_request:
     branches:
     - master
-    paths:
-    - Dockerfile
+
 env:
   REGISTRY: ghcr.io
 

.github/workflows/build_latest_container.yaml

@@ -5,6 +5,7 @@ on:
     branches: [master]
     paths:
     - '**.py'
+    - .github/build_latest_container.yaml
     - Dockerfile.prod
   release:
     types: [published]
@@ -49,8 +50,6 @@ jobs:
         python3 -m pip install build
     - name: Build package
       run: python3 -m build
-    - name: Build bdist package
-      run: python3 setup.py bdist_wheel
     - name: Install snow
       run: pip install dist/*.tar.gz
     - name: Upload artifacts

Dockerfile.prod

@@ -5,6 +5,7 @@ RUN pip3 --version
 RUN echo "Installing snow"
 RUN pip3 install git+https://github.com/miguelcarcamov/snow.git
 RUN echo "Hello from snow production image"
+RUN mkdir -p ~/.casa/data
 LABEL org.opencontainers.image.source="https://github.com/miguelcarcamov/snow"
 LABEL org.opencontainers.image.description="Container image for SNOW"
 LABEL org.opencontainers.image.licenses=GPL3

config.py

@@ -1,26 +1,25 @@
 name: snow-env
 dependencies:
-- python=3.10
-- numpy=1.24
+- python>=3.10,<3.11
+- numpy=1.26
 - matplotlib
 - mpi4py
 - anaconda
 - pip
 - pip:
+  - almatasks==0.0.0.3
   - astropy==6.1.0
-  - casadata==2024.1.15
-  - casafeather==0.0.20
-  - casalogger==1.0.17
-  - casampi==0.5.4
-  - casaplotms==2.3.4
-  - casaplotserver==1.7.1
-  - casashell==6.6.3.22
-  - casatablebrowser==0.0.33
-  - casatasks==6.6.3.22
-  - casatestutils==6.6.3.22
-  - casatools==6.6.3.22
-  - casaviewer==2.0.1
-  - numpy==1.24.3
+  - casafeather==0.0.22
+  - casalogger==1.0.19
+  - casampi==0.5.5
+  - casaplotms==2.4.3
+  - casaplotserver==1.8.2
+  - casashell==6.6.4.34
+  - casatablebrowser==0.0.35
+  - casatasks==6.6.4.34
+  - casatestutils==6.6.4.34
+  - casatools==6.6.4.34
+  - casaviewer==2.1.4
   - python-casacore==3.5.2
-  - reproject==0.11.0
-  - scipy==1.11.4
+  - reproject==0.13.1
+  - scipy==1.13.1

environment.yml

@@ -1,6 +1,6 @@
 [build-system]
 build-backend = "setuptools.build_meta"
-requires = ["setuptools>=65.5.0", "setuptools-scm", "wheel"]
+requires = ["setuptools>=70.0.0", "setuptools-scm", "wheel"]
 
 [project]
 authors = [
@@ -10,15 +10,34 @@ classifiers = [
   "Programming Language :: Python :: 3",
   "Operating System :: OS Independent"
 ]
+dependencies = [
+  "almatasks==0.0.0.3",
+  "astropy==6.1.0",
+  "casafeather==0.0.22",
+  "casalogger==1.0.19",
+  "casampi==0.5.5",
+  "casaplotms==2.4.3",
+  "casaplotserver==1.8.2",
+  "casashell==6.6.4.34",
+  "casatablebrowser==0.0.35",
+  "casatasks==6.6.4.34",
+  "casatestutils==6.6.4.34",
+  "casatools==6.6.4.34",
+  "casaviewer==2.1.4",
+  "numpy==1.26.0",
+  "python-casacore==3.5.2",
+  "reproject==0.11.0",
+  "scipy==1.11.4"
+]
 description = "A Python object oriented framework to do radio-interferometric self-calibration"
-dynamic = ["version", "dependencies"]
-license = {text = "GNU GPL"}
+dynamic = ["version"]
+license = {file = "LICENSE"}
 maintainers = [
   {name = "Miguel Cárcamo", email = "miguel.carcamo@manchester.ac.uk"}
 ]
 name = "snow"
 readme = "README.md"
-requires-python = ">=3.10, <=3.11"
+requires-python = ">=3.10, <3.11"
 
 [project.urls]
 Source = "https://github.com/miguelcarcamov/snow"
@@ -29,4 +48,5 @@ namespaces = false
 where = ["src"]
 
 [tool.setuptools_scm]
+local_scheme = "no-local-version"
 write_to = "src/snow/_version.py"

pyproject.toml

@@ -1,17 +1,17 @@
+almatasks==0.0.0.3
 astropy==6.1.0
-casadata==2024.1.15
-casafeather==0.0.20
-casalogger==1.0.17
-casampi==0.5.4
-casaplotms==2.3.4
-casaplotserver==1.7.1
-casashell==6.6.3.22
-casatablebrowser==0.0.33
-casatasks==6.6.3.22
-casatestutils==6.6.3.22
-casatools==6.6.3.22
-casaviewer==2.0.1
-numpy==1.24.3
+casafeather==0.0.22
+casalogger==1.0.19
+casampi==0.5.5
+casaplotms==2.4.3
+casaplotserver==1.8.2
+casashell==6.6.4.34
+casatablebrowser==0.0.35
+casatasks==6.6.4.34
+casatestutils==6.6.4.34
+casatools==6.6.4.34
+casaviewer==2.1.4
+numpy==1.26.0
 python-casacore==3.5.2
 reproject==0.11.0
 scipy==1.11.4