Skip to content

Commit cef7105

Browse files
authored
Merge pull request #281 from kafitzgerald/rm_pkg_resources
2 parents c69331b + 4c2e356 commit cef7105

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

build_envs/environment.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ dependencies:
1111
- matplotlib
1212
- netcdf4
1313
- numpy
14-
- packaging
1514
- pycodestyle
16-
- setuptools
1715
- sphinx
1816
- sphinx_rtd_theme
1917
- sphinxcontrib-googleanalytics

src/wrf/__init__.py

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,8 @@
11
from __future__ import (absolute_import, division, print_function)
22
import os
3-
import pkg_resources
4-
5-
try:
6-
from . import api
7-
from .api import *
8-
except ImportError:
9-
# For gfortran+msvc combination, extra shared libraries may exist
10-
# (stored by numpy.distutils)
11-
if os.name == "nt":
12-
req = pkg_resources.Requirement.parse("wrf-python")
13-
extra_dll_dir = pkg_resources.resource_filename(req,
14-
"wrf-python/.libs")
15-
if os.path.isdir(extra_dll_dir):
16-
os.environ["PATH"] += os.pathsep + extra_dll_dir
17-
18-
from . import api
19-
from .api import *
20-
else:
21-
raise
223

4+
from . import api
5+
from .api import *
236

247
__all__ = []
258
__all__.extend(api.__all__)

0 commit comments

Comments
 (0)