Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add z3 fix by removing the requirement for python3-distutils. #25890

Merged
merged 1 commit into from
May 22, 2024

Conversation

arbipher
Copy link
Collaborator

The PR is for #25807.
Let me see whether CI is happy about this.

@arbipher
Copy link
Collaborator Author

I checked the CI and archlinux installs on Python 3.12 and it's satisfied. The current Debian or Ubuntu or others all runs from 3.9 to 3.11 according to conf-python-3.9.0.0.

p.s. I am also working on porting building ocaml-z3 from the python script to CMake. however, it may takes a few days and may be unstable in the beginning. The change for this PR is very small.

@Kakadu
Copy link
Contributor

Kakadu commented May 21, 2024

This changes look like they are not related to the topic of the PR. I actually expected something more straightforward, for example

--- a/packages/z3/z3.4.13.0/opam
+++ b/packages/z3/z3.4.13.0/opam
@@ -6,7 +6,7 @@ bug-reports: "https://github.com/Z3prover/z3/issues"
license: "MIT"
dev-repo: "git+https://github.com/Z3prover/z3.git"
depexts: [
-  ["python3-distutils"] {os-family = "debian"}
+  ["python3-distutils"] {os-family = "debian" & !(os-distribution="ubuntu" & os-version>="24.04")}
]
patches: [
"libatomic.patch"

@arbipher
Copy link
Collaborator Author

The change on github is not showing my change comparing to the previous version of z3.4.13.0.

I just delete the requirement for python3-distutils.

Common subdirectories: packages/z3/z3.4.13.0-1/files and packages/z3/z3.4.13.0/files
diff '--color=auto' packages/z3/z3.4.13.0-1/opam packages/z3/z3.4.13.0/opam
7a8,10
> depexts: [
>   ["python3-distutils"] {os-family = "debian"}
> ]

I also asked on Z3Prover/z3#7228 because the file path z3/src/api/python/setup.py (where distutils appears) is for Python API. It should be harmless to delete it for us.

@mseri
Copy link
Member

mseri commented May 22, 2024

Looks all right, thanks and sorry for the delay

@mseri mseri merged commit 63ddf78 into ocaml:master May 22, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants