Skip to content

Commit

Permalink
Merge pull request #14 from biolab/fix-dev-docs
Browse files Browse the repository at this point in the history
pyproject.toml and widget help working in a dev install
  • Loading branch information
markotoplak authored Dec 10, 2024
2 parents 32d2bd2 + aedd195 commit 754b259
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 11 deletions.
3 changes: 3 additions & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion orangecontrib/fairness/widgets/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 7 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[build-system]
requires = [
'setuptools',
'wheel',
'recommonmark',
]
build-backend = 'setuptools.build_meta'
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ def include_documentation(local_dir, install_dir):
),
},
install_requires=[
"numpy",
"Orange3",
"numpy>=1.21.0",
"Orange3>=3.37.0",
"aif360>=0.6.0",
],
extras_require={
Expand Down
24 changes: 16 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,24 @@ 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;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.*}
oldest: scikit-learn==1.0.1
oldest: orange3==3.32.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: pandas==1.5
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;platform_system!='Darwin'
# 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
Expand All @@ -41,4 +49,4 @@ commands_pre =
pip freeze
commands =
coverage run -m unittest discover -v --start-directory orangecontrib/fairness
coverage report
coverage report

0 comments on commit 754b259

Please sign in to comment.