Skip to content
Snippets Groups Projects
Commit 3b8bb57f authored by Loic Huder's avatar Loic Huder
Browse files

Merge branch 'release' into 'main'

Bump to version 0.7.1

See merge request !160
parents ec08a7eb e7ad8c3d
No related branches found
No related tags found
Loading
Pipeline #197458 passed
......@@ -3,13 +3,14 @@ include:
file: .gitlab-ci-template.yml
variables:
WARNING1: "ignore::DeprecationWarning:silx.resources" # Fix in https://github.com/silx-kit/silx/pull/4078
WARNING2: "ignore::DeprecationWarning:pkg_resources" # Distribution.activate
WARNING3: "ignore::DeprecationWarning:Orange.util" # Fix in https://github.com/biolab/orange3/commit/671f184be00169e0a5196e9871ee0156dd35c19f
WARNING4: "ignore::DeprecationWarning:orangewidget.gui" # Fix in https://github.com/biolab/orange-widget-base/commit/2c6b4cfbba035f7f89bb886a02d8330f2710ce7d
WARNING5: "ignore::DeprecationWarning:jupyter_client.session"
WARNING6: "ignore::DeprecationWarning:silx.gui.widgets.ElidedLabel"
IGNORE_WARNINGS: "-W ${WARNING1} -W ${WARNING2} -W ${WARNING3} -W ${WARNING4} -W ${WARNING5} -W ${WARNING6}"
WARNING1: 'ignore::DeprecationWarning:silx.resources' # Fix in https://github.com/silx-kit/silx/pull/4078
WARNING2: 'ignore::DeprecationWarning:pkg_resources' # Distribution.activate
WARNING3: 'ignore::DeprecationWarning:Orange.util' # Fix in https://github.com/biolab/orange3/commit/671f184be00169e0a5196e9871ee0156dd35c19f
WARNING4: 'ignore::DeprecationWarning:orangewidget.gui' # Fix in https://github.com/biolab/orange-widget-base/commit/2c6b4cfbba035f7f89bb886a02d8330f2710ce7d
WARNING5: 'ignore::DeprecationWarning:jupyter_client.session'
WARNING6: 'ignore::DeprecationWarning:silx.gui.widgets.ElidedLabel'
WARNING7: 'ignore::DeprecationWarning:orangecanvas.scheme.readwrite' # https://github.com/biolab/orange-canvas-core/issues/304
IGNORE_WARNINGS: '-W ${WARNING1} -W ${WARNING2} -W ${WARNING3} -W ${WARNING4} -W ${WARNING5} -W ${WARNING6} -W ${WARNING7}'
flake8_nb:
extends: .flake8_nb
......@@ -18,29 +19,29 @@ test-3.8:
extends: .test-3.8_glx
timeout: 20m
variables:
PYTEST_WARNINGS: "-W error ${IGNORE_WARNINGS}"
PIP_INSTALL_OPTIONS: "--pre -e" # because of --import-mode=importlib"
PYTEST_WARNINGS: '-W error ${IGNORE_WARNINGS}'
PIP_INSTALL_OPTIONS: '--pre -e' # because of --import-mode=importlib"
test-3.8-minimal:
extends: .test-3.8_glx
timeout: 20m
variables:
PYTEST_WARNINGS: "-W error ${IGNORE_WARNINGS}"
PYTEST_COV: ""
PYTEST_WARNINGS: '-W error ${IGNORE_WARNINGS}'
PYTEST_COV: ''
test-3.8-pymca:
extends: .test-3.8_glx
timeout: 20m
variables:
PYTEST_WARNINGS: "-W error ${IGNORE_WARNINGS}"
PYTEST_COV: ""
PYTEST_WARNINGS: '-W error ${IGNORE_WARNINGS}'
PYTEST_COV: ''
test-3.8-larch:
extends: .test-3.8_glx
timeout: 20m
variables:
PYTEST_WARNINGS: "-W error ${IGNORE_WARNINGS}"
PYTEST_COV: ""
PYTEST_WARNINGS: '-W error ${IGNORE_WARNINGS}'
PYTEST_COV: ''
test-3.8-larch-example:
extends: .test-3.8_glx
......@@ -52,15 +53,15 @@ test-3.10:
extends: .test-3.10_glx
timeout: 20m
variables:
PYTEST_WARNINGS: "-W error ${IGNORE_WARNINGS}"
PIP_INSTALL_OPTIONS: "--pre -e" # because of --import-mode=importlib"
PYTEST_WARNINGS: '-W error ${IGNORE_WARNINGS}'
PIP_INSTALL_OPTIONS: '--pre -e' # because of --import-mode=importlib"
test-3.11:
extends: .test-3.11_glx
test-3.12:
extends: .test-3.12_glx
timeout: 20m
variables:
PYTEST_WARNINGS: "-W error ${IGNORE_WARNINGS}"
PIP_INSTALL_OPTIONS: "--pre -e" # because of --import-mode=importlib"
PYTEST_WARNINGS: '-W error ${IGNORE_WARNINGS}'
PIP_INSTALL_OPTIONS: '--pre -e' # because of --import-mode=importlib"
build_sdist:
extends: .build_sdist
......@@ -68,12 +69,12 @@ build_sdist:
test_sdist-3.9:
extends: .test_sdist-3.9_glx
variables:
PYTEST_WARNINGS: "-W error ${IGNORE_WARNINGS}"
PYTEST_WARNINGS: '-W error ${IGNORE_WARNINGS}'
build_doc:
extends: .build_doc
script:
- python -m pip install sphinx # solves issue with pip dependency solver
- python -m pip install sphinx # solves issue with pip dependency solver
- python -m pip install .[doc]
- sphinx-build doc html
......
......@@ -2,6 +2,10 @@
## (unreleased)
## 0.7.1
- Add support for Python 3.12
## 0.7.0
- Remove `pkg_resources` usage and related changes in Orange packages
......
[build-system]
requires = [
"setuptools>=46.4",
]
requires = ["setuptools>=46.4"]
build-backend = "setuptools.build_meta"
[tool.pytest.ini_options]
# consider_namespace_packages = true # for pytest>=8.1
addopts = "--import-mode=importlib" # for all pytest versions, pytest-cov needs `pip install -e .`
addopts = "--import-mode=importlib" # for all pytest versions, pytest-cov needs `pip install -e .`
......@@ -27,7 +27,7 @@ python_requires = >=3.8
install_requires =
numpy
scipy
h5py >=3.1,<3.10
h5py >=3.1
silx >=0.15
Pint
ewoks[orange] >=0.1
......
__version__ = "0.7.0"
__version__ = "0.7.1"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment