Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-26 18:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Python 3.10 build from bbim builds

Browse Source 
Reverts 8514a42, removes python 3.10 from bbim builds as it's not suppored by Blender 4.2+ (https://github.com/gentoo/gentoo/pull/37671)
This commit is contained in:
Andrej730
2024-08-05 16:37:09 +05:00
parent 9f1d14e5a7
commit 3a147d7f62
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-blenderbim-daily.yml
+1 -1
View File
@@ -35,7 +35,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
pyver: [py310, py311, py312] pyver: [py311, py312]
config: config:
- { - {
name: "Windows Build", name: "Windows Build",
src/blenderbim/Makefile
-9
View File
@@ -49,11 +49,6 @@ LAST_COMMIT_HASH:=$(shell git rev-parse HEAD)
PYVERSION:=py310 PYVERSION:=py310
PYPI_IMP:=cp PYPI_IMP:=cp
ifeq ($(PYVERSION), py310)
PYLIBDIR:=python3.10
PYNUMBER:=310
PYPI_VERSION:=3.10
endif
ifeq ($(PYVERSION), py311) ifeq ($(PYVERSION), py311)
PYLIBDIR:=python3.11 PYLIBDIR:=python3.11
PYNUMBER:=311 PYNUMBER:=311
@@ -184,10 +179,6 @@ else ifeq ($(PLATFORM), macos)
else else
cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
endif endif
# tomllib replacement for < Python 3.11, used to parse blender_manifest
ifeq ($(PYVERSION), py310)
cd build && . env/$(VENV_ACTIVATE) && $(PIP) download tomli --dest=./wheels
endif
# Provides jsgantt-improved supports for web-based construction sequencing gantt charts # Provides jsgantt-improved supports for web-based construction sequencing gantt charts
cd build/blenderbim/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js cd build/blenderbim/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js
src/blenderbim/blenderbim/__init__.py
+2 -5
View File
@@ -68,14 +68,11 @@ def initialize_bbim_semver():
in `addon_utils.modules()->bl_info['version']`, in `addon_utils.modules()->bl_info['version']`,
therefore we just parse it from .toml. therefore we just parse it from .toml.
""" """
if sys.version_info >= (3, 11): import tomllib
import tomllib as toml
else:
import tomli as toml
toml_path = Path(__file__).parent / "blender_manifest.toml" toml_path = Path(__file__).parent / "blender_manifest.toml"
with open(toml_path, "rb") as f: with open(toml_path, "rb") as f:
manifest = toml.load(f) manifest = tomllib.load(f)
semver_pattern = r"^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$" semver_pattern = r"^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"
version_str = manifest["version"] version_str = manifest["version"]
re_version = re.match(semver_pattern, version_str) re_version = re.match(semver_pattern, version_str)