diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml index 265c667..bfd63f1 100644 --- a/.github/workflows/linux_test.yml +++ b/.github/workflows/linux_test.yml @@ -5,7 +5,7 @@ on: inputs: git-ref: description: Git Ref - default: master + default: main required: true debug_enabled: type: boolean @@ -24,7 +24,14 @@ jobs: os: [ubuntu-24.04] python-version: ["3.11", "3.12", "3.13"] steps: - - uses: actions/checkout@v4 + - name: Clone Repository (Main) + uses: actions/checkout@v4 + if: github.event.inputs.git-ref == '' + - name: Clone Repository (Custom Ref) + uses: actions/checkout@v4 + if: github.event.inputs.git-ref != '' + with: + ref: ${{ github.event.inputs.git-ref }} - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -34,6 +41,8 @@ jobs: timeout-minutes: 60 if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} - name: Install Dependencies of OpenQuake engine + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | curl -L -O https://github.com/gem/oq-engine/raw/master/install.py python install.py user --version=master diff --git a/.github/workflows/macos_arm_test.yml b/.github/workflows/macos_arm_test.yml index 0da8153..c0aab10 100644 --- a/.github/workflows/macos_arm_test.yml +++ b/.github/workflows/macos_arm_test.yml @@ -5,7 +5,7 @@ on: inputs: git-ref: description: Git Ref - default: master + default: main required: true schedule: - cron: "0 3 * * 0" @@ -16,15 +16,24 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-15] + os: [macos-latest] python-version: ["3.11", "3.12", "3.13"] steps: - - uses: actions/checkout@v4 + - name: Clone Repository (Main) + uses: actions/checkout@v4 + if: github.event.inputs.git-ref == '' + - name: Clone Repository (Custom Ref) + uses: actions/checkout@v4 + if: github.event.inputs.git-ref != '' + with: + ref: ${{ github.event.inputs.git-ref }} - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install Dependencies of OpenQuake engine + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | curl -L -O https://github.com/gem/oq-engine/raw/master/install.py python install.py user --version=master @@ -34,7 +43,7 @@ jobs: PY_VER=`echo py${{ matrix.python-version }} | tr -d .` echo $PY_VER export PIP_DEFAULT_TIMEOUT=100 - pip install -r requirements-$PY_VER-linux.txt + pip install -r requirements-$PY_VER-macos_arm64.txt pip install -e . - name: Run tests run: | diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml index 465bea6..59b68db 100644 --- a/.github/workflows/windows_test.yml +++ b/.github/workflows/windows_test.yml @@ -5,7 +5,7 @@ on: inputs: git-ref: description: Git Ref - default: master + default: main required: true schedule: - cron: "0 2 * * 0" @@ -19,12 +19,23 @@ jobs: os: [windows-2025] python-version: ["3.11", "3.12", "3.13"] steps: - - uses: actions/checkout@v4 + - name: Clone Repository (Main) + uses: actions/checkout@v4 + if: github.event.inputs.git-ref == '' + with: + ref: ${{ github.head_ref }} + - name: Clone Repository (Custom Ref) + uses: actions/checkout@v4 + if: github.event.inputs.git-ref != '' + with: + ref: ${{ github.event.inputs.git-ref }} - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install Dependencies of OpenQuake engine + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | curl.exe -LO https://github.com/gem/oq-engine/raw/master/install.py python install.py user --version=master diff --git a/pyproject.toml b/pyproject.toml index 198da18..5a309f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ classifiers = [ "Topic :: Scientific/Engineering", ] -requires-python = ">=3.10, <3.14" +requires-python = ">=3.11, <3.14" dependencies = [ "seaborn >= 0.13.0", "ipykernel >= 4.8.0", @@ -43,7 +43,7 @@ dependencies = [ "jupyter_client >= 5.0.0", "notebook >= 5.0.0", "pyproj >= 3.7.2", - "scipy > 1.15.3", + "scipy >= 1.15.3", "matplotlib >= 3.10.1", "numpy >= 2.2.6", "numba >= 0.61.2",