From a3f4c2db21e7f9d136331b2699e433fa4fd7f71d Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Mon, 12 Oct 2026 13:33:30 -0400 Subject: [PATCH 1/4] use sdist src --- ...0001-new-conda-python-Windows-layout.patch | 47 ------------------- recipe/meta.yaml | 10 ++-- 2 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 recipe/0001-new-conda-python-Windows-layout.patch diff --git a/recipe/0001-new-conda-python-Windows-layout.patch b/recipe/0001-new-conda-python-Windows-layout.patch deleted file mode 100644 index fa4997d..0000000 --- a/recipe/0001-new-conda-python-Windows-layout.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 92fd45aaa3a15b1ccd21783e6ce8610cd0e94892 Mon Sep 17 00:00:00 2001 -From: "Lori A. Burns" -Date: Sun, 11 Oct 2026 19:15:20 -0400 -Subject: [PATCH 1/1] new conda python Windows layout - ---- - python/dftd3/parameters.py | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/python/dftd3/parameters.py b/python/dftd3/parameters.py -index 479016d..3f252a9 100644 ---- a/python/dftd3/parameters.py -+++ b/python/dftd3/parameters.py -@@ -54,6 +54,7 @@ def get_data_file_name(base_name: str = "parameters.toml") -> str: - ) - if not exists(data_file): - # for Windows install layout -+ # * conda py<315 at Lib/site-packages/dftd3/parameters.py - data_file = join( - dirname(__file__), - "..", -@@ -65,7 +66,21 @@ def get_data_file_name(base_name: str = "parameters.toml") -> str: - base_name, - ) - if not exists(data_file): -- data_file = join(dirname(__file__), base_name) -+ # for Windows install layout -+ # * conda py>=315 at lib/python/site-packages/dftd3/parameters.py -+ data_file = join( -+ dirname(__file__), -+ "..", -+ "..", -+ "..", -+ "..", -+ "Library", -+ "share", -+ "s-dftd3", -+ base_name, -+ ) -+ if not exists(data_file): -+ data_file = join(dirname(__file__), base_name) - - return data_file - --- -2.40.1 - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f47cbc0..e4610c5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -6,13 +6,11 @@ package: version: {{ version }} source: - url: https://github.com/dftd3/simple-dftd3/archive/refs/tags/v{{ version }}.tar.gz - sha256: 534919ebc44bb59de323513f41d1c1fba5f457008323d2e67087351a76c8fd9f - patches: - - 0001-new-conda-python-Windows-layout.patch + url: https://pypi.org/packages/source/{{ name[0] }}/dftd3/dftd3-{{ version }}.tar.gz + sha256: 189e5c20b27de8e674eb241de76d7a64902b80b550629d419297a000bfe3a19b build: - number: 2 + number: 3 requirements: build: @@ -36,7 +34,7 @@ requirements: - python - python-build - setuptools - - simple-dftd3 >={{ version }} + #- simple-dftd3 >={{ version }} run: - cffi - numpy From 66f9c39932418d9fa85424903c7846a3f6d484c0 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Mon, 12 Oct 2026 14:40:19 -0400 Subject: [PATCH 2/4] dir structure --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e4610c5..7e82878 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,6 +8,7 @@ package: source: url: https://pypi.org/packages/source/{{ name[0] }}/dftd3/dftd3-{{ version }}.tar.gz sha256: 189e5c20b27de8e674eb241de76d7a64902b80b550629d419297a000bfe3a19b + folder: python build: number: 3 From 9d05a13247faf3234715c6b6ac6fadad14e9136f Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Mon, 12 Oct 2026 14:45:04 -0400 Subject: [PATCH 3/4] return s-dftd3 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7e82878..a2fde65 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -35,7 +35,7 @@ requirements: - python - python-build - setuptools - #- simple-dftd3 >={{ version }} + - simple-dftd3 >={{ version }} run: - cffi - numpy From 97c408122472f0dacd35bb14da63a6f737ce0546 Mon Sep 17 00:00:00 2001 From: "Lori A. Burns" Date: Mon, 12 Oct 2026 14:49:49 -0400 Subject: [PATCH 4/4] license --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a2fde65..7b145e8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -64,8 +64,8 @@ about: license: LGPL-3.0-or-later license_family: LGPL license_file: - - COPYING - - COPYING.LESSER + - python/COPYING + - python/COPYING.LESSER summary: Python API for the DFT-D3 project extra: