Skip to content

Commit

Permalink
Point version release, mainly this locks down some dependency version…
Browse files Browse the repository at this point in the history
…s and fixes up some related quirks.
  • Loading branch information
adam-iris committed Feb 21, 2019
1 parent 6e20e0c commit 951ff58
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
11 changes: 6 additions & 5 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
name: pyweed
channels:
- defaults
- conda-forge
- defaults
dependencies:
- python=3.5*
- python=3.6
- basemap
- future
- matplotlib
- matplotlib=2
- numpy
- obspy=1.0.3
- obspy=1.1
- pandas
- pillow
- pyqt=4.11.4
- pyqt=4.11
- qtconsole
- pyzmq
- pyproj
- proj4
2 changes: 1 addition & 1 deletion pyweed/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
__pkg_path___ = os.path.dirname(os.path.abspath(__file__))
# Use Python semantic versioning
# https://packaging.python.org/tutorials/distributing-packages/#semantic-versioning-preferred
__version__ = '1.0.0'
__version__ = '1.0.1'
__app_name__ = "PyWEED"
17 changes: 17 additions & 0 deletions pyweed/pyweed_launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
sys.stderr = nul
sys.stdout = nul

# Set up the PROJ_LIB environment variable needed by matplotlib
# See https://github.com/conda-forge/basemap-feedstock/issues/30
if not os.environ.get('PROJ_LIB') and os.environ.get('CONDA_PREFIX'):
os.environ['PROJ_LIB'] = os.path.join(os.environ['CONDA_PREFIX'], 'share', 'proj')

# Configure matplotlib backend
matplotlib.use('AGG')

Expand All @@ -45,6 +50,18 @@
sip.setapi("QVariant", 2)


def init_strptime():
""" Workaround for https://github.com/obspy/obspy/issues/2147 """
try:
import locale
# locale.setlocale(locale.LC_TIME, ('en_US', 'UTF-8'))
from obspy.clients.fdsn.routing.routing_client import RoutingClient # NOQA
locale.setlocale(locale.LC_TIME, '')
except Exception:
pass
init_strptime()


def get_pyweed():
"""
Load the PyWEED GUI code, this is where most of the expensive stuff happens
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ class CustomInstallCommand(install):
# your project is installed. For an analysis of "install_requires" vs pip's
# requirements files see:
# https://packaging.python.org/en/latest/requirements.html
# NOTE: pip can't be used reliably for dependencies, so this is incomplete
install_requires=['obspy'],

# If there are data files included in your packages that need to be
Expand Down

0 comments on commit 951ff58

Please sign in to comment.