Skip to content
Draft
Show file tree
Hide file tree
Changes from all 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
20 changes: 11 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@ jobs:
build: [meson, cmake, fpm]
build-type: [debug]
compiler: [gnu]
version: [10]
version: [12]

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 @@ -252,7 +252,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
gcc_v: [10]
gcc_v: [12]
python_v: ['3.8', '3.9', '3.10', '3.11', '3.12']

env:
Expand All @@ -267,14 +267,16 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- run: pip3 install coverage
#- run: pip3 install coverage

- name: Install dependencies
uses: mamba-org/setup-micromamba@v1
with:
environment-file: assets/ci/python-env.yaml
create-args: |
python=${{ matrix.python_v }}

- run: python -m pip install --upgrade pip && python -m pip install coverage

- name: Install GCC (OSX)
if: ${{ contains(matrix.os, 'macos') }}
Expand Down Expand Up @@ -309,7 +311,7 @@ jobs:
cp assets/parameters.toml python/dftd3

- name: Install Python extension module (pip)
run: pip3 install . -vv
run: python3 -m pip install . -vv
working-directory: python
env:
PKG_CONFIG_PATH: ${{ env.PKG_CONFIG_PATH }}:${{ env.DFTD3_PREFIX }}/lib/pkgconfig
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
os:
- ubuntu-latest
- windows-latest
- macos-13
- macos-15-intel
- macos-14

defaults:
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
CIBW_ARCHS_MACOS: ${{ matrix.os == 'macos-14' && 'arm64' || 'x86_64' }}
CIBW_ENVIRONMENT_MACOS: >
CC=gcc-14 CXX=g++-14 FC=gfortran-14
MACOSX_DEPLOYMENT_TARGET=${{ matrix.os == 'macos-14' && '14.0' || '13.0' }}
MACOSX_DEPLOYMENT_TARGET=${{ matrix.os == 'macos-14' && '14.0' || '15.0' }}
CIBW_BEFORE_ALL_MACOS: brew install gcc@14
CIBW_BEFORE_BUILD_WINDOWS: choco upgrade mingw && pip install delvewheel
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel show {wheel} && delvewheel repair -w {dest_dir} {wheel} --no-mangle-all"
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.1")

if(NOT DEFINED "${_pkg}_FIND_METHOD")
if(DEFINED "${PROJECT_NAME}-dependency-method")
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/Findtoml-f.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
set(_lib "toml-f")
set(_pkg "TOMLF")
set(_url "https://github.com/toml-f/toml-f")
set(_rev "v0.4.2")
set(_rev "v0.4.3")

if(NOT DEFINED "${_pkg}_FIND_METHOD")
if(DEFINED "${PROJECT_NAME}-dependency-method")
Expand Down
3 changes: 2 additions & 1 deletion config/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ endif
# Create the tool chain library as subproject
mctc_dep = dependency(
'mctc-lib',
version: '>=0.4.1',
version: '>=0.5.1',
fallback: ['mctc-lib', 'mctc_dep'],
default_options: ['default_library=static'],
)
Expand All @@ -55,6 +55,7 @@ lib_deps += mctc_dep
# Create the TOML Fortran library as subproject
tomlf_dep = dependency(
'toml-f',
version: '>=0.4.3',
fallback: ['toml-f', 'tomlf_dep'],
default_options: ['default_library=static'],
)
Expand Down
3 changes: 2 additions & 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.1"

[dev-dependencies]
mstore.git = "https://github.com/grimme-lab/mstore"
Expand All @@ -21,6 +21,7 @@ auto-tests = false
[[executable]]
name = "s-dftd3"
dependencies.toml-f.git = "https://github.com/toml-f/toml-f"
dependencies.toml-f.tag = "v0.4.3"

[[test]]
name = "tester"
Expand Down
2 changes: 1 addition & 1 deletion 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
revision = v0.5.1
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 = v0.4.3
Loading