Skip to content
Draft
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ jobs:
version: [10]

include:
- os: macos-13
- os: macos-15-intel
build: cmake
build-type: debug
compiler: gnu
version: 10
version: 14

- os: ubuntu-latest
build: meson
build-type: coverage
compiler: gnu
version: 9

- os: macos-13
- os: macos-15-intel
build: meson
build-type: debug
compiler: gnu
version: 10
version: 14

- os: ubuntu-latest
build: meson
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
FC: ${{ matrix.compiler == 'intel' && 'ifort' || 'gfortran' }}
CC: ${{ matrix.compiler == 'intel' && 'icc' || 'gcc' }}
GCC_V: ${{ matrix.version }}
PYTHON_V: 3.8
PYTHON_V: 3.9

steps:
- name: Checkout code
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
--print-errorlogs
--no-rebuild
--num-processes 1
--suite s-dftd3
#--suite s-dftd3
-t 2
env:
OMP_NUM_THREADS: 1,2,1
Expand Down
2 changes: 1 addition & 1 deletion assets/ci/build-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: devel
channels:
- conda-forge
dependencies:
- meson 0.58.0
- meson != 1.8.0
- fpm
- cmake
- ninja
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/Findmctc-lib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
set(_lib "mctc-lib")
set(_pkg "MCTCLIB")
set(_url "https://github.com/grimme-lab/mctc-lib")
set(_rev "v0.4.1")
set(_rev "v0.5.0")

if(NOT DEFINED "${_pkg}_FIND_METHOD")
if(DEFINED "${PROJECT_NAME}-dependency-method")
Expand Down
2 changes: 1 addition & 1 deletion fpm.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["dispersion-correction", "quantum-chemistry"]

[dependencies]
mctc-lib.git = "https://github.com/grimme-lab/mctc-lib"
mctc-lib.tag = "v0.4.1"
mctc-lib.tag = "v0.5.0"

[dev-dependencies]
mstore.git = "https://github.com/grimme-lab/mstore"
Expand Down
4 changes: 2 additions & 2 deletions subprojects/mctc-lib.wrap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[wrap-git]
directory = mctc-lib
url = https://github.com/grimme-lab/mctc-lib
revision = v0.4.1
url = https://github.com/thfroitzheim/mctc-lib
revision = update-jonquil
2 changes: 1 addition & 1 deletion subprojects/toml-f.wrap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[wrap-git]
directory = toml-f
url = https://github.com/toml-f/toml-f
revision = v0.4.2
revision = head
Loading