Skip to content

Commit

Permalink
Fix distutils
Browse files Browse the repository at this point in the history
  • Loading branch information
serpilliere committed Jan 25, 2025
1 parent 0164999 commit a1da989
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.8', '3.10']
python-version: ['3.10', '3.13']

steps:

Expand All @@ -25,8 +25,8 @@ jobs:
- name: Install requirements
run: pip install -r requirements.txt

- name: Install llvm 11 (llvmlite compatible)
run: sudo apt-get install llvm-11
- name: Install llvm 15 (llvmlite compatible)
run: sudo apt-get install llvm-15

- name: Install optional requirements
run: pip install -r optional_requirements.txt
Expand Down
3 changes: 1 addition & 2 deletions miasm/jitter/jitcore_cc_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import tempfile
import platform
import sysconfig
from distutils.sysconfig import get_python_inc

from miasm.jitter.jitcore import JitCore
from miasm.core.utils import keydefaultdict
Expand Down Expand Up @@ -95,7 +94,7 @@ def load(self):

include_files = [
os.path.dirname(__file__),
get_python_inc()
sysconfig.get_paths()['include'],
]
self.include_files = include_files
self.libs = libs
Expand Down
3 changes: 1 addition & 2 deletions miasm/jitter/jitcore_gcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import platform
import sysconfig
from subprocess import check_call
from distutils.sysconfig import get_python_inc
from miasm.jitter import Jitgcc
from miasm.jitter.jitcore_cc_base import JitCore_Cc_Base, gen_core

Expand Down Expand Up @@ -68,7 +67,7 @@ def add_block(self, block):
if is_win:
libs.append(
os.path.join(
get_python_inc(),
sysconfig.get_paths()['include'],
"..",
"libs",
"python%d%d.lib" % (sys.version_info.major, sys.version_info.minor)
Expand Down
2 changes: 1 addition & 1 deletion optional_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pycparser
z3-solver==4.8.7.0
llvmlite==0.38.0
llvmlite==0.44.0
parameterized~=0.8.1
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
setuptools
pyparsing>=2.4.1
future
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def build_all():
try:
s = setup(
name = "miasm",
version = __import__("miasm").VERSION,
version = "0.1.5",
packages = packages,
data_files=[("", ["README.md"])],
package_data = {
Expand Down

0 comments on commit a1da989

Please sign in to comment.