windmapper 2.1.3__tar.gz → 2.1.5__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {windmapper-2.1.3 → windmapper-2.1.5}/PKG-INFO +3 -2
- {windmapper-2.1.3 → windmapper-2.1.5}/pysrc/windmapper.egg-info/PKG-INFO +3 -2
- {windmapper-2.1.3 → windmapper-2.1.5}/pysrc/windmapper.egg-info/requires.txt +2 -1
- {windmapper-2.1.3 → windmapper-2.1.5}/setup.py +17 -7
- {windmapper-2.1.3 → windmapper-2.1.5}/.gitignore +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/CMakeLists.txt +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/LICENSE +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/MANIFEST.in +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/README.md +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/cfg/cli_massSolver.cfg +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/pyproject.toml +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/pysrc/windmapper.egg-info/SOURCES.txt +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/pysrc/windmapper.egg-info/dependency_links.txt +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/pysrc/windmapper.egg-info/top_level.txt +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/pysrc/windmapper_utls/MPI_call_WN_1dir.py +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/pysrc/windmapper_utls/__init__.py +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/scripts/rio_merge.py +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/setup.cfg +0 -0
- {windmapper-2.1.3 → windmapper-2.1.5}/windmapper.py +0 -0
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: windmapper
|
|
3
|
-
Version: 2.1.
|
|
3
|
+
Version: 2.1.5
|
|
4
4
|
Summary: Windfield library generation
|
|
5
5
|
Home-page: https://github.com/Chrismarsh/Windmapper
|
|
6
6
|
Author: Chris Marsh
|
|
7
7
|
Author-email: chris.marsh@usask.ca
|
|
8
8
|
Requires-Python: >=3.6
|
|
9
9
|
License-File: LICENSE
|
|
10
|
-
Requires-Dist:
|
|
10
|
+
Requires-Dist: pygdal==3.4.1.*
|
|
11
11
|
Requires-Dist: numpy
|
|
12
12
|
Requires-Dist: scipy
|
|
13
13
|
Requires-Dist: elevation
|
|
@@ -15,5 +15,6 @@ Requires-Dist: pyproj
|
|
|
15
15
|
Requires-Dist: tqdm
|
|
16
16
|
Requires-Dist: rasterio
|
|
17
17
|
Requires-Dist: mpi4py
|
|
18
|
+
Requires-Dist: cloudpickle
|
|
18
19
|
|
|
19
20
|
Generates windfields
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: windmapper
|
|
3
|
-
Version: 2.1.
|
|
3
|
+
Version: 2.1.5
|
|
4
4
|
Summary: Windfield library generation
|
|
5
5
|
Home-page: https://github.com/Chrismarsh/Windmapper
|
|
6
6
|
Author: Chris Marsh
|
|
7
7
|
Author-email: chris.marsh@usask.ca
|
|
8
8
|
Requires-Python: >=3.6
|
|
9
9
|
License-File: LICENSE
|
|
10
|
-
Requires-Dist:
|
|
10
|
+
Requires-Dist: pygdal==3.4.1.*
|
|
11
11
|
Requires-Dist: numpy
|
|
12
12
|
Requires-Dist: scipy
|
|
13
13
|
Requires-Dist: elevation
|
|
@@ -15,5 +15,6 @@ Requires-Dist: pyproj
|
|
|
15
15
|
Requires-Dist: tqdm
|
|
16
16
|
Requires-Dist: rasterio
|
|
17
17
|
Requires-Dist: mpi4py
|
|
18
|
+
Requires-Dist: cloudpickle
|
|
18
19
|
|
|
19
20
|
Generates windfields
|
|
@@ -19,12 +19,15 @@ _MAP = {
|
|
|
19
19
|
'off': False,
|
|
20
20
|
'0': False
|
|
21
21
|
}
|
|
22
|
+
|
|
23
|
+
|
|
22
24
|
def strtobool(value):
|
|
23
25
|
try:
|
|
24
26
|
return _MAP[str(value).lower()]
|
|
25
27
|
except KeyError:
|
|
26
28
|
raise ValueError('"{}" is not a valid bool value'.format(value))
|
|
27
29
|
|
|
30
|
+
|
|
28
31
|
build_wn = True
|
|
29
32
|
try:
|
|
30
33
|
build_wn = strtobool(os.environ['BUILD_WINDNINJA'])
|
|
@@ -33,13 +36,20 @@ except:
|
|
|
33
36
|
|
|
34
37
|
print(f'Build WindNinja? {build_wn}')
|
|
35
38
|
|
|
36
|
-
|
|
39
|
+
|
|
40
|
+
def gdal_dependency():
|
|
37
41
|
try:
|
|
38
42
|
version = subprocess.run(["gdal-config", "--version"], stdout=subprocess.PIPE).stdout.decode()
|
|
39
|
-
|
|
40
43
|
version = version.replace('\n', '')
|
|
41
|
-
|
|
42
|
-
|
|
44
|
+
|
|
45
|
+
gdal_depends = ''
|
|
46
|
+
if packaging.version.parse(version) >= packaging.version.parse("3.5.0"):
|
|
47
|
+
# >= 3.5 required for this type of gdal python binding install
|
|
48
|
+
gdal_depends = f'gdal[numpy]=={version}.*'
|
|
49
|
+
else:
|
|
50
|
+
gdal_depends = f'pygdal=={version}.*'
|
|
51
|
+
|
|
52
|
+
return gdal_depends
|
|
43
53
|
except FileNotFoundError as e:
|
|
44
54
|
raise(""" ERROR: Could not find the system install of GDAL.
|
|
45
55
|
Please install it via your package manage of choice.
|
|
@@ -65,7 +75,7 @@ else:
|
|
|
65
75
|
from setuptools import setup
|
|
66
76
|
|
|
67
77
|
args = {'name': 'windmapper',
|
|
68
|
-
'version': '2.1.
|
|
78
|
+
'version': '2.1.5',
|
|
69
79
|
'description': 'Windfield library generation',
|
|
70
80
|
'long_description': "Generates windfields",
|
|
71
81
|
'author': 'Chris Marsh',
|
|
@@ -77,8 +87,8 @@ args = {'name': 'windmapper',
|
|
|
77
87
|
'': 'pysrc',
|
|
78
88
|
},
|
|
79
89
|
'scripts': ["windmapper.py", 'scripts/rio_merge.py', "cfg/cli_massSolver.cfg"],
|
|
80
|
-
'install_requires': [
|
|
81
|
-
'numpy', 'scipy', 'elevation', 'pyproj', 'tqdm', 'rasterio', 'mpi4py'],
|
|
90
|
+
'install_requires': [gdal_dependency(),
|
|
91
|
+
'numpy', 'scipy', 'elevation', 'pyproj', 'tqdm', 'rasterio', 'mpi4py', 'cloudpickle'],
|
|
82
92
|
'setup_requires': setup_requires,
|
|
83
93
|
'python_requires': '>=3.6'}
|
|
84
94
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|