Merge pull request #340 from Inkrementator/master

Make examples compile for newest python version
symmetryinvestments · Apr 22, 2024 · 1d7d198 · 1d7d198
2 parents e0d1359 + a3c3ee8
commit 1d7d198
Show file tree

Hide file tree

Showing 129 changed files with 1,690 additions and 268 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,8 @@ examples/simple/simple
 examples/simple/Simple.cs
 obj
 .ropeproject
-.direnv
+.direnv
+
+# Generated by `dub run pyd:setup`
+pyd_get_env_set_text.py
+pyd_set_env_vars.sh
diff --git a/dub.selections.json b/dub.selections.json
@@ -2,7 +2,7 @@
 	"fileVersion": 1,
 	"versions": {
 		"mirror": "0.3.2",
-		"monty": "0.0.4",
+		"monty": "0.0.12",
 		"unit-threaded": "2.0.3"
 	}
 }
diff --git a/examples/issues/dub.sdl b/examples/issues/dub.sdl
@@ -6,6 +6,27 @@ dflags "-allinst"
 dependency "vibe-d:redis" version="*"
 
 
+configuration "python311" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../"
+    subConfiguration "autowrap:pyd" "python311"
+}
+
+configuration "python310" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../"
+    subConfiguration "autowrap:pyd" "python310"
+}
+
+configuration "python39" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../"
+    subConfiguration "autowrap:pyd" "python39"
+}
+
 configuration "python38" {
     targetPath "lib/pyd"
     lflags "-L$PYTHON_LIB_DIR"

diff --git a/examples/issues/dub.selections.json b/examples/issues/dub.selections.json
@@ -2,22 +2,26 @@
 	"fileVersion": 1,
 	"versions": {
 		"autowrap": {"path":"../../"},
-		"botan": "1.12.18",
-		"botan-math": "1.0.3",
 		"diet-ng": "1.8.1",
-		"eventcore": "0.9.20",
+		"eventcore": "0.9.30",
 		"libasync": "0.8.6",
-		"memutils": "1.0.4",
+		"memutils": "1.0.10",
 		"mir-linux-kernel": "1.0.1",
-		"mirror": "0.3.2",
-		"monty": "0.0.1",
-		"openssl": "3.2.2",
-		"pyd": "0.14.3",
+		"mirror": "0.3.3",
+		"monty": "0.0.12",
+		"openssl": "3.3.3",
+		"openssl-static": "1.0.3+3.0.8",
+		"pyd": "0.14.4",
 		"scriptlike": "0.10.3",
 		"stdx-allocator": "2.77.5",
 		"taggedalgebraic": "0.11.22",
-		"unit-threaded": "2.1.2",
-		"vibe-core": "1.22.4",
-		"vibe-d": "0.9.5"
+		"unit-threaded": "2.1.9",
+		"vibe-container": "1.3.1",
+		"vibe-core": "2.8.4",
+		"vibe-d": "0.10.0",
+		"vibe-http": "1.0.0",
+		"vibe-inet": "1.0.0",
+		"vibe-serialization": "1.0.2",
+		"vibe-stream": "1.1.0"
 	}
 }
diff --git a/examples/numpy/dub.sdl b/examples/numpy/dub.sdl
@@ -2,6 +2,27 @@ name "numpy"
 targetType "dynamicLibrary"
 
 
+configuration "python311" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../"
+    subConfiguration "autowrap:pyd" "python311"
+}
+
+configuration "python310" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../"
+    subConfiguration "autowrap:pyd" "python310"
+}
+
+configuration "python39" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../"
+    subConfiguration "autowrap:pyd" "python39"
+}
+
 configuration "python38" {
     targetPath "lib/pyd"
     lflags "-L$PYTHON_LIB_DIR"

diff --git a/examples/numpy/dub.selections.json b/examples/numpy/dub.selections.json
@@ -2,8 +2,9 @@
 	"fileVersion": 1,
 	"versions": {
 		"autowrap": {"path":"../../"},
-		"mirror": "0.3.2",
-		"pyd": "0.14.3",
-		"unit-threaded": "1.0.4"
+		"mirror": "0.3.3",
+		"monty": "0.0.12",
+		"pyd": "0.14.4",
+		"unit-threaded": "2.1.9"
 	}
 }
diff --git a/examples/phobos/create.d b/examples/phobos/create.d
@@ -31,6 +31,27 @@ void run(string[] args) @safe {
             targetType "dynamicLibrary"
 
 
+            configuration "python311" {
+                targetPath "lib/pyd"
+                lflags "-L$PYTHON_LIB_DIR"
+                dependency "autowrap:python" path="../../.."
+                subConfiguration "autowrap:python" "python311"
+            }
+
+            configuration "python310" {
+                targetPath "lib/pyd"
+                lflags "-L$PYTHON_LIB_DIR"
+                dependency "autowrap:python" path="../../.."
+                subConfiguration "autowrap:python" "python310"
+            }
+
+            configuration "python39" {
+                targetPath "lib/pyd"
+                lflags "-L$PYTHON_LIB_DIR"
+                dependency "autowrap:python" path="../../.."
+                subConfiguration "autowrap:python" "python39"
+            }
+
             configuration "python38" {
                 targetPath "lib/pyd"
                 lflags "-L$PYTHON_LIB_DIR"

diff --git a/examples/phobos/dub.sdl b/examples/phobos/dub.sdl
@@ -2,6 +2,27 @@ name "phobos"
 targetType "dynamicLibrary"
 
 
+configuration "python311" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../"
+    subConfiguration "autowrap:pyd" "python311"
+}
+
+configuration "python310" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../"
+    subConfiguration "autowrap:pyd" "python310"
+}
+
+configuration "python39" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../"
+    subConfiguration "autowrap:pyd" "python39"
+}
+
 configuration "python38" {
     targetPath "lib/pyd"
     lflags "-L$PYTHON_LIB_DIR"

diff --git a/examples/phobos/dub.selections.json b/examples/phobos/dub.selections.json
@@ -3,7 +3,7 @@
 	"versions": {
 		"autowrap": {"path":"../../"},
 		"mirror": "0.3.2",
-		"pyd": "0.14.3",
+		"pyd": "0.14.4,
 		"unit-threaded": "1.0.4"
 	}
 }
