Skip to content

Commit

Permalink
Merge remote-tracking branch 'trunk/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
gmatteo committed May 3, 2024
2 parents 8d33a00 + 0594672 commit 7b378df
Show file tree
Hide file tree
Showing 287 changed files with 3,708 additions and 27,268 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# declare HTML, rST and test files as vendored/docs to exclude them when calculating repo languages on GitHub
tests/files/**/* linguist-vendored
cmd_line/* linguist-vendored
docs/**/* linguist-generated
dev_scripts/**/* linguist-vendored
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: "3.11"
python-version: "3.12"

- name: Build sdist
run: |
Expand All @@ -45,7 +45,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-14, windows-latest]
python-version: ["39", "310", "311"]
python-version: ["39", "310", "311", "312"]
runs-on: ${{ matrix.os }}
steps:
- name: Check out repo
Expand All @@ -68,10 +68,10 @@ jobs:
# For pypi trusted publishing
id-token: write
steps:
- name: Set up Python 3.11
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: "3.12"

- name: Get build artifacts
uses: actions/download-artifact@v3
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,23 @@ jobs:
matrix:
# pytest-split automatically distributes work load so parallel jobs finish in similar time
os: [ubuntu-latest, windows-latest]
python-version: ["3.9", "3.11"]
python-version: ["3.9", "3.12"]
split: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
# include/exclude is meant to maximize CI coverage of different platforms and python
# versions while minimizing the total number of jobs. We run all pytest splits with the
# oldest supported python version (currently 3.9) on windows (seems most likely to surface
# errors) and with newest version (currently 3.11) on ubuntu (to get complete and speedy
# errors) and with newest version (currently 3.12) on ubuntu (to get complete and speedy
# coverage on unix). We ignore mac-os, which is assumed to be similar to ubuntu.
exclude:
- os: windows-latest
python-version: "3.11"
python-version: "3.12"
- os: ubuntu-latest
python-version: "3.9"

runs-on: ${{ matrix.os }}

env:
PMG_MAPI_KEY: ${{ secrets.PMG_MAPI_KEY }}
GULP_LIB: ${{ github.workspace }}/cmd_line/gulp/Libraries
PMG_VASP_PSP_DIR: ${{ github.workspace }}/tests/files

steps:
Expand All @@ -61,11 +60,6 @@ jobs:
- name: Install uv
run: micromamba run -n pmg pip install uv

- name: Copy GULP to bin
if: matrix.os == 'ubuntu-latest'
run: |
sudo cp cmd_line/gulp/Linux_64bit/* /usr/local/bin/
- name: Install ubuntu-only conda dependencies
if: matrix.os == 'ubuntu-latest'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: ^(docs|tests/files|cmd_line|tasks.py)
exclude: ^(docs|tests/files|tasks.py)

ci:
autoupdate_schedule: monthly
Expand Down
74 changes: 0 additions & 74 deletions cmd_line/gulp/Libraries/belashchenko.lib

This file was deleted.

24 changes: 0 additions & 24 deletions cmd_line/gulp/Libraries/bks.lib

This file was deleted.

27 changes: 0 additions & 27 deletions cmd_line/gulp/Libraries/bresme_water.lib

This file was deleted.

79 changes: 0 additions & 79 deletions cmd_line/gulp/Libraries/bush.lib

This file was deleted.

98 changes: 0 additions & 98 deletions cmd_line/gulp/Libraries/carbonate.lib

This file was deleted.

Loading

0 comments on commit 7b378df

Please sign in to comment.