diff --git a/wrappers/RichDEM.jl/Project.toml b/wrappers/RichDEM.jl/Project.toml index cc5c0d7..a582a30 100644 --- a/wrappers/RichDEM.jl/Project.toml +++ b/wrappers/RichDEM.jl/Project.toml @@ -1,7 +1,7 @@ name = "RichDEM" uuid = "94a1c18c-0d95-461b-994e-5c3447d2ff66" authors = ["Sunayana Ghosh ", "Tim DuBois "] -version = "0.1.1" +version = "0.1.2" [deps] CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4" diff --git a/wrappers/RichDEM.jl/src/RichDEM.jl b/wrappers/RichDEM.jl/src/RichDEM.jl index c38d616..cee490a 100644 --- a/wrappers/RichDEM.jl/src/RichDEM.jl +++ b/wrappers/RichDEM.jl/src/RichDEM.jl @@ -60,8 +60,6 @@ mutable struct Depression{T} total_elevation::Float64 end -expand_struct(sub) = map(n -> getfield(sub, n), fieldnames(typeof(sub))) - function Depression(dep::CxxDepression{T}) where {T} Depression{T}(pit_cell(dep), out_cell(dep), parent(dep), odep(dep), geolink(dep), pit_elev(dep), out_elev(dep), lchild(dep), rchild(dep), ocean_parent(dep), ocean_linked(dep), dep_label(dep), diff --git a/wrappers/pyrichdem/setup.py b/wrappers/pyrichdem/setup.py index 410bfd4..954e833 100644 --- a/wrappers/pyrichdem/setup.py +++ b/wrappers/pyrichdem/setup.py @@ -133,8 +133,8 @@ def build_extensions(self): keywords = 'GIS terrain hydrology geomorphology raster', #packages = find_packages(exclude=['contrib', 'docs', 'tests*']), install_requires = [ - "numpy>=1.7,<2; python_version > '3.4' or python_version < '3.0'", - "numpy>=1.7,<1.12; python_version < '3.4' and python_version > '3.0'" + "numpy>=1.22,<2; python_version > '3.4' or python_version < '3.0'", + "numpy>=1.22,<1.12; python_version < '3.4' and python_version > '3.0'" ], # extras_require = { # ':python_version > "3.4"': [