Installers updated to current Orange (with big changes)

.cirrus.yml

@@ -4,17 +4,21 @@ macos_arm64_dmg_task:
   env:
     REPO: https://github.com/biolab/orange3.git
     BUILD_BRANCH: master
-    BUILD_COMMIT: 3.36.0
-    APP: "/Applications/Orange3.app"
+    BUILD_COMMIT: 3.36.2
+    APP: "/Applications/Quasar-M.app"
 
-    PYTHON_VERSION: 3.9.12
+    PYTHON_VERSION: "3.10.11"
     PIP_PREFER_BINARY: "1"
     ARCH: "arm64"
     ARCHFLAGS: "-arch arm64"
     PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH
     # --skip-jenkins arg to create-dmg
     SKIP_JENKINS: "1"
 
+    # Quasar
+    QUASAR_VERSION: "1.9.0"
+    SPECTROSCOPY_VERSION: "0.6.11"
+
   prerequisites_script:
     - brew install python@3.10
     - brew install create-dmg
@@ -28,28 +32,33 @@ macos_arm64_dmg_task:
 
   build_installer_script:
     - cd orange3
-    - PIP_ARGS=( --pip-arg={-r,../specs/macos/requirements-arm64.txt,Orange3==$BUILD_COMMIT} );
+    - PIP_ARGS=( --pip-arg={-r,../specs/macos/requirements-arm64.txt,Orange3==$BUILD_COMMIT,orange-spectroscopy==$SPECTROSCOPY_VERSION,quasar==$QUASAR_VERSION} );
     - ../scripts/macos/build-macos-app.sh --macos 11 "${PIP_ARGS[@]}" --python-version=${PYTHON_VERSION} "$APP"
     # Apply arm64 specific patches
     - patch -p1 -d "$APP" < ../scripts/macos/arm64.patch
 
   build_dmg_installer_script:
     - cd orange3
-    - ../scripts/macos/create-dmg-installer.sh --app "$APP" dist/Orange3.dmg
+    - ../scripts/macos/create-dmg-installer.sh --app "$APP" dist/Quasar.dmg
     - >-
-      VERSION=`$APP/Contents/MacOS/pip show orange3 | grep -E '^Version: ' | cut -d ' ' -f 2`
-    - mv dist/Orange3.dmg dist/Orange3-$VERSION-Python${PYTHON_VERSION}-${ARCH}.dmg
-    - shasum -a 256 dist/Orange3-$VERSION-Python${PYTHON_VERSION}-${ARCH}.dmg
+      VERSION=`$APP/Contents/MacOS/pip show quasar | grep -E '^Version: ' | cut -d ' ' -f 2`
+    - mv dist/Quasar.dmg dist/Quasar-$VERSION-Python${PYTHON_VERSION}-${ARCH}.dmg
+    - shasum -a 256 dist/Quasar-$VERSION-Python${PYTHON_VERSION}-${ARCH}.dmg
     - mv dist/Orange3-$VERSION-Python${PYTHON_VERSION}-${ARCH}.dmg ../dist
 
   test_script:
     - mkdir -p ~/Applications
     - mv -f $APP ~/Applications/
-    - APP=( ~/Applications/Orange3.app )
+    - APP=( ~/Applications/$(basename $APP) )
     - $APP/Contents/MacOS/python --version
     - $APP/Contents/MacOS/pip --version
     - $APP/Contents/MacOS/pip freeze
     - $APP/Contents/MacOS/python -Xfaulthandler -m unittest -v Orange.tests Orange.widgets.tests || true
 
+    # Quasar specific tests
+    - $APP/Contents/MacOS/python -Xfaulthandler -m unittest -v orangecontrib.spectroscopy.tests
+    - $APP/Contents/MacOS/python -Xfaulthandler -m quasar --help
+    - $APP/Contents/MacOS/python -Xfaulthandler -c "import opusFC"
+
   dmg_artifacts:
     path: "dist/*"

.github/workflows/build-conda-installer.yml

