2025.1

.github/workflows/build_release.yml

@@ -68,13 +68,15 @@ jobs:
     - name: Build Package
       run: |
         os="${{ matrix.os }}"
+        if [[ ("${os:0:6}" == "ubuntu") ]]; then arch_flag=""; else arch_flag="--arch-specific"; fi
         echo "Packages: ${{needs.sanity_check.outputs.packages}}"
+        echo "Arch flag: ${arch_flag}"
         echo "Override flag: ${{needs.sanity_check.outputs.overwrite_flag}}"
         echo "### ${os} packages: " >> $GITHUB_STEP_SUMMARY
         for package in ${{needs.sanity_check.outputs.packages}}; do
           if [[ ("${os:0:7}" != "windows") || ("${package:0:9}" != "ska3-perl") ]]; then
             python skare3_tools/skare3_tools/scripts/build.py ${package} \
-            --arch-specific --tag ${GITHUB_SHA} --skare3-branch ${GITHUB_SHA} ${{needs.sanity_check.outputs.overwrite_flag}};
+            ${arch_flag} --tag ${GITHUB_SHA} --skare3-branch ${GITHUB_SHA} ${{needs.sanity_check.outputs.overwrite_flag}};
           fi;
         done;
       env:
@@ -90,6 +92,7 @@ jobs:
         name: conda-package-${{ matrix.os }}
         path: |
           builds/noarch/
+          builds/linux-64/
           builds/osx-64/
           builds/osx-arm64/
           builds/win-64/

pkg_defs/ska3-core-latest/base_environment.yml

@@ -1,8 +1,8 @@
 channels:
   - conda-forge
 dependencies:
-  - python=3.11
-  - numexpr<2.8.5
+  - python=3.12
+  - numexpr
   - libblas         # on conda-forge, libblas uses open_blas by default
   - libarchive      # libarchive from defaults is not good for mamba
   - mamba

pkg_defs/ska3-core-latest/install_from_scratch.py

@@ -36,18 +36,23 @@ def get_package_list():
                 "pyqt",
             ],
         },
-        {  # this version is set so it is not the latest
+        {  # 0.60 is incompatible with VS code debugger
             "channels": CHANNELS,
             "options": [],
-            "packages": ["django==3.1.7"],
+            "packages": ["numba==0.59.1"],
         },
-        {  # later versions cause a conflict with nb_conda
+        {  # this version is set so it is not the latest
             "channels": CHANNELS,
             "options": [],
-            "packages": ["notebook==6.5.6"],
+            "packages": ["django==3.1.7"],
         },
+        # {  # later versions cause a conflict with nb_conda
+        #     "channels": CHANNELS,
+        #     "options": [],
+        #     "packages": ["notebook==6.5.6"],
+        # },
         {  # this is not in defaults or conda-forge (for now?)
-            "channels": ["sherpa"] + CHANNELS,
+            "channels": ["https://cxc.cfa.harvard.edu/conda/sherpa"] + CHANNELS,
             "options": [],
             "packages": ["sherpa"],
             "platform": ["linux-64", "osx-64", "osx-arm64"],

pkg_defs/ska3-core-latest/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: ska3-core-latest
-  version: 2024.1
+  version: 2025.1
 
 requirements:
   run:
@@ -51,21 +51,20 @@ requirements:
    - openpyxl
    - pillow
    - pip
-   - flake8
-   - pylint
    - plotly
    - ply
+   - pre-commit
    - pytest-timeout
    - python-kaleido
    - python-docx
    - pyqt
    - pyqtgraph
+   - pyqtwebengine
    - pyyaml
    - qt
    - regions
    - requests
    - rope
-   - ruff
    - scikit-learn
    - scipy
    - setuptools
@@ -74,7 +73,7 @@ requirements:
    - sphinx-argparse
    - six
    - sphinx
-   - sqlalchemy # [win]
+   - sqlalchemy
    - sqlite
    - tk
    - tqdm