From dd0d6f3c07c5a3d2c0f8ef660f25f0d9dcb6f215 Mon Sep 17 00:00:00 2001 From: "Carpus, David" Date: Sat, 30 Apr 2022 15:26:38 -0400 Subject: [PATCH 1/2] Fix for docker and config --- .gitignore | 1 + docker/Dockerfile | 2 +- src/model_builder.py | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fa26cc4c4..c07779777 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ things/*.step things/*.stl *.3mf *.dxf +src/clusters diff --git a/docker/Dockerfile b/docker/Dockerfile index ab7d85bba..34c6201d9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM continuumio/miniconda3 RUN apt-get update && \ - apt-get install -y libgl1-mesa-glx gcc bash && \ + apt-get install -y python3-vtk7 libgl1-mesa-glx gcc bash && \ rm -rf /var/lib/apt/lists/* diff --git a/src/model_builder.py b/src/model_builder.py index 7cca38790..c18d017de 100644 --- a/src/model_builder.py +++ b/src/model_builder.py @@ -24,7 +24,7 @@ }, { 'name': '{}TMB', 'vars': ['thumb_style'], - 'vals': ['DEFAULT', 'MINIDOX', 'TRACKBALL_ORBISSYL'], + 'vals': ['DEFAULT', 'MINIDOX', 'TRACKBALL_ORBYL'], 'val_names': ['DEF', 'MDOX', 'ORBY'] # 'vals': ['DEFAULT', 'MINI', 'CARBONFET', 'MINIDOX'], # 'val_names': ['DEF', 'MINI', 'CF', 'MDOX'] @@ -102,7 +102,7 @@ def build_release(base, configurations, engines=('solid', 'cadquery')): if __name__ == '__main__': configurations = create_config(config_options) - ENGINES = ['solid', 'cadquery'] - # ENGINES = ['solid'] + # ENGINES = ['solid', 'cadquery'] + ENGINES = ['solid'] build_release(base, configurations, ENGINES) From 02cae91308b41c842036139964c08580b715355e Mon Sep 17 00:00:00 2001 From: "Carpus, David" Date: Sat, 30 Apr 2022 15:32:14 -0400 Subject: [PATCH 2/2] Remove changes for upstream PR --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index c07779777..fa26cc4c4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,3 @@ things/*.step things/*.stl *.3mf *.dxf -src/clusters