diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index 741dfd5f..76afc7bc 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -4,10 +4,10 @@ on: pull_request jobs: test: - runs-on: ubuntu-latest + runs-on: macos-14 defaults: run: - shell: bash + shell: sh -l {0} steps: - uses: actions/checkout@v4 @@ -15,7 +15,7 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: python-version: '3.10' - miniforge-version: latest + installer-url: https://github.com/conda-forge/miniforge/releases/download/23.11.0-0/Mambaforge-23.11.0-0-MacOSX-arm64.sh - name: "Install AutoEIS" run: | python -m pip install --upgrade pip diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index a5b333a2..25ec3efe 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -9,7 +9,7 @@ on: jobs: deploy-docs: - runs-on: ubuntu-latest + runs-on: macos-14 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f2614224..99ac3896 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -15,35 +15,30 @@ jobs: strategy: matrix: julia-version: ['1.10'] - python-version: ['3.9', '3.10', '3.11'] + python-version: ['3.10', '3.11', '3.12'] os: [ubuntu-latest, macos-latest, macos-14, windows-latest] steps: - uses: actions/checkout@v4 - name: "Set up Julia" - if: ${{ matrix.os != 'windows-latest' || matrix.python-version != '3.9' }} uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.julia-version }} - name: "Cache Julia" - if: ${{ matrix.os != 'windows-latest' || matrix.python-version != '3.9' }} uses: julia-actions/cache@v1 with: cache-name: ${{ matrix.os }}-test-${{ matrix.julia-version }}-${{ matrix.python-version }} cache-packages: false - name: "Set up Python" - if: ${{ matrix.os != 'windows-latest' || matrix.python-version != '3.9' }} uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} cache: pip - name: "Install AutoEIS" - if: ${{ matrix.os != 'windows-latest' || matrix.python-version != '3.9' }} run: | python -m pip install --upgrade pip pip install -e .[test] python -m autoeis install - name: "Run tests" - if: ${{ matrix.os != 'windows-latest' || matrix.python-version != '3.9' }} run: | pytest -v tests/ diff --git a/pyproject.toml b/pyproject.toml index 2ed5ce63..a248857f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "autoeis" dynamic = ["version"] description = "A tool for automated EIS analysis by proposing statistically plausible ECMs." readme = "README.md" -requires-python = ">=3.9" +requires-python = ">=3.10" license = "MIT" authors = [ { name = "Runze Zhang", email = "runzee.zhang@mail.utoronto.ca" }, @@ -35,6 +35,7 @@ dependencies = [ "dill", "impedance", "ipython", + "ipykernel", "ipywidgets", "jax", "julia",