Browse Source

has_time_coord function should be for a single file only. Updated setup.py to reflect show production status. Set version to 1.0.0.

main
Bill Ladwig 8 years ago
parent
commit
b8b57e63bc
  1. 5
      setup.py
  2. 12
      src/wrf/util.py
  3. 2
      src/wrf/version.py

5
setup.py

@ -63,7 +63,7 @@ numpy.distutils.core.setup(
"numerical weather prediction", "diagnostic", "numerical weather prediction", "diagnostic",
"science", "numpy"], "science", "numpy"],
install_requires = requirements, install_requires = requirements,
classifiers = ["Development Status :: 4 - Beta", classifiers = ["Development Status :: 5 - Production/Stable",
"Intended Audience :: Science/Research", "Intended Audience :: Science/Research",
"Intended Audience :: Developers", "Intended Audience :: Developers",
"License :: OSI Approved", "License :: OSI Approved",
@ -71,6 +71,7 @@ numpy.distutils.core.setup(
"Programming Language :: Python :: 2.7", "Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Topic :: Scientific/Engineering :: Atmospheric Science", "Topic :: Scientific/Engineering :: Atmospheric Science",
"Topic :: Software Development", "Topic :: Software Development",
"Operating System :: POSIX", "Operating System :: POSIX",
@ -85,8 +86,6 @@ numpy.distutils.core.setup(
ext_modules = ext_modules, ext_modules = ext_modules,
package_dir = {"" : "src"}, package_dir = {"" : "src"},
download_url = "http://python.org/pypi/wrf-python", download_url = "http://python.org/pypi/wrf-python",
#namespace_packages=["wrf"],
# Note: If this doesn't work, you need to add the file to MANIFEST
package_data={"wrf" : ["data/psadilookup.dat"]}, package_data={"wrf" : ["data/psadilookup.dat"]},
scripts=[] scripts=[]
) )

12
src/wrf/util.py

@ -137,7 +137,7 @@ def is_multi_file(wrfin):
return (isinstance(wrfin, Iterable) and not isstr(wrfin)) return (isinstance(wrfin, Iterable) and not isstr(wrfin))
def has_time_coord(wrfin): def has_time_coord(wrfnc):
"""Return True if the input file or sequence contains the time """Return True if the input file or sequence contains the time
coordinate variable. coordinate variable.
@ -145,18 +145,16 @@ def has_time_coord(wrfin):
Args: Args:
wrfin (:class:`netCDF4.Dataset`, :class:`Nio.NioFile`, or an \ wrfnc (:class:`netCDF4.Dataset` or :class:`Nio.NioFile`): A single
iterable): WRF-ARW NetCDF NetCDF file object.
data as a :class:`netCDF4.Dataset`, :class:`Nio.NioFile`
or an iterable sequence of the aforementioned types.
Returns: Returns:
:obj:`bool`: True if the input contains the time coordinate :obj:`bool`: True if the netcdf file contains the time coordinate
variable, False otherwise. variable, False otherwise.
""" """
return "XTIME" in wrfin.variables return "XTIME" in wrfnc.variables
def is_mapping(wrfin): def is_mapping(wrfin):

2
src/wrf/version.py

@ -1,2 +1,2 @@
__version__ = "1.0b3" __version__ = "1.0.0"

Loading…
Cancel
Save