Remove PYTHONOPTIMIZE=2 to make CFFI work (#121)

FeodorFitsner · web-flow · commit 8cb71ce5fe20 · 2024-12-02T13:49:02.000-08:00
* Remove PYTHONOPTIMIZE=2 to make CFFI work

* Version bump to 0.8.3

* Trying to fix Test on Linux ARM64

* Fix auto-restart

* sudo sed

* Run all tests
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -180,7 +180,8 @@ for:
 
     install:
       # Flutter SDK
-      - sudo apt update --allow-releaseinfo-change
+      - sudo sed -i "/#\$nrconf{restart} = 'i';/s/.*/\$nrconf{restart} = 'a';/" /etc/needrestart/needrestart.conf
+      - sudo apt update -y --allow-releaseinfo-change
       - sudo apt install -y clang ninja-build xvfb libgtk-3-dev gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav
       - git clone https://github.com/flutter/flutter.git -b stable "$HOME/flutter"
       - export PATH="$PATH:$HOME/flutter/bin"
@@ -235,7 +236,7 @@ for:
             dart pub publish --force
             cd $APPVEYOR_BUILD_FOLDER
 
-            sleep 300
+            sleep 600
 
             cd src/serious_python_android
             dart pub publish --force
@@ -253,7 +254,7 @@ for:
             dart pub publish --force
             cd $APPVEYOR_BUILD_FOLDER
 
-            sleep 300
+            sleep 600
 
             cd src/serious_python
             dart pub publish --force || exit 1
diff --git a/src/serious_python/CHANGELOG.md b/src/serious_python/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.3
+
+* Remove `PYTHONOPTIMIZE=2` to make CFFI work.
+
 ## 0.8.2
 
 * Copy `.so` libraries from `{site-packages}/opt` to `jniLibs`.
diff --git a/src/serious_python/pubspec.yaml b/src/serious_python/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python
 description: A cross-platform plugin for adding embedded Python runtime to your Flutter apps.
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.2
+version: 0.8.3
 
 platforms:
   ios:
diff --git a/src/serious_python_android/CHANGELOG.md b/src/serious_python_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.3
+
+* Remove `PYTHONOPTIMIZE=2` to make CFFI work.
+
 ## 0.8.2
 
 * Copy `.so` libraries from `{site-packages}/opt` to `jniLibs`.
diff --git a/src/serious_python_android/android/build.gradle b/src/serious_python_android/android/build.gradle
@@ -1,5 +1,5 @@
 group 'com.flet.serious_python_android'
-version '0.8.2'
+version '0.8.3'
 
 def python_version = '3.12'
 
diff --git a/src/serious_python_android/lib/serious_python_android.dart b/src/serious_python_android/lib/serious_python_android.dart
@@ -70,7 +70,6 @@ class SeriousPythonAndroid extends SeriousPythonPlatform {
     }
 
     setenv("PYTHONINSPECT", "1");
-    setenv("PYTHONOPTIMIZE", "2");
     setenv("PYTHONDONTWRITEBYTECODE", "1");
     setenv("PYTHONNOUSERSITE", "1");
     setenv("PYTHONUNBUFFERED", "1");
diff --git a/src/serious_python_android/pubspec.yaml b/src/serious_python_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_android
 description: Android implementation of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.2
+version: 0.8.3
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
diff --git a/src/serious_python_darwin/CHANGELOG.md b/src/serious_python_darwin/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.3
+
+* Remove `PYTHONOPTIMIZE=2` to make CFFI work.
+
 ## 0.8.2
 
 * Copy `.so` libraries from `{site-packages}/opt` to `jniLibs`.
diff --git a/src/serious_python_darwin/darwin/Classes/SeriousPythonPlugin.swift b/src/serious_python_darwin/darwin/Classes/SeriousPythonPlugin.swift
@@ -54,7 +54,6 @@ public class SeriousPythonPlugin: NSObject, FlutterPlugin {
             ]
 
             setenv("PYTHONINSPECT", "1", 1)
-            setenv("PYTHONOPTIMIZE", "2", 1)
             setenv("PYTHONDONTWRITEBYTECODE", "1", 1)
             setenv("PYTHONNOUSERSITE", "1", 1)
             setenv("PYTHONUNBUFFERED", "1", 1)
diff --git a/src/serious_python_darwin/darwin/serious_python_darwin.podspec b/src/serious_python_darwin/darwin/serious_python_darwin.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'serious_python_darwin'
-  s.version          = '0.8.2'
+  s.version          = '0.8.3'
   s.summary          = 'A cross-platform plugin for adding embedded Python runtime to your Flutter apps.'
   s.description      = <<-DESC
   A cross-platform plugin for adding embedded Python runtime to your Flutter apps.
diff --git a/src/serious_python_darwin/pubspec.yaml b/src/serious_python_darwin/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_darwin
 description: iOS and macOS implementations of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.2
+version: 0.8.3
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
diff --git a/src/serious_python_linux/CHANGELOG.md b/src/serious_python_linux/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.3
+
+* Remove `PYTHONOPTIMIZE=2` to make CFFI work.
+
 ## 0.8.2
 
 * Copy `.so` libraries from `{site-packages}/opt` to `jniLibs`.
diff --git a/src/serious_python_linux/linux/serious_python_linux_plugin.cc b/src/serious_python_linux/linux/serious_python_linux_plugin.cc
@@ -109,7 +109,6 @@ static void serious_python_linux_plugin_handle_method_call(
 
     // environmentVariables
     g_setenv("PYTHONINSPECT", "1", TRUE);
-    g_setenv("PYTHONOPTIMIZE", "2", TRUE);
     g_setenv("PYTHONDONTWRITEBYTECODE", "1", TRUE);
     g_setenv("PYTHONNOUSERSITE", "1", TRUE);
     g_setenv("PYTHONUNBUFFERED", "1", TRUE);
diff --git a/src/serious_python_linux/pubspec.yaml b/src/serious_python_linux/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_linux
 description: Linux implementations of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.2
+version: 0.8.3
 
 environment:
   sdk: '>=3.1.3 <4.0.0'
diff --git a/src/serious_python_platform_interface/CHANGELOG.md b/src/serious_python_platform_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.3
+
+* Remove `PYTHONOPTIMIZE=2` to make CFFI work.
+
 ## 0.8.2
 
 * Copy `.so` libraries from `{site-packages}/opt` to `jniLibs`.
diff --git a/src/serious_python_platform_interface/pubspec.yaml b/src/serious_python_platform_interface/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_platform_interface
 description: A common platform interface for the serious_python plugin.
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.2
+version: 0.8.3
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
diff --git a/src/serious_python_windows/CHANGELOG.md b/src/serious_python_windows/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.3
+
+* Remove `PYTHONOPTIMIZE=2` to make CFFI work.
+
 ## 0.8.2
 
 * Copy `.so` libraries from `{site-packages}/opt` to `jniLibs`.
diff --git a/src/serious_python_windows/pubspec.yaml b/src/serious_python_windows/pubspec.yaml
@@ -2,7 +2,7 @@ name: serious_python_windows
 description: Windows implementations of the serious_python plugin
 homepage: https://flet.dev
 repository: https://github.com/flet-dev/serious-python
-version: 0.8.2
+version: 0.8.3
 
 environment:
   sdk: '>=3.1.3 <4.0.0'
diff --git a/src/serious_python_windows/windows/serious_python_windows_plugin.cpp b/src/serious_python_windows/windows/serious_python_windows_plugin.cpp
@@ -174,7 +174,6 @@ namespace serious_python_windows
 
       // set python-related env vars
       _putenv_s("PYTHONINSPECT", "1");
-      _putenv_s("PYTHONOPTIMIZE", "2");
       _putenv_s("PYTHONDONTWRITEBYTECODE", "1");
       _putenv_s("PYTHONNOUSERSITE", "1");
       _putenv_s("PYTHONUNBUFFERED", "1");

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ class SeriousPythonAndroid extends SeriousPythonPlatform {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`setenv("PYTHONINSPECT", "1");`
`73`		`- setenv("PYTHONOPTIMIZE", "2");`
`74`	`73`	`setenv("PYTHONDONTWRITEBYTECODE", "1");`
`75`	`74`	`setenv("PYTHONNOUSERSITE", "1");`
`76`	`75`	`setenv("PYTHONUNBUFFERED", "1");`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ public class SeriousPythonPlugin: NSObject, FlutterPlugin {`
`54`	`54`	`]`
`55`	`55`
`56`	`56`	`setenv("PYTHONINSPECT", "1", 1)`
`57`		`- setenv("PYTHONOPTIMIZE", "2", 1)`
`58`	`57`	`setenv("PYTHONDONTWRITEBYTECODE", "1", 1)`
`59`	`58`	`setenv("PYTHONNOUSERSITE", "1", 1)`
`60`	`59`	`setenv("PYTHONUNBUFFERED", "1", 1)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`Pod::Spec.new do \|s\|`
`6`	`6`	`s.name = 'serious_python_darwin'`
`7`		`- s.version = '0.8.2'`
	`7`	`+ s.version = '0.8.3'`
`8`	`8`	`s.summary = 'A cross-platform plugin for adding embedded Python runtime to your Flutter apps.'`
`9`	`9`	`s.description = <<-DESC`
`10`	`10`	`A cross-platform plugin for adding embedded Python runtime to your Flutter apps.`