spec file ignores __pycache__ and install python.app on Azure OS X

sharppy · Jan 22, 2019 · 1563b55 · 1563b55
1 parent 77a8aed
commit 1563b55
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -63,6 +63,7 @@ steps:
 # Must use sudo for python-dependent stuff because conda permissions have
 # stupid bug under macOS.
 - script: |
+    conda install -y -c conda-forge python.app 
     system_profiler SPDisplaysDataType | grep Resolution # Check display dimensions using OS tools
     sudo python ci/screen.py # Check display dimensions as seen by PySide
     sudo python setup.py -q install

diff --git a/runsharp/SHARPpy-osx.spec b/runsharp/SHARPpy-osx.spec
@@ -44,6 +44,8 @@ for sf in shapefiles:
     a.datas += [("sharppy/databases/shapefiles/" + sf.split("/")[-1], sf, "DATA")]
 
 for ds in datasources:
+    if "__pycache__" in ds:
+        continue
     a.datas += [("sharppy/datasources/" + ds.split("/")[-1], ds, "DATA")]
 
 pyz = PYZ(a.pure)

diff --git a/runsharp/SHARPpy-win7-64.spec b/runsharp/SHARPpy-win7-64.spec
@@ -45,6 +45,8 @@ for sf in shapefiles:
     a.datas += [("sharppy\\databases\\shapefiles\\" + sf.split("\\")[-1], sf, "DATA")]
 
 for ds in datasources:
+    if "__pycache__" in ds:
+        continue
     a.datas += [("sharppy\\datasources\\" + ds.split("\\")[-1], ds, "DATA")]
 
 for d in a.datas: