Merge pull request #43 from Loop3D/conda_build

Conda build

Author: lachlangrose

LoopStructural/visualisation/model_visualisation.py

@@ -13,7 +13,7 @@
     logger.error("Please install lavavu: pip install lavavu")
 import numpy as np
 from skimage.measure import marching_cubes_lewiner as marching_cubes
-
+from LoopStructural.modelling.features import GeologicalFeature
 from LoopStructural.utils.helper import create_surface, get_vectors, create_box
 
 # adapted/copied from pyvista for sphinx scraper
@@ -146,7 +146,7 @@ def add_section(self, geological_feature=None, axis='x', value=None, **kwargs):
         -------
 
         """
-
+        print('aa')
         if axis == 'x':
             tri, yy, zz = create_surface(self.bounding_box[:, [1, 2]], self.nsteps[[1, 2]])
             xx = np.zeros(zz.shape)
@@ -199,9 +199,9 @@ def add_section(self, geological_feature=None, axis='x', value=None, **kwargs):
             logger.info("Colouring section with %s min: %f, max: %f" % (
                 geological_feature.name, geological_feature.min(), geological_feature.max()))
             surf.colourmap(cmap, range=[geological_feature.min(), geological_feature.max()])
-        if geological_feature == 'model':
+        if geological_feature == 'model' and self.model is not None:
             name = kwargs.get('name','model_section')
-            surf.values(model.evaluate_model(points),
+            surf.values(self.model.evaluate_model(points,scale=True),
                             name)
             surf["colourby"] = name
             cmap = lavavu.cubehelix(100)

conda/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "loopstructural" %}
-{% set version = "1.0.4" %}
+{% set version = "1.0.5" %}
 
 package:
   name: "{{ name|lower }}"
@@ -14,20 +14,22 @@ build:
   script: "{{ PYTHON }} -m pip install ."
 
 requirements:
+  build:
+    - cython
   host:
     - pip
     - python
     - cython
     - setuptools
     - numpy
-  run:
-    - Cython
-    - numpy
-    - pandas
-    - scipy
-    - matplotlib
-    - scikit-image
-#     - scikit-learn
+  # run:
+  #   - Cython
+  #   - numpy
+  #   - pandas
+  #   - scipy
+  #   - matplotlib
+  #   - scikit-image
+  #   - scikit-learn
 # test:
 #   imports:
 #     - LoopStructural

setup.py

@@ -20,14 +20,14 @@ def get_version(rel_path):
 setup(
 	name="LoopStructural",
 	install_requires=[
-	'Cython',
-	'numpy',
-	'pandas',
-	'scipy',
-	'matplotlib',
-	# 'lavavu',
-	'scikit-image',
-	'scikit-learn'
+	# 'Cython',
+	# 'numpy',
+	# 'pandas',
+	# 'scipy',
+	# 'matplotlib',
+	# # 'lavavu',
+	# 'scikit-image',
+	# 'scikit-learn'
 	],
 	version=get_version("LoopStructural/__init__.py"),
     packages=find_packages(),