Skip to content

Commit

Permalink
Updated conda recipe and setup.py to handle dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg Blumberg committed Jan 12, 2019
1 parent 0e39105 commit 8a2f4ce
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 2 additions & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ requirements:
- python >=3.4
- numpy=$NUMPY_VERSION
- pyside
- requests
- python-dateutil

test:
imports:
Expand Down
11 changes: 9 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,15 @@
"databases/shapefiles/*", "../rc/*"],}
include_package_data = True

#install_requires = ['pyside>=1.2.1', 'numpy>=1.10.1']
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.*")

entry_pts = {"console_scripts": ['sharppy = runsharp.full_gui:main'] }
# Create some directory variables to shorten the lines.
HOME_PATH = os.path.join(os.path.expanduser("~"), ".sharppy")
Expand Down

0 comments on commit 8a2f4ce

Please sign in to comment.