diff --git a/examples/phobos/std_algorithm/dub.sdl b/examples/phobos/std_algorithm/dub.sdl
@@ -2,10 +2,31 @@ name "std_algorithm"
 targetType "dynamicLibrary"
 
 
+configuration "python311" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python311"
+}
+
+configuration "python310" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python310"
+}
+
+configuration "python39" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python39"
+}
+
 configuration "python38" {
     targetPath "lib/pyd"
     lflags "-L$PYTHON_LIB_DIR"
-    dependency "autowrap:pyd" path="../../"
+    dependency "autowrap:pyd" path="../../.."
     subConfiguration "autowrap:pyd" "python38"
 }
 

diff --git a/examples/phobos/std_algorithm/dub.selections.json b/examples/phobos/std_algorithm/dub.selections.json
@@ -2,8 +2,9 @@
 	"fileVersion": 1,
 	"versions": {
 		"autowrap": {"path":"../../.."},
-		"mirror": "0.3.2",
-		"pyd": "0.14.3",
-		"unit-threaded": "1.0.4"
+		"mirror": "0.3.3",
+		"monty": "0.0.12",
+		"pyd": "0.14.4",
+		"unit-threaded": "2.1.9"
 	}
 }
diff --git a/examples/phobos/std_array/dub.sdl b/examples/phobos/std_array/dub.sdl
@@ -2,10 +2,31 @@ name "std_array"
 targetType "dynamicLibrary"
 
 
+configuration "python311" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python311"
+}
+
+configuration "python310" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python310"
+}
+
+configuration "python39" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python39"
+}
+
 configuration "python38" {
     targetPath "lib/pyd"
     lflags "-L$PYTHON_LIB_DIR"
-    dependency "autowrap:pyd" path="../../"
+    dependency "autowrap:pyd" path="../../.."
     subConfiguration "autowrap:pyd" "python38"
 }
 

diff --git a/examples/phobos/std_array/dub.selections.json b/examples/phobos/std_array/dub.selections.json
@@ -2,8 +2,9 @@
 	"fileVersion": 1,
 	"versions": {
 		"autowrap": {"path":"../../.."},
-		"mirror": "0.3.2",
-		"pyd": "0.14.3",
-		"unit-threaded": "1.0.4"
+		"mirror": "0.3.3",
+		"monty": "0.0.12",
+		"pyd": "0.14.4",
+		"unit-threaded": "2.1.9"
 	}
 }
diff --git a/examples/phobos/std_ascii/dub.sdl b/examples/phobos/std_ascii/dub.sdl
@@ -2,10 +2,31 @@ name "std_ascii"
 targetType "dynamicLibrary"
 
 
+configuration "python311" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python311"
+}
+
+configuration "python310" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python310"
+}
+
+configuration "python39" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python39"
+}
+
 configuration "python38" {
     targetPath "lib/pyd"
     lflags "-L$PYTHON_LIB_DIR"
-    dependency "autowrap:pyd" path="../../"
+    dependency "autowrap:pyd" path="../../.."
     subConfiguration "autowrap:pyd" "python38"
 }
 

diff --git a/examples/phobos/std_ascii/dub.selections.json b/examples/phobos/std_ascii/dub.selections.json
@@ -2,8 +2,9 @@
 	"fileVersion": 1,
 	"versions": {
 		"autowrap": {"path":"../../.."},
-		"mirror": "0.3.2",
-		"pyd": "0.14.3",
-		"unit-threaded": "1.0.4"
+		"mirror": "0.3.3",
+		"monty": "0.0.12",
+		"pyd": "0.14.4",
+		"unit-threaded": "2.1.9"
 	}
 }
diff --git a/examples/phobos/std_base64/dub.sdl b/examples/phobos/std_base64/dub.sdl
@@ -2,10 +2,31 @@ name "std_base64"
 targetType "dynamicLibrary"
 
 
+configuration "python311" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python311"
+}
+
+configuration "python310" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python310"
+}
+
+configuration "python39" {
+    targetPath "lib/pyd"
+    lflags "-L$PYTHON_LIB_DIR"
+    dependency "autowrap:pyd" path="../../.."
+    subConfiguration "autowrap:pyd" "python39"
+}
+
 configuration "python38" {
     targetPath "lib/pyd"
     lflags "-L$PYTHON_LIB_DIR"
-    dependency "autowrap:pyd" path="../../"
+    dependency "autowrap:pyd" path="../../.."
     subConfiguration "autowrap:pyd" "python38"
 }
 

diff --git a/examples/phobos/std_base64/dub.selections.json b/examples/phobos/std_base64/dub.selections.json
@@ -2,8 +2,9 @@
 	"fileVersion": 1,
 	"versions": {
 		"autowrap": {"path":"../../.."},
-		"mirror": "0.3.2",
-		"pyd": "0.14.3",
-		"unit-threaded": "1.0.4"
+		"mirror": "0.3.3",
+		"monty": "0.0.12",
+		"pyd": "0.14.4",
+		"unit-threaded": "2.1.9"
 	}
 }