Skip to content

Commit

Permalink
Merge pull request #14 from kthyng/main
Browse files Browse the repository at this point in the history
update init and setup
  • Loading branch information
kthyng authored Jun 3, 2021
2 parents e983eae + 93336e5 commit c151dce
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 1 addition & 3 deletions environment-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,4 @@ dependencies:
- cmocean
- esmf=8.1.1=mpi_openmpi_h852a670_0
- esmpy=8.1.1=mpi_openmpi_py38h9ab444c_0
- pip:
- git+https://github.com/pangeo-data/xESMF.git#egg=xESMF
- xcmocean
- xesmf
4 changes: 1 addition & 3 deletions environment-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,4 @@ dependencies:
- cmocean
- esmf=8.1.1=mpi_openmpi_h047fafc_0
- esmpy=8.1.1=mpi_openmpi_py38hf504846_0
- pip:
- git+https://github.com/pangeo-data/xESMF.git#egg=xESMF
- xcmocean
- xesmf
7 changes: 7 additions & 0 deletions extract_model/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,11 @@
Select model output using xarray and `isel` or interpolation through xarray or xesmf.
"""

from pkg_resources import DistributionNotFound, get_distribution
try:
__version__ = get_distribution("cf_xarray").version
except DistributionNotFound:
# package is not installed
__version__ = "unknown"

from .extract_model import get_var_cf, select
7 changes: 2 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@


setup(
use_scm_version={
"write_to": "extract_model/_version.py",
"write_to_template": '__version__ = "{version}"',
"tag_regex": r"^(?P<prefix>v)?(?P<version>[^\+]+)(?P<suffix>.*)?$",
}
use_scm_version=True,
setup_requires=["setuptools_scm"]
)

0 comments on commit c151dce

Please sign in to comment.