From 894d109bbd896118fc26a8fa99b5d1d22d3d27da Mon Sep 17 00:00:00 2001 From: AU Date: Sat, 14 Jan 2023 13:43:04 +0100 Subject: [PATCH 1/3] Do not install cq via pip --- environment.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/environment.yml b/environment.yml index 8cf10c56b..0cc957f6b 100644 --- a/environment.yml +++ b/environment.yml @@ -2,7 +2,6 @@ name: cadquery channels: - cadquery - conda-forge - - defaults dependencies: - python>=3.8 - ipython @@ -23,9 +22,7 @@ dependencies: - nlopt - path - casadi + - multimethod >=1.7,<2.0 - pip - pip: - - "--install-option=\"--no-deps\"" - - "--editable=." - - sphinxcadquery - - multimethod>=1.7,<2.0 + - git+https://github.com/CadQuery/OCP-stubs.git From e0e18bbc76fa1d1f42ecfdb0f5c2024950798ded Mon Sep 17 00:00:00 2001 From: AU Date: Sat, 14 Jan 2023 14:24:01 +0100 Subject: [PATCH 2/3] Do not install reqs when running inside conda --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 4abadc2cd..24aad036d 100644 --- a/setup.py +++ b/setup.py @@ -21,9 +21,10 @@ is_rtd = "READTHEDOCS" in os.environ is_appveyor = "APPVEYOR" in os.environ is_azure = "CONDA_PY" in os.environ +is_conda = "CONDA_PREFIX_1" in os.environ -# Only include the installation dependencies if we are not running on RTD or AppVeyor -if not is_rtd and not is_appveyor and not is_azure: +# Only include the installation dependencies if we are not running on RTD or AppVeyor or in a conda env +if not is_rtd and not is_appveyor and not is_azure and not is_conda: reqs = [ "cadquery-ocp>=7.6,<7.7", "ezdxf", From 0b19ed89340f15fe14635465e41e37e142316aaa Mon Sep 17 00:00:00 2001 From: AU Date: Sat, 14 Jan 2023 14:25:30 +0100 Subject: [PATCH 3/3] Install cq again --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index 0cc957f6b..86ff4005d 100644 --- a/environment.yml +++ b/environment.yml @@ -25,4 +25,5 @@ dependencies: - multimethod >=1.7,<2.0 - pip - pip: + - --editable=. - git+https://github.com/CadQuery/OCP-stubs.git