From d2057c001583b0dac6570ddec5e7739397198d13 Mon Sep 17 00:00:00 2001 From: Alessandro Muntoni Date: Tue, 12 Dec 2023 11:10:34 +0100 Subject: [PATCH] add python 3.12 --- .github/workflows/BuildAndTest.yml | 8 ++++---- .github/workflows/BuildDocumentation.yml | 2 +- .github/workflows/CreateAndTestRelease.yml | 8 ++++---- setup.py | 5 ++++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index 998aa14..c0e1e3d 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - pyversion: ['3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11', '3.12'] os: ['ubuntu-20.04', 'macos-latest', 'windows-latest'] steps: - uses: actions/checkout@v3 @@ -67,7 +67,7 @@ jobs: strategy: fail-fast: false matrix: - pyversion: ['3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11', '3.12'] os: ['ubuntu-20.04', 'macos-latest', 'windows-latest'] steps: - uses: actions/checkout@v3 @@ -100,7 +100,7 @@ jobs: strategy: fail-fast: false matrix: - pyversion: ['3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11', '3.12'] os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] steps: - name: Download PyMeshLab_${{ runner.os }}_python${{ matrix.pyversion }} @@ -135,7 +135,7 @@ jobs: strategy: fail-fast: false matrix: - pyversion: ['3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11', '3.12'] os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] steps: - name: Download pymeshlab_whl_${{ runner.os }}_python${{ matrix.pyversion }} diff --git a/.github/workflows/BuildDocumentation.yml b/.github/workflows/BuildDocumentation.yml index c300321..7348d3a 100644 --- a/.github/workflows/BuildDocumentation.yml +++ b/.github/workflows/BuildDocumentation.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - pyversion: [3.9] + pyversion: [3.11] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/CreateAndTestRelease.yml b/.github/workflows/CreateAndTestRelease.yml index 78bfd38..923fb49 100644 --- a/.github/workflows/CreateAndTestRelease.yml +++ b/.github/workflows/CreateAndTestRelease.yml @@ -32,7 +32,7 @@ jobs: needs: update_version strategy: matrix: - pyversion: ['3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11', '3.12'] os: ['ubuntu-20.04', 'macos-latest', 'windows-latest'] steps: - uses: actions/checkout@v3 @@ -86,7 +86,7 @@ jobs: needs: build_pymeshlab strategy: matrix: - pyversion: ['3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11', '3.12'] os: ['ubuntu-20.04', 'macos-latest', 'windows-latest'] steps: - uses: actions/checkout@v3 @@ -118,7 +118,7 @@ jobs: needs: build_pymeshlab strategy: matrix: - pyversion: ['3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11', '3.12'] os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] steps: - name: Download PyMeshLab_${{ runner.os }}_python${{ matrix.pyversion }} @@ -152,7 +152,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - pyversion: ['3.8', '3.9', '3.10', '3.11'] + pyversion: ['3.8', '3.9', '3.10', '3.11', '3.12'] os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] steps: - name: Download pymeshlab_whl_${{ runner.os }}_python${{ matrix.pyversion }} diff --git a/setup.py b/setup.py index d4409b9..1874c95 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,7 @@ # read the contents of README file from os import path +import sys this_directory = path.abspath(path.dirname(__file__)) with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f: long_description = f.read() @@ -21,7 +22,9 @@ # if on windows, add msvc-runtime as dependency osused = platform.system() if osused == 'Windows': - install_requires.append('msvc-runtime') + # msvc-runtime is still missing for python 3.12 + if sys.version_info[1] < 12: + install_requires.append('msvc-runtime') try: from wheel.bdist_wheel import bdist_wheel as _bdist_wheel