Skip to content

Commit cbcaae1

Browse files
committed
don't auto build windninja
1 parent 5bdfa65 commit cbcaae1

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

setup.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
from skbuild import setup
1+
# import setuptools
2+
# from skbuild import setup
23
import subprocess
34
from packaging.version import LegacyVersion
4-
from skbuild.exceptions import SKBuildError
5-
from skbuild.cmaker import get_cmake_version
5+
# from skbuild.exceptions import SKBuildError
6+
# from skbuild.cmaker import get_cmake_version
67
import packaging.version
78

89
def get_installed_gdal_version():
@@ -27,15 +28,15 @@ def get_installed_gdal_version():
2728
# Add CMake as a build requirement if cmake is not installed or is too low a version
2829
# https://scikit-build.readthedocs.io/en/latest/usage.html#adding-cmake-as-building-requirement-only-if-not-installed-or-too-low-a-version
2930
setup_requires = []
30-
try:
31-
if LegacyVersion(get_cmake_version()) < LegacyVersion("3.16"):
32-
setup_requires.append('cmake')
33-
except SKBuildError:
34-
setup_requires.append('cmake')
31+
# try:
32+
# if LegacyVersion(get_cmake_version()) < LegacyVersion("3.16"):
33+
# setup_requires.append('cmake')
34+
# except SKBuildError:
35+
# setup_requires.append('cmake')
3536

3637

3738
setup(name='windmapper',
38-
version='1.2.21',
39+
version='1.2.22',
3940
description='Windfield library generation',
4041
long_description="""
4142
Generates windfields
@@ -44,7 +45,7 @@ def get_installed_gdal_version():
4445
author_email='[email protected]',
4546
url="https://github.com/Chrismarsh/Windmapper",
4647
include_package_data=True,
47-
cmake_args=['-DCMAKE_BUILD_TYPE=Release'],
48+
# cmake_args=['-DCMAKE_BUILD_TYPE=Release'],
4849
scripts=["windmapper.py", 'scripts/rio_merge.py', "cfg/cli_massSolver.cfg"],
4950
install_requires=['pygdal'+get_installed_gdal_version(),'numpy','scipy','elevation','pyproj','tqdm','rasterio'],
5051
setup_requires=setup_requires,

0 commit comments

Comments
 (0)