diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 1b537b0..8e741c2 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -86,7 +86,7 @@ jobs: source venv/bin/activate # use version of ifcopenshell with desired schema parsing # TODO: revert to pyPI when schema parsing is published in the future - wget -O /tmp/ifcopenshell_python.zip "https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.8.1-088bc20-linux64.zip" + wget -O /tmp/ifcopenshell_python.zip "https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.8.1-0267e2b-linux64.zip" mkdir -p venv/lib/python3.11/site-packages unzip -d venv/lib/python3.11/site-packages /tmp/ifcopenshell_python.zip diff --git a/backend/Makefile b/backend/Makefile index e3f5ae1..be79920 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -13,7 +13,7 @@ install: venv . $(VIRTUAL_ENV)/bin/activate && \ pip install --upgrade pip && \ pip install -r requirements.txt && \ - wget -O /tmp/ifcopenshell_python.zip "https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.8.1-088bc20-linux64.zip" && \ + wget -O /tmp/ifcopenshell_python.zip "https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.8.1-0267e2b-linux64.zip" && \ mkdir -p $(VIRTUAL_ENV)/lib/python3.11/site-packages && \ unzip -f -d $(VIRTUAL_ENV)/lib/python3.11/site-packages /tmp/ifcopenshell_python.zip && \ rm /tmp/ifcopenshell_python.zip @@ -22,7 +22,7 @@ install-macos: venv . $(VIRTUAL_ENV)/bin/activate && \ pip install --upgrade pip && \ pip install -r requirements.txt && \ - wget -O /tmp/ifcopenshell_python.zip "https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.8.1-088bc20-macos64.zip" && \ + wget -O /tmp/ifcopenshell_python.zip "https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.8.1-0267e2b-macos64.zip" && \ mkdir -p $(VIRTUAL_ENV)/lib/python3.11/site-packages && \ unzip /tmp/ifcopenshell_python.zip -d .dev/venv/lib/python3.11/site-packages && \ rm /tmp/ifcopenshell_python.zip diff --git a/backend/apps/ifc_validation/tasks.py b/backend/apps/ifc_validation/tasks.py index b1140c4..a8e6162 100644 --- a/backend/apps/ifc_validation/tasks.py +++ b/backend/apps/ifc_validation/tasks.py @@ -230,8 +230,7 @@ def syntax_validation_subtask(self, prev_result, id, file_name, *args, **kwargs) request.save() # determine program/script to run - check_script = os.path.join(os.path.dirname(__file__), "checks", "step_file_parser", "main.py") - check_program = [sys.executable, check_script, '--json', file_path] + check_program = [sys.executable, "-m", "ifcopenshell.simple_spf", '--json', file_path] logger.debug(f'Command for {self.__qualname__}: {" ".join(check_program)}') # add task diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 2b9cc57..9ccfe92 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=cache,target=/root/.cache \ pip install --no-cache-dir -r /app/backend/requirements.txt && \ # use version of ifcopenshell with desired schema parsing # TODO: revert to pyPI when schema parsing is published in the future - wget -O /tmp/ifcopenshell_python.zip "https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.8.1-088bc20-linux64.zip" && \ + wget -O /tmp/ifcopenshell_python.zip "https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.8.1-0267e2b-linux64.zip" && \ mkdir -p /opt/venv/lib/python3.11/site-packages && \ unzip -d /opt/venv/lib/python3.11/site-packages /tmp/ifcopenshell_python.zip && \ # some cleanup