From b1a56d1288dc2cc84280eb4867fb8d6e27fbd67a Mon Sep 17 00:00:00 2001 From: looooo Date: Fri, 26 Nov 2021 15:12:07 +0100 Subject: [PATCH] delete patches, disable tests for windows --- recipe/fem_yaml.patch | 25 ------------------------- recipe/meta.yaml | 5 +---- recipe/pcl.patch | 18 ------------------ 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 recipe/fem_yaml.patch delete mode 100644 recipe/pcl.patch diff --git a/recipe/fem_yaml.patch b/recipe/fem_yaml.patch deleted file mode 100644 index 689c0a92..00000000 --- a/recipe/fem_yaml.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 20e756306d9aa624fcbf465f0345d721673ce720 -Author: Bernd Waibel -Date: Wed Apr 28 22:08:19 2021 +0200 - - [Fem] fix femtest failure with yaml.load - - Solves an issue with using an outdated call to yaml.load - as described in - https://forum.freecadweb.org/viewtopic.php?f=10&t=57617 - - Signed-off-by: Bernd Waibel - -diff --git a/src/Mod/Fem/feminout/importYamlJsonMesh.py b/src/Mod/Fem/feminout/importYamlJsonMesh.py -index 98862489dd..43820c14ac 100644 ---- a/src/Mod/Fem/feminout/importYamlJsonMesh.py -+++ b/src/Mod/Fem/feminout/importYamlJsonMesh.py -@@ -162,7 +162,7 @@ def read( - or fileExtension.lower() == ".yml" - ) and has_yaml: - fp = pyopen(fileString, "rt") -- raw_mesh_data = yaml.load(fp) -+ raw_mesh_data = yaml.load(fp, Loader=yaml.SafeLoader) - fp.close() - else: - Console.PrintError( diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 04e0072f..fa37ef2f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,9 +10,6 @@ package: source: url: https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/{{ version }}/freecad_source.tar.gz sha256: 5f4449a1dd0e03bad2df414d649ed54846d402977373d193a1e56fbae2b75090 - patches: - - pcl.patch - - fem_yaml.patch build: number: {{ build_number }} @@ -86,7 +83,7 @@ requirements: test: commands: - - freecadcmd -t 0 + - freecadcmd -t 0 # [unix] about: home: https://www.freecadweb.org/ diff --git a/recipe/pcl.patch b/recipe/pcl.patch deleted file mode 100644 index 5b9abff9..00000000 --- a/recipe/pcl.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit dd546a5ee99bbf565ee96b8e496c896e66670aa1 -Author: sprhawk <465558+sprhawk@users.noreply.github.com> -Date: Fri Jul 9 19:22:08 2021 +0800 - - to compile with PCL-1.12.0 - -diff --git a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp -index 427fe176d4..6cafed46dd 100644 ---- a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp -+++ b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - #include - #include -