Skip to content

Commit 85ebd9f

Browse files
authored
Merge pull request statsmodels#8455 from bashtage/fix-windows-build
MAINT: Fix Windows and SciPy issues
2 parents 55aff1e + 38215fc commit 85ebd9f

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

pyproject.toml

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ requires = [
55
"setuptools>=59.2.0",
66
"wheel>=0.37.1",
77
"cython>=0.29.26,<3", # Sync with CYTHON_MIN_VER in setup
8-
"oldest-supported-numpy",
8+
# Workaround for oldest supported numpy using 1.21.6, but SciPy 1.9.2+ requiring 1.22.3+
9+
"oldest-supported-numpy; python_version!='3.10' or platform_system!='Windows' or platform_python_implementation=='PyPy'",
10+
"numpy==1.22.3; python_version=='3.10' and platform_system=='Windows' and platform_python_implementation != 'PyPy'",
911
"numpy; python_version>='3.11'",
10-
"scipy>=1.4,!=1.9.2",
11-
"scipy>=1.4,!=1.9.2; sys_platform == \"win32\"", # Blacklist 1.9.2 due to Windows issues
12-
"setuptools_scm[toml]>=6.4.2,<7.0.0",
12+
"scipy>=1.4",
13+
"setuptools_scm[toml]~=7.0.0"
1314
]
1415
build-backend = "setuptools.build_meta"
1516

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# build
22
cython>=0.29.28,<3.0.0
3-
setuptools_scm[toml]>=6.4.2,<7.0.0
3+
setuptools_scm[toml]~=7.0.0
44
oldest-supported-numpy>=2022.4.18
55

66
# run

requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Workaround for scipy build requirement
2+
numpy>=1.22.3; python_version=="3.10" and platform_system=="Windows" and platform_python_implementation != "PyPy"
13
numpy >=1.18 # released December 2019
24
scipy>=1.4,!=1.9.2 # released December 2019
35
scipy>=1.4,!=1.9.2; sys_platform == "win32" # Blacklist 1.9.2 due to Windows issues

statsmodels/__init__.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
from statsmodels._version import __version__, __version_tuple__
2+
3+
__version_info__ = __version_tuple__
14

2-
from ._version import (
3-
version as __version__, version_tuple as __version_info__
4-
)
55

66
debug_warnings = False
77

@@ -31,8 +31,9 @@ def test(extra_args=None, exit=False):
3131
The status code from the test run if exit is False.
3232
"""
3333
from .tools._testing import PytestTester
34+
3435
tst = PytestTester(package_path=__file__)
3536
return tst(extra_args=extra_args, exit=exit)
3637

3738

38-
__all__ = ['__version__', '__version_info__', 'test']
39+
__all__ = ["__version__", "__version_info__", "__version_tuple__", "test"]

tools/ci/azure/install-posix.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ else
1515
fi
1616

1717
python -m pip install --upgrade "pip~=22.0.4" setuptools wheel
18-
python -m pip install "cython>=0.29.28,<3.0.0" "pytest~=7.0.1" pytest-xdist coverage pytest-cov ipython jupyter notebook nbconvert "property_cached>=1.6.3" black==20.8b1 isort flake8 nbconvert==5.6.1 coveralls setuptools_scm[toml]
18+
python -m pip install "cython>=0.29.28,<3.0.0" "pytest~=7.0.1" pytest-xdist coverage pytest-cov ipython jupyter notebook nbconvert "property_cached>=1.6.3" black==20.8b1 isort flake8 nbconvert==5.6.1 coveralls setuptools_scm[toml]~=7.0.0
1919

2020
if [[ -n ${NUMPY} ]]; then CMD="$CMD==${NUMPY}"; fi;
2121
CMD="$CMD scipy"

0 commit comments

Comments
 (0)