M-Labs
/
thermostat
9
0
Fork 4
Code Issues 8 Pull Requests 7 Releases Wiki Activity

WIP: Update python to 3.11 and use StrEnum #74

Draft
esavkin wants to merge 1 commits from esavkin/thermostat:71-update-nixos22_11 into master
pull from: esavkin/thermostat:71-update-nixos22_11
merge into: M-Labs:master
Conversation 2 Commits 1 Files Changed 3
esavkin commented 2022-12-21 14:18:54 +08:00
Owner

Should wait until matplotlib package is fixed.
Closes #71

Should wait until matplotlib package is fixed. Closes #71
esavkin added 1 commit 2022-12-21 14:18:54 +08:00
9596320423 Update python to 3.11 and use StrEnum 
Signed-off-by: Egor Savkin <es@m-labs.hk>
esavkin requested review from sb10q 2022-12-23 16:19:27 +08:00
sb10q reviewed 2022-12-27 17:25:41 +08:00
flake.nix
@ -71,3 +71,3 @@
rustPlatform.rust.cargo
openocd dfu-util
] ++ (with python3Packages; [
] ++ (with python311Packages; [
sb10q commented 2022-12-27 17:25:41 +08:00
Owner

Did you test this?

Did you test this?
sb10q commented 2022-12-27 18:00:07 +08:00
Owner

Should wait until matplotlib package is fixed.

Just work around the problem so you can test, e.g.

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 66b315f14ab..8cb901b7b9c 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -31,7 +31,7 @@ if isPyPy then null else buildPythonPackage rec {
 
   # Lots of tests fail on aarch64-darwin due to "Cannot allocate write+execute memory":
   # * https://cffi.readthedocs.io/en/latest/using.html#callbacks
-  doCheck = !stdenv.hostPlatform.isMusl && !(stdenv.isDarwin && stdenv.isAarch64);
+  doCheck = false;
 
   checkInputs = [ pytestCheckHook ];
> Should wait until matplotlib package is fixed. Just work around the problem so you can test, e.g. ``` diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 66b315f14ab..8cb901b7b9c 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -31,7 +31,7 @@ if isPyPy then null else buildPythonPackage rec { # Lots of tests fail on aarch64-darwin due to "Cannot allocate write+execute memory": # * https://cffi.readthedocs.io/en/latest/using.html#callbacks - doCheck = !stdenv.hostPlatform.isMusl && !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = false; checkInputs = [ pytestCheckHook ]; ```
esavkin commented 2023-01-05 10:29:36 +08:00
Poster
Owner

Without matplotlib it works

Without matplotlib it works
This pull request has changes conflicting with the target branch.
  • flake.lock
  • flake.nix
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b esavkin-71-update-nixos22_11 master
git pull 71-update-nixos22_11

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff esavkin-71-update-nixos22_11
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
sb10q
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/thermostat#74
There is no content yet.
Delete Branch "esavkin/thermostat:71-update-nixos22_11"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?