Browse Source

Added version information. Added more distribution boiler plate. Removed unused squeeze for the algorithm metadata

main
Bill Ladwig 9 years ago
parent
commit
0688765ef8
  1. 10
      MANIFEST.in
  2. 0
      README
  3. 2
      requirements.txt
  4. 41
      setup.py
  5. 2
      src/wrf/api.py
  6. 5
      src/wrf/metadecorators.py
  7. 2
      src/wrf/version.py

10
MANIFEST.in

@ -0,0 +1,10 @@
include README
include fortran/*.f90
include fortran/*.pyf
include setup.py
recursive-include doc *
include doc/make.bat
include doc/Makefile

2
requirements.txt

@ -0,0 +1,2 @@
numpy>=1.9.0
wrapt>=1.10

41
setup.py

@ -1,17 +1,6 @@
import setuptools import setuptools
import numpy.distutils.core import numpy.distutils.core
#ext1 = numpy.distutils.core.Extension(
# name = "wrf._wrfext",
# sources = ["src/wrf/wrfext.f90",
# "src/wrf/wrfext.pyf"]
# )
#ext2 = numpy.distutils.core.Extension(
# name = "wrf._wrfcape",
# sources = ["src/wrf/wrfcape.f90",
# "src/wrf/wrfcape.pyf"]
# )
ext1 = numpy.distutils.core.Extension( ext1 = numpy.distutils.core.Extension(
name = "wrf._wrffortran", name = "wrf._wrffortran",
@ -33,9 +22,37 @@ ext1 = numpy.distutils.core.Extension(
"fortran/wrffortran.pyf"] "fortran/wrffortran.pyf"]
) )
exec(open("src/wrf/version.py").read())
requirements = [
"numpy>=1.9.0",
"wrapt>=1.10"
]
numpy.distutils.core.setup( numpy.distutils.core.setup(
author = "Bill Ladwig",
author_email = "ladwig@ucar.edu",
description = "Diagnostic and interpolation routines for WRF-ARW data",
long_description = """
A collection of diagnostics and interpolation routines to be used with
WRF-ARW data.
""",
url = "https://github.com/NCAR/wrf-python",
keywords = ["python", "wrf-python", "wrf", "forecast", "model",
"weather research and forecasting", "interpolation",
"plotting", "plots", "meteorology", "nwp",
"numerical weather predication", "diagnostic"],
install_requires = requirements,
classifiers = ["Development Status :: 3 - Alpha",
"Intended Audience :: Science/Research",
"License :: OSI Approved",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Topic :: Scientific/Engineering :: Atmospheric Science",
"Topic :: Software Development :: Libraries :: Python Modules",
"Operating System :: OS Independent"],
name = "wrf", name = "wrf",
version = "0.0.1", version = __version__,
packages = setuptools.find_packages("src"), packages = setuptools.find_packages("src"),
ext_modules = [ext1], ext_modules = [ext1],
package_dir={"" : "src"}, package_dir={"" : "src"},

2
src/wrf/api.py

@ -17,6 +17,7 @@ from .util import (npvalues, extract_global_attrs,
extract_dim, extract_vars, extract_times, combine_files, extract_dim, extract_vars, extract_times, combine_files,
is_staggered, get_left_indexes, iter_left_indexes, is_staggered, get_left_indexes, iter_left_indexes,
get_right_slices, get_proj_params) get_right_slices, get_proj_params)
from .version import __version__
__all__ = [] __all__ = []
__all__ += ["xarray_enabled", "disable_xarray", "enable_xarray", __all__ += ["xarray_enabled", "disable_xarray", "enable_xarray",
@ -38,4 +39,5 @@ __all__ += ["npvalues", "extract_global_attrs",
"extract_dim", "extract_vars", "extract_times", "combine_files", "extract_dim", "extract_vars", "extract_times", "combine_files",
"is_staggered", "get_left_indexes", "iter_left_indexes", "is_staggered", "get_left_indexes", "iter_left_indexes",
"get_right_slices", "get_proj_params"] "get_right_slices", "get_proj_params"]
__all__ += ["__version__"]

5
src/wrf/metadecorators.py

@ -1091,7 +1091,7 @@ def set_interp_metadata(interp_type):
def set_alg_metadata(alg_ndims, refvarname, def set_alg_metadata(alg_ndims, refvarname,
refvarndims=None, missingarg=None, refvarndims=None, missingarg=None,
stagdim=None, stagsubvar=None, stagdim=None, stagsubvar=None,
units=None, description=None, squeeze=False): units=None, description=None):
""" """
alg_ndims: number of dimensions returned by the algorithm alg_ndims: number of dimensions returned by the algorithm
refvarndims: number of right dimensions for the refernce var, used refvarndims: number of right dimensions for the refernce var, used
@ -1201,9 +1201,6 @@ def set_alg_metadata(alg_ndims, refvarname,
out = DataArray(result, name=outname, dims=outdims, attrs=outattrs) out = DataArray(result, name=outname, dims=outdims, attrs=outattrs)
if squeeze:
return out.squeeze()
return out return out
return func_wrapper return func_wrapper

2
src/wrf/version.py

@ -0,0 +1,2 @@
__version__ = "1.0a1"
Loading…
Cancel
Save