From a12c4472eebfed303621bf18320d5ae5f5d85307 Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Mon, 9 Dec 2024 13:50:35 +0100 Subject: [PATCH 01/10] pyproject.toml and widget help working in a dev install --- doc/conf.py | 3 +++ orangecontrib/fairness/widgets/__init__.py | 2 +- pyproject.toml | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pyproject.toml diff --git a/doc/conf.py b/doc/conf.py index e90ddb1..8ab92a0 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -291,3 +291,6 @@ # Mapping for external documentation in Sphinx. # intersphinx_mapping = {'orange3': ('../../orange3/doc/visual-programming/build/html', # '../../orange3/doc/visual-programming/build/html/objects.inv')} + +# avoid encoding error with htmlhelp +smartquotes = False diff --git a/orangecontrib/fairness/widgets/__init__.py b/orangecontrib/fairness/widgets/__init__.py index ccdcf50..673994a 100644 --- a/orangecontrib/fairness/widgets/__init__.py +++ b/orangecontrib/fairness/widgets/__init__.py @@ -15,7 +15,7 @@ # You need to build help pages manually using # make htmlhelp # inside doc folder - ("{DEVELOP_ROOT}/doc/_build/html/index.html", None), + ("{DEVELOP_ROOT}/doc/_build/htmlhelp/index.html", None), # Documentation included in wheel # Correct DATA_FILES entry is needed in setup.py and documentation has to be built # before the wheel is created. diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..66b052e --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,7 @@ +[build-system] +requires = [ + 'setuptools', + 'wheel', + 'recommonmark', +] +build-backend = 'setuptools.build_meta' From f7445bec4ee4ebd124f8bd64299a6e9c70331d80 Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Mon, 9 Dec 2024 14:10:25 +0100 Subject: [PATCH 02/10] tox oldest tests: specify numpy version --- tox.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 4ed17a8..f50cba8 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,8 @@ deps = # Use newer canvas-core and widget-base to avoid segfaults on windows oldest: orange-canvas-core==0.1.24 oldest: orange-widget-base==4.16.1 - oldest: pandas==1.5 + oldest: pandas==1.3 + oldest: numpy==1.17.3 latest: git+https://github.com/biolab/orange3.git#egg=orange3 latest: git+https://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core latest: git+https://github.com/biolab/orange-widget-base.git#egg=orange-widget-base @@ -41,4 +42,4 @@ commands_pre = pip freeze commands = coverage run -m unittest discover -v --start-directory orangecontrib/fairness - coverage report \ No newline at end of file + coverage report From 3a5bddee787c5e6b8dd6d93b1c2bcff76f1bc6b8 Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Mon, 9 Dec 2024 14:22:36 +0100 Subject: [PATCH 03/10] require Orange3>=3.34 --- setup.py | 2 +- tox.ini | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 64cdb1d..4826dce 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ def include_documentation(local_dir, install_dir): }, install_requires=[ "numpy", - "Orange3", + "Orange3>=3.34.0", "aif360>=0.6.0", ], extras_require={ diff --git a/tox.ini b/tox.ini index f50cba8..769d636 100644 --- a/tox.ini +++ b/tox.ini @@ -24,12 +24,12 @@ deps = {env:PYQT_PYPI_NAME:PyQt5}=={env:PYQT_PYPI_VERSION:5.15.*} {env:WEBENGINE_PYPI_NAME:PyQtWebEngine}=={env:WEBENGINE_PYPI_VERSION:5.15.*} oldest: scikit-learn==1.0.1 - oldest: orange3==3.32.0 + oldest: orange3==3.34.0 # Use newer canvas-core and widget-base to avoid segfaults on windows - oldest: orange-canvas-core==0.1.24 - oldest: orange-widget-base==4.16.1 + oldest: orange-canvas-core==0.1.28 + oldest: orange-widget-base==4.19.0 oldest: pandas==1.3 - oldest: numpy==1.17.3 + oldest: numpy==1.19.5 latest: git+https://github.com/biolab/orange3.git#egg=orange3 latest: git+https://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core latest: git+https://github.com/biolab/orange-widget-base.git#egg=orange-widget-base From b827866c5f98e5d19038dacffd1fa88521c5e2a1 Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Mon, 9 Dec 2024 14:30:22 +0100 Subject: [PATCH 04/10] require numpy >=1.21 for -oldest tests on Mac ARM to work --- setup.py | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 4826dce..516b52b 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ def include_documentation(local_dir, install_dir): ), }, install_requires=[ - "numpy", + "numpy>=1.21.0", "Orange3>=3.34.0", "aif360>=0.6.0", ], diff --git a/tox.ini b/tox.ini index 769d636..141512a 100644 --- a/tox.ini +++ b/tox.ini @@ -29,7 +29,7 @@ deps = oldest: orange-canvas-core==0.1.28 oldest: orange-widget-base==4.19.0 oldest: pandas==1.3 - oldest: numpy==1.19.5 + oldest: numpy~=1.21.0 latest: git+https://github.com/biolab/orange3.git#egg=orange3 latest: git+https://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core latest: git+https://github.com/biolab/orange-widget-base.git#egg=orange-widget-base From 2aaf9d218d9a4ac47f3250dc1a1b6f7256ac3156 Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Tue, 10 Dec 2024 10:58:57 +0100 Subject: [PATCH 05/10] oldest tests: require scipy too --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 141512a..6dbc775 100644 --- a/tox.ini +++ b/tox.ini @@ -30,6 +30,7 @@ deps = oldest: orange-widget-base==4.19.0 oldest: pandas==1.3 oldest: numpy~=1.21.0 + oldest: scipy~=1.9.0 latest: git+https://github.com/biolab/orange3.git#egg=orange3 latest: git+https://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core latest: git+https://github.com/biolab/orange-widget-base.git#egg=orange-widget-base From 0e031c3af9d8e1bdd909a831969fe31f753f46ea Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Tue, 10 Dec 2024 11:17:28 +0100 Subject: [PATCH 06/10] oldest: specify setuptools and pip --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 6dbc775..ccd82e8 100644 --- a/tox.ini +++ b/tox.ini @@ -31,6 +31,8 @@ deps = oldest: pandas==1.3 oldest: numpy~=1.21.0 oldest: scipy~=1.9.0 + oldest: setuptools~=41.0.0 + oldest: pip~=18.0 latest: git+https://github.com/biolab/orange3.git#egg=orange3 latest: git+https://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core latest: git+https://github.com/biolab/orange-widget-base.git#egg=orange-widget-base From 8f18bb8989f4facdfb8f7d1ed6ca7fdb8878aa2c Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Tue, 10 Dec 2024 11:41:32 +0100 Subject: [PATCH 07/10] update min Orange to 3.37.0 --- setup.py | 2 +- tox.ini | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index 516b52b..842bf63 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ def include_documentation(local_dir, install_dir): }, install_requires=[ "numpy>=1.21.0", - "Orange3>=3.34.0", + "Orange3>=3.37.0", "aif360>=0.6.0", ], extras_require={ diff --git a/tox.ini b/tox.ini index ccd82e8..0a5fb0e 100644 --- a/tox.ini +++ b/tox.ini @@ -23,16 +23,13 @@ deps = coverage {env:PYQT_PYPI_NAME:PyQt5}=={env:PYQT_PYPI_VERSION:5.15.*} {env:WEBENGINE_PYPI_NAME:PyQtWebEngine}=={env:WEBENGINE_PYPI_VERSION:5.15.*} - oldest: scikit-learn==1.0.1 - oldest: orange3==3.34.0 - # Use newer canvas-core and widget-base to avoid segfaults on windows - oldest: orange-canvas-core==0.1.28 - oldest: orange-widget-base==4.19.0 - oldest: pandas==1.3 + oldest: scikit-learn==1.3.0 + oldest: orange3==3.37.0 + oldest: orange-canvas-core==0.2.0 + oldest: orange-widget-base==4.23.0 + oldest: pandas~=1.4.0 oldest: numpy~=1.21.0 oldest: scipy~=1.9.0 - oldest: setuptools~=41.0.0 - oldest: pip~=18.0 latest: git+https://github.com/biolab/orange3.git#egg=orange3 latest: git+https://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core latest: git+https://github.com/biolab/orange-widget-base.git#egg=orange-widget-base From a0f7f5245807e25ff7955f5b86c9bb17edc762b7 Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Tue, 10 Dec 2024 11:51:06 +0100 Subject: [PATCH 08/10] oldest: pin tensorflow --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 0a5fb0e..e79a9e3 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,9 @@ setenv = COVERAGE_FILE = {toxinidir}/.coverage COVERAGE_RCFILE = {toxinidir}/.coveragerc deps = - tensorflow>=2.2.3 + latest: tensorflow>=2.2.3 + released: tensorflow>=2.2.3 + oldest: tensorflow~=2.11.0 coverage {env:PYQT_PYPI_NAME:PyQt5}=={env:PYQT_PYPI_VERSION:5.15.*} {env:WEBENGINE_PYPI_NAME:PyQtWebEngine}=={env:WEBENGINE_PYPI_VERSION:5.15.*} From 1862ff6553d631df4dcb6fe8ba4b9d6bb6f7f04d Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Tue, 10 Dec 2024 12:17:55 +0100 Subject: [PATCH 09/10] newer tensorflow for oldest macs --- tox.ini | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index e79a9e3..b8764aa 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,9 @@ setenv = deps = latest: tensorflow>=2.2.3 released: tensorflow>=2.2.3 - oldest: tensorflow~=2.11.0 + oldest: tensorflow~=2.11.0;platform_system!='Darwin' + # for arm64 oldest tests + oldest: tensorflow~=2.13.0;platform_system=='Darwin' coverage {env:PYQT_PYPI_NAME:PyQt5}=={env:PYQT_PYPI_VERSION:5.15.*} {env:WEBENGINE_PYPI_NAME:PyQtWebEngine}=={env:WEBENGINE_PYPI_VERSION:5.15.*} @@ -30,7 +32,9 @@ deps = oldest: orange-canvas-core==0.2.0 oldest: orange-widget-base==4.23.0 oldest: pandas~=1.4.0 - oldest: numpy~=1.21.0 + oldest: numpy~=1.21.0;platform_system!='Darwin' + # newer tensorflow for arm also requires newer numpy + oldest: numpy~=1.22.0;platform_system=='Darwin' oldest: scipy~=1.9.0 latest: git+https://github.com/biolab/orange3.git#egg=orange3 latest: git+https://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core From aedd19573cc82f1e66f7d4dbaf4d30ab9d4e2a91 Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Tue, 10 Dec 2024 12:43:41 +0100 Subject: [PATCH 10/10] oldest: require some old pip --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index b8764aa..7aec5b7 100644 --- a/tox.ini +++ b/tox.ini @@ -36,6 +36,7 @@ deps = # newer tensorflow for arm also requires newer numpy oldest: numpy~=1.22.0;platform_system=='Darwin' oldest: scipy~=1.9.0 + oldest: pip~=22.0 latest: git+https://github.com/biolab/orange3.git#egg=orange3 latest: git+https://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core latest: git+https://github.com/biolab/orange-widget-base.git#egg=orange-widget-base