Copied over the recipe from CCI from valgur PR

Added a fix for setuptools > 58.0.0 and added 3.10.4 patch Mostly to test things out, see how it behaves with setting the environmental variables for our Windows runner. Contributes to CURA-11544 Co-authored-by: valgur <[email protected]> Co-authored-by: ahajha <[email protected]>
Ultimaker · Jan 16, 2024 · d29cc56 · d29cc56
1 parent d6373e7
commit d29cc56
Show file tree

Hide file tree

Showing 35 changed files with 1,377 additions and 559 deletions.
diff --git a/recipes/cpython/all/conandata.yml b/recipes/cpython/all/conandata.yml
@@ -19,68 +19,38 @@ sources:
     sha256: "da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814"
 patches:
   "3.10.4":
-    - patch_file: "patches/3.10.0-0001-msvc.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.9.7-0002-_msi-vcxproj.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.10.0-0003-_ctypes-ffi.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.10.4-0005-disable-macos-tcltk.patch"
-      base_path: "source_subfolder"
+    - patch_file: "patches/3.10/3.10.0-0001-msvc.patch"
+    - patch_file: "patches/3.9/3.9.7-0002-_msi-vcxproj.patch"
+    - patch_file: "patches/3.10/3.10.0-0003-_ctypes-ffi.patch"
+    - patch_file: "patches/3.10/3.10.4-0005-disable-macos-tcltk.patch"
     - patch_file: "patches/3.x-0001-relocatable-python-config.patch"
-      base_path: "source_subfolder"
   "3.10.0":
-    - patch_file: "patches/3.10.0-0001-msvc.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.9.7-0002-_msi-vcxproj.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.10.0-0003-_ctypes-ffi.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.10.0-0004-setup.py-pass-CFLAGS-CPPFLAGS.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.10.0-0005-disable-macos-tcltk.patch"
-      base_path: "source_subfolder"
+    - patch_file: "patches/3.10/3.10.0-0001-msvc.patch"
+    - patch_file: "patches/3.9/3.9.7-0002-_msi-vcxproj.patch"
+    - patch_file: "patches/3.10/3.10.0-0003-_ctypes-ffi.patch"
+    - patch_file: "patches/3.10/3.10.0-0004-setup.py-pass-CFLAGS-CPPFLAGS.patch"
+    - patch_file: "patches/3.10/3.10.0-0005-disable-macos-tcltk.patch"
     - patch_file: "patches/3.x-0001-relocatable-python-config.patch"
-      base_path: "source_subfolder"
   "3.9.7":
-    - patch_file: "patches/3.9.7-0001-msvc.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.9.7-0002-_msi-vcxproj.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.9.7-0003-_ctypes-ffi.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.9.7-0004-setup.py-pass-CFLAGS-CPPFLAGS.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.9.7-0005-disable-macos-tcltk.patch"
-      base_path: "source_subfolder"
+    - patch_file: "patches/3.9/3.9.7-0001-msvc.patch"
+    - patch_file: "patches/3.9/3.9.7-0002-_msi-vcxproj.patch"
+    - patch_file: "patches/3.9/3.9.7-0003-_ctypes-ffi.patch"
+    - patch_file: "patches/3.9/3.9.7-0004-setup.py-pass-CFLAGS-CPPFLAGS.patch"
+    - patch_file: "patches/3.9/3.9.7-0005-disable-macos-tcltk.patch"
     - patch_file: "patches/3.x-0001-relocatable-python-config.patch"
-      base_path: "source_subfolder"
   "3.8.12":
-    - patch_file: "patches/3.8.12-0001-msvc.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.8.12-0002-_ctypes-ffi.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.8.12-0003-setup.py-pass-CFLAGS-CPPFLAGS.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.8.12-0004-disable-macos-tcltk.patch"
-      base_path: "source_subfolder"
+    - patch_file: "patches/3.8/3.8.12-0001-msvc.patch"
+    - patch_file: "patches/3.8/3.8.12-0002-_ctypes-ffi.patch"
+    - patch_file: "patches/3.8/3.8.12-0003-setup.py-pass-CFLAGS-CPPFLAGS.patch"
+    - patch_file: "patches/3.8/3.8.12-0004-disable-macos-tcltk.patch"
     - patch_file: "patches/3.x-0001-relocatable-python-config.patch"
-      base_path: "source_subfolder"
   "3.7.12":
-    - patch_file: "patches/3.7.9-0001-msvc.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.7.9-0002-setup.py-pass-CFLAGS-CPPFLAGS.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.7.9-0003-disable-macos-tcltk.patch"
-      base_path: "source_subfolder"
+    - patch_file: "patches/3.7/3.7.9-0001-msvc.patch"
+    - patch_file: "patches/3.7/3.7.9-0002-setup.py-pass-CFLAGS-CPPFLAGS.patch"
+    - patch_file: "patches/3.7/3.7.9-0003-disable-macos-tcltk.patch"
     - patch_file: "patches/3.x-0001-relocatable-python-config.patch"
-      base_path: "source_subfolder"
   "2.7.18":
-    - patch_file: "patches/2.7.18-0001-msvc.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/2.7.18-0002-add-support-msvc-14.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/2.7.18-0003-msvc-fix-static.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/2.7.18-0004-disable-macos-tcltk.patch"
-      base_path: "source_subfolder"
+    - patch_file: "patches/2.7/2.7.18-0001-msvc.patch"
+    - patch_file: "patches/2.7/2.7.18-0002-add-support-msvc-14.patch"
+    - patch_file: "patches/2.7/2.7.18-0003-msvc-fix-static.patch"
+    - patch_file: "patches/2.7/2.7.18-0004-disable-macos-tcltk.patch"