Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/pyiron-base-0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
niklassiemer authored Sep 3, 2024
2 parents 7ebe255 + 62ce85d commit da04495
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ channels:
dependencies:
- coverage
- codacy-coverage
- ipywidgets =8.1.3
- ipywidgets =8.1.5
- pyiron_base =0.10.0
- pyiron_atomistics =0.6.11
- maggma =0.60.2
- numpy =1.26.4
- pandas =2.2.2
- matplotlib-base =3.9.1
- matplotlib-base =3.9.2
- nbconvert =7.16.4
- nbformat =5.10.4
15 changes: 7 additions & 8 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@ jobs:
CONDA_PREFIX: /usr/share/miniconda/

steps:
- uses: actions/checkout@v2
- uses: conda-incubator/[email protected]
- uses: actions/checkout@v4
- name: Conda config
run: echo -e "channels:\n - conda-forge\n" > .condarc
- uses: conda-incubator/setup-miniconda@v3
with:
python-version: "3.10"
mamba-version: "*"
channels: conda-forge
channel-priority: strict
auto-update-conda: true
python-version: "3.12"
miniforge-version: latest
condarc-file: .condarc
environment-file: .ci_support/environment.yml
miniforge-variant: Mambaforge
- name: Setup
shell: bash -l {0}
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
permissions:
id-token: write
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Install dependencies
run: >-
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/pypicheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/[email protected]
- uses: actions/checkout@v4
- name: Conda config
run: echo -e "channels:\n - conda-forge\n" > .condarc
- uses: conda-incubator/setup-miniconda@v3
with:
python-version: "3.10"
mamba-version: "*"
channels: conda-forge
channel-priority: strict
auto-update-conda: true
python-version: "3.12"
miniforge-version: latest
condarc-file: .condarc
environment-file: .ci_support/environment.yml
miniforge-variant: Mambaforge
- name: Setup
shell: bash -l {0}
run: |
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v2
- uses: conda-incubator/[email protected]
- uses: actions/checkout@v4
- name: Conda config
run: echo -e "channels:\n - conda-forge\n" > .condarc
- uses: conda-incubator/setup-miniconda@v3
with:
python-version: ${{ matrix.python-version }}
mamba-version: "*"
channels: conda-forge
channel-priority: strict
auto-update-conda: true
miniforge-version: latest
condarc-file: .condarc
environment-file: .ci_support/environment.yml
miniforge-variant: Mambaforge
- name: Setup
shell: bash -l {0}
run: |
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
install_requires=[
'pyiron_base==0.10.0',
'pyiron_atomistics==0.6.11',
'ipywidgets==8.1.3',
'matplotlib==3.9.1',
'ipywidgets==8.1.5',
'matplotlib==3.9.2',
'nbconvert==7.16.4',
'nbformat==5.10.4',
'numpy==1.26.4',
Expand Down

0 comments on commit da04495

Please sign in to comment.