Skip to content

Commit

Permalink
Got conda-build working again
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg Blumberg committed Jan 18, 2019
1 parent 34a7730 commit d142a7e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
5 changes: 4 additions & 1 deletion conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% set data = load_setup_py_data() %}

package:
name: sharppy
version: {{ data['version'] }}
Expand All @@ -14,6 +15,7 @@ extra:
build:
script_env:
- CONDA_BLD_PATH
script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv"
osx_is_app: True
entry_points:
- sharppy = runsharp.full_gui:main
Expand All @@ -23,9 +25,10 @@ requirements:
- setuptools
- python >=3.4
- pyside
- pip
run:
- python >=3.4
- numpy=$NUMPY_VERSION
- numpy={{ os.environ.get('NUMPY_VERSION', '1.15') }}
- pyside
- requests
- python-dateutil
Expand Down
15 changes: 8 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@
"databases/shapefiles/*", "../rc/*"],}
include_package_data = True

install_requires = []
#install_requires = ['python-dateutil', 'requests', 'numpy==1.15.*']
#install_requires = []
install_requires = ['python-dateutil', 'requests', 'numpy==1.15.*']
# Because pip doesn't recognize it when PySide is installed by conda from conda-forge
# Try to import PySide. If it fails, add the PySide to the install_requires
#try:
# import PySide
# print("Success importing PySide")
#except:
# install_requires.append("PySide==1.2.*")
# Because of this, the conda meta.yaml will require PySide to build SHARPpy
try:
import PySide
print("Success importing PySide")
except:
install_requires.append("PySide==1.2.*")

entry_pts = {"console_scripts": ['sharppy = runsharp.full_gui:main'] }
# Create some directory variables to shorten the lines.
Expand Down

0 comments on commit d142a7e

Please sign in to comment.