From f2aff8abadab6a6ad701eeb35d54dfc7132c2ce5 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 26 Jan 2018 17:56:27 +0000
Subject: [PATCH] trimesh should now work without lxml
---
.conda/meta.yaml | 2 +-
requirements-extra.txt | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
index 560dc4f70..926a55de9 100644
--- a/.conda/meta.yaml
+++ b/.conda/meta.yaml
@@ -39,5 +39,5 @@ requirements:
run_constrained:
- indexed_gzip >=0.6.1,<1
- wxpython >=3.0.2.0,<4.1
- - trimesh 2.*
+ - trimesh >=2.22.28,<3
- rtree 0.8
diff --git a/requirements-extra.txt b/requirements-extra.txt
index 9b2d159bd..1c857ed16 100644
--- a/requirements-extra.txt
+++ b/requirements-extra.txt
@@ -1,5 +1,4 @@
indexed_gzip>=0.7.0,<1
wxpython>=3.0.2.0,<4.1
-trimesh==2.*
+trimesh>=2.22.28,<3
rtree==0.8
-lxml==4.*
--
GitLab