Skip to content
This repository was archived by the owner on Aug 25, 2024. It is now read-only.

Commit e8c04a0

Browse files
authored
ci: Fix numpy version conflict
Pin numpy to <1.19.0 everywhere that uses it Fixes: #816
1 parent ea9cb32 commit e8c04a0

File tree

8 files changed

+21
-7
lines changed

8 files changed

+21
-7
lines changed

.ci/deps.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ if [[ "x${PLUGIN}" == "xmodel/daal4py" ]] || \
6262
# Add channels
6363
conda config --add channels anaconda
6464
conda config --add channels conda-forge
65+
# Remove numpy 1.19.1 see https://github.com/intel/dffml/issues/816
66+
conda uninstall numpy
67+
conda install numpy==1.18.5
6568
fi
6669
if [ -f "${PIP_CACHE_DIR}/miniconda${python_version}/bin/activate" ]; then
6770
source "${PIP_CACHE_DIR}/miniconda${python_version}/bin/activate" base

configloader/image/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
common.KWARGS["install_requires"] += [
1313
"opencv-python>=4.2.0.34",
14-
"numpy>=1.16.2",
14+
# See https://github.com/intel/dffml/issues/816
15+
"numpy>=1.16.2,<1.19.0",
1516
]
1617
common.KWARGS["entry_points"] = {
1718
"dffml.configloader": [

model/daal4py/setup_common.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
# "daal4py>=0.2020.0",
1616
"pandas>=0.25.0",
1717
"joblib>=0.13.2",
18-
"numpy>=1.16.4",
18+
# See https://github.com/intel/dffml/issues/816
19+
"numpy>=1.16.4,<1.19.0",
1920
] + (
2021
["dffml>=0.3.7"]
2122
if not any(

model/scratch/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
with open(os.path.join(self_path, "README.md"), "r", encoding="utf-8") as f:
1919
readme = f.read()
2020

21-
INSTALL_REQUIRES = ["numpy>=1.16.4"] + (
21+
# See https://github.com/intel/dffml/issues/816
22+
INSTALL_REQUIRES = ["numpy>=1.16.4,<1.19.0"] + (
2223
["dffml>=0.3.7"]
2324
if not any(
2425
list(

model/tensorflow_hub/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"tensorflow>=2.0.0",
2424
"tensorflow-hub>=0.6.0",
2525
"pandas>=0.25.0",
26-
"numpy>=1.16.4",
26+
# See https://github.com/intel/dffml/issues/816
27+
"numpy>=1.16.4,<1.19.0",
2728
]
2829
+ (
2930
["dffml>=0.3.7"]

model/transformers/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
INSTALL_REQUIRES = [
2222
"tensorflow>=2.0.0",
2323
"pandas>=0.25.0",
24-
"numpy>=1.16.4",
24+
# See https://github.com/intel/dffml/issues/816
25+
"numpy>=1.16.4,<1.19.0",
2526
"seqeval>=0.0.12",
2627
"fastprogress>=0.2.2",
2728
"transformers>=3.0.2",

operations/image/setup_common.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
# Install dffml if it is not installed in development mode
1313
INSTALL_REQUIRES = [
1414
"opencv-python>=4.2.0.34",
15-
"numpy>=1.16.2",
15+
# See https://github.com/intel/dffml/issues/816
16+
"numpy>=1.16.2,<1.19.0",
1617
"mahotas>=1.4.9",
1718
] + (
1819
["dffml>=0.3.7"]

setup.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,12 @@
6363
],
6464
**plugins.PACKAGE_NAMES_BY_PLUGIN_INSTALLABLE,
6565
},
66-
tests_require=["httptest>=0.0.15", "Pillow>=7.1.2", "numpy>=1.16.2",],
66+
tests_require=[
67+
"httptest>=0.0.15",
68+
"Pillow>=7.1.2",
69+
# See https://github.com/intel/dffml/issues/816
70+
"numpy>=1.16.2,<1.19.0",
71+
],
6772
entry_points={
6873
"console_scripts": ["dffml = dffml.cli.cli:CLI.main"],
6974
"dffml.source": [

0 commit comments

Comments
 (0)