Skip to content

Commit

Permalink
Remove workaround for rattler-build gitignore thing
Browse files Browse the repository at this point in the history
+ add patch for FANS shortcoming
  • Loading branch information
claudiushaag committed Nov 28, 2024
1 parent 1f9655d commit d381221
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
25 changes: 25 additions & 0 deletions recipes/fans/fix_gitignore_ms.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 393a0c622bcef196bbe1c0cc81fe8c15b9b152c4 Mon Sep 17 00:00:00 2001
From: Claudius Haag <[email protected]>
Date: Thu, 28 Nov 2024 11:04:56 +0100
Subject: [PATCH] Fix gitignore for sphere32 inclusion + needed for copying
when doing test for conda-forge packaging

---
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2bc948f..c713336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -198,7 +198,7 @@ test/input_files/**/*.json
**/scratch/

# Test microstructure files
-!sphere.h5
+!sphere32.h5

# Test input files
!test_LinearElastic.json
--
2.34.1
4 changes: 2 additions & 2 deletions recipes/fans/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ package:
source:
url: https://github.com/DataAnalyticsEngineering/FANS/archive/refs/tags/v${{ version }}.tar.gz
sha256: 1573478d9acd27a9cfc126a4167ce3951ec26e9896bf19577b44cbc4bdc48b88
patches:
- fix_gitignore_ms.patch # modify so gitignore does not include the sphere32.h5 file

build:
number: 0
Expand Down Expand Up @@ -43,8 +45,6 @@ tests:
bin:
- FANS
- script:
- mkdir -p $(dirname "$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/microstructures/sphere32.h5") && curl -L -o "$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/microstructures/sphere32.h5" https://raw.githubusercontent.com/DataAnalyticsEngineering/FANS/main/test/microstructures/sphere32.h5
- echo "Download of missing file complete!"
- JSON_FILE="$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/input_files/test_LinearElastic.json"
- MODIFIED_JSON_FILE="$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/input_files/test_LinearElastic_mod.json"
- NEW_MS_FILENAME="$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/microstructures/sphere32.h5"
Expand Down

0 comments on commit d381221

Please sign in to comment.