@@ -0,0 +1,221 @@
+name : Build Windows Conda Installer
+
+on:
+  pull_request:
+  workflow_dispatch:
+  push:
+      branches:
+        - 'master'
+        - 'releases/**'
+        - 'testing/**'
+
+jobs:
+  build:
+    runs-on:  windows-2019
+    timeout-minutes: 60
+    env:
+      REPO: https://github.com/biolab/orange3.git
+      BUILD_BRANCH: master
+      BUILD_COMMIT: "3.36.2"
+      BUILD_LOCAL: ""
+
+      PYTHONFAULTHANDLER: 1
+      PIP_NO_PIP_VERSION_CHECK: 1
+      PIP_CACHE_DIR: .pip-cache
+      PIP_PREFER_BINARY: 1
+      CONDA_BUILD_VERSION: "3.26.*"
+      # CONDA_SPEC_FILE: ..\specs\win\conda-spec.txt
+
+      # Quasar
+      QUASAR_VERSION: "1.9.0"
+      SPECTROSCOPY_VERSION: "0.6.11"
+
+    strategy:
+      fail-fast: False
+      matrix:
+        include:
+          - python-version: "3.10.11"
+            miniconda-version: "py310_23.11.0-1"
+
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - uses: mamba-org/setup-micromamba@v1
+        with:
+          condarc: >-
+            channels:
+              - https://quasar.codes/conda/
+              - conda-forge
+              - defaults
+          environment-name: build
+          create-args: conda conda-build boa python=3.11
+          init-shell: bash cmd.exe
+          generate-run-shell: true
+
+      - name: Checkout orange3
+        shell: bash
+        run: |
+          set -e
+          git clone -q $REPO
+          cd orange3
+          git fetch origin $BUILD_BRANCH
+          git checkout $BUILD_COMMIT
+
+      - name: Prepare conda packages
+        env:
+          PYTHON_VERSION: ${{ matrix.python-version }}
+        run: |
+          if [[ $BUILD_LOCAL ]]; then
+            conda mambabuild --no-test --python $PYTHON_VERSION ./orange3/conda-recipe
+            VERSION=$(cd orange3; python setup.py --version)
+            EXTRA_ARGS=(-c file:///C:/users/runneradmin/micromamba/envs/build/conda-bld)
+          else
+            VERSION=$BUILD_COMMIT
+            EXTRA_ARGS=()
+          fi
+          if [[ ! $CONDA_SPEC_FILE ]]; then
+            micromamba create -p ./env --yes \
+                         ${EXTRA_ARGS[*]} \
+                         python=$PYTHON_VERSION \
+                         numpy=1.24.* \
+                         scipy=1.10.* \
+                         scikit-learn=1.3.* \
+                         pandas=1.5.* \
+                         pyqtgraph=0.13.* \
+                         bottleneck=1.3.* \
+                         pyqt=5.15.* \
+                         pyqtwebengine=5.15.* \
+                         Orange3=$VERSION \
+                         blas=*=openblas \
+                         quasar=$QUASAR_VERSION \
+                         orange-spectroscopy=$SPECTROSCOPY_VERSION \
+                         opusFC=1.3.0 \
+                         h5py
+            conda list -p ./env --export --explicit --md5 > env-spec.txt
+            cat env-spec.txt
+            echo "CONDA_SPEC_FILE=env-spec.txt" >> $GITHUB_ENV
+          fi
+
+      - name: Build installer
+        env:
+          PLATTAG: win_amd64
+          MINICONDA_VERSION: ${{ matrix.miniconda-version }}
+        run: |
+          mkdir dist
+          export PATH="$(cygpath -u 'C:\Program Files (x86)\NSIS'):$PATH"
+          echo PATH=$PATH
+          bash -e ./scripts/windows/build-conda-installer.sh  \
+              --platform $PLATTAG \
+              --cache-dir .cache \
+              --dist-dir dist \
+              --miniconda-version "$MINICONDA_VERSION" \
+              --env-spec "$CONDA_SPEC_FILE" \
+              --online no
+
+          INSTALLER=( dist/Quasar-*.exe )
+          SHA256=$( sha256sum -b $INSTALLER )
+          echo INSTALLER = $INSTALLER
+          echo SHA256 = $( sha256sum -b $INSTALLER )
+
+      - name: Upload installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: orange-win-conda-installer
+          path: dist/Quasar-*.exe
+          if-no-files-found: error
+
+  test:
+    name: Test
+    needs: build
+    runs-on: windows-2019
+    steps:
+      - name: Download installer
+        uses: actions/download-artifact@v4
+        with:
+          name: orange-win-conda-installer
+
+      - name: Install
+        shell: cmd
+        run: |
+          rem # Install in silent mode. Output has to be piped somewhere so the installer
+          rem # runs 'attached' to the console.
+          for %%s in ( Quasar-*.exe ) do ( set "INSTALLER=%%s" )
+          echo INSTALLER = %INSTALLER%
+          %INSTALLER% /S /D=D:\test-install > nul
+      - name: Run tests
+        shell: bash
+        run: |
+          PYTHON=$(cygpath -u 'D:\test-install\python')
+          $PYTHON --version
+          $PYTHON -m pip --version
+          $PYTHON -m pip list --format=freeze
+          # Test that orange and all dependencies are installed in a
+          # consistent state
+          #$PYTHON -m pip install --no-index --no-cache-dir orange3
+
+          # Run test suite in the installed environment.
+          export ORANGE_DEPRECATIONS_ERROR=1
+          export PYTHONWARNINGS=module
+
+          $PYTHON -m unittest -v Orange.tests Orange.widgets.tests
+
+          # Quasar specific tests
+          $PYTHON -m unittest -v orangecontrib.spectroscopy.tests
+          $PYTHON -m quasar --help
+          $PYTHON -c "import opusFC"
+
+      - name: Test conda
+        shell: cmd
+        run: |
+          D:\test-install\Scripts\conda.bat --help
+          D:\test-install\Scripts\conda.bat info
+          D:\test-install\Scripts\activate.bat
+          echo %CONDA_PREFIX%
+
+  package_portable:
+    name: Package a portable install
+    needs: [build, test]
+    runs-on: windows-2019
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Download installer
+        uses: actions/download-artifact@v3
+        with:
+          name: orange-win-conda-installer
+
+      - name: Extract installer contents
+        shell: cmd
+        run: |
+          rem # Install in silent mode. Output has to be piped somewhere so the installer
+          rem # runs 'attached' to the console.
+          for %%s in ( Orange3*.exe ) do ( set "INSTALLER=%%s" )
+          echo INSTALLER = %INSTALLER%
+          %INSTALLER% /S /D=D:\test-install > nul
+
+      - name: Package portable installer
+        shell: cmd
+        run: |
+          mkdir dist
+          ci\appveyor-make-portable.bat D:\test-install %CD%\dist\Orange.zip
+
+      - name: Upload portable installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: orange-win-portable-installer
+          path: dist/Orange*.zip
+          if-no-files-found: error