Uploading Mac OS X wheel to repository.

rserrano · Apr 1, 2017 · eef61fa · eef61fa
1 parent 366bacd
commit eef61fa
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,7 @@ __pycache__/
 env/
 build/
 develop-eggs/
-dist/
+# dist/
 downloads/
 eggs/
 lib/

diff --git a/BUILD b/BUILD
diff --git a/DIST_STEPS b/DIST_STEPS
@@ -0,0 +1,12 @@
+BUILD GEOMODELR TO DISTRIBUTE
+
+LINUX:
+    python setup.py sdist
+    twine upload -u username -p password dist/geomodelr-x.y.z.tar.gz
+MAC OS X:
+- Install ports
+- Install boost ports. Make sure to activate python.
+    sudo ports install boost
+- Install pip. Make sure to activate python.
+    sudo ports install pip
+- 
diff --git a/dist/geomodelr-0.1.2-cp27-cp27m-macosx_10_11_x86_64.whl b/dist/geomodelr-0.1.2-cp27-cp27m-macosx_10_11_x86_64.whl
diff --git a/dist/geomodelr-0.1.2.tar.gz b/dist/geomodelr-0.1.2.tar.gz
diff --git a/geomodelr/cpp/model.cpp b/geomodelr/cpp/model.cpp
@@ -609,8 +609,8 @@ double Topography::height(const point2& pt) const {
 	point2 pos(gx(pt), gy(pt));
 	geometry::subtract_point(pos, this->point);
 	geometry::divide_point(pos, this->sample);
-	size_t x = int(gx(pos));
-	size_t y = int(gy(pos));
+	int x = int(gx(pos));
+	int y = int(gy(pos));
 
         if ( x < 0 )
             x = 0;

diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@ def if_env(**kwargs):
     varname, default = kwargs.popitem()
     try:
         values = os.environ[varname].split(os.pathsep)
-        if len(value) < 1:
+        if len(values) < 1:
            return  default
         return values
     except KeyError: