diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3d609cdb4..9a6cb9b7d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.10'] + python-version: ['3.10', '3.13'] steps: @@ -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 diff --git a/miasm/jitter/jitcore_cc_base.py b/miasm/jitter/jitcore_cc_base.py index a6c7607af..c5819d1f5 100644 --- a/miasm/jitter/jitcore_cc_base.py +++ b/miasm/jitter/jitcore_cc_base.py @@ -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 @@ -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 diff --git a/miasm/jitter/jitcore_gcc.py b/miasm/jitter/jitcore_gcc.py index 365e00f7b..958c9d13f 100644 --- a/miasm/jitter/jitcore_gcc.py +++ b/miasm/jitter/jitcore_gcc.py @@ -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 @@ -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) diff --git a/optional_requirements.txt b/optional_requirements.txt index 950818553..35cdab386 100644 --- a/optional_requirements.txt +++ b/optional_requirements.txt @@ -1,4 +1,4 @@ pycparser z3-solver==4.8.7.0 -llvmlite==0.38.0 +llvmlite==0.44.0 parameterized~=0.8.1 diff --git a/requirements.txt b/requirements.txt index b518400d0..028b73e48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ +setuptools pyparsing>=2.4.1 future diff --git a/setup.py b/setup.py index abecb1a13..01910e8fe 100644 --- a/setup.py +++ b/setup.py @@ -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 = {