Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: Allow to use newer release of build docs dependencies #1057

Merged
merged 9 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/upgrade-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
python${pyv} -m pip install -U pip pip-tools
python${pyv} -m piptools compile --upgrade -o requirements/constraints_py${pyv}.txt setup.cfg requirements/version_denylist.txt ${flags}
done
python3.11 -m piptools compile --upgrade -o requirements/constraints_py3.11_docs.txt setup.cfg requirements/version_denylist.txt --allow-unsafe --strip-extras --extra docs --extra pyqt6
# END PYTHON DEPENDENCIES

- name: Check updated packages
Expand Down
11 changes: 6 additions & 5 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@ sphinx:
formats: all

build:
os: ubuntu-20.04
os: ubuntu-22.04
tools:
python: "3.9"
python: "3.11"


# Optionally set the version of Python and requirements required to build your docs
python:
install:
- requirements: requirements/constraints_py3.9.txt
- requirements: requirements/requirements_dev.txt
- requirements: requirements/constraints_py3.11_docs.txt
- method: pip
path: .[docs]
path: .
extra_requirements:
- docs
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ stages:
variables:
pip_cache_dir: $(Pipeline.Workspace)/.pip
steps:
- {task: UsePythonVersion@0, inputs: {versionSpec: '3.9', architecture: x64}}
- {task: UsePythonVersion@0, inputs: {versionSpec: '3.11', architecture: x64}}
- template: .azure-pipelines/pip_cache.yaml
parameters:
key: doc | requirements/constraints_py3.9.txt | "$(PY)"
Expand Down
2 changes: 1 addition & 1 deletion package/PartSeg/common_gui/universal_gui_part.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class EnumComboBox(QEnumComboBox):
For proper showing labels overload the ``__str__`` function of given :py:class:`enum.Enum`
"""

def __init__(self, enum: type(EnumType), parent=None):
def __init__(self, enum, parent=None):
warnings.warn(
"EnumComboBox is deprecated, use superqt.QEnumComboBox instead", category=DeprecationWarning, stacklevel=2
)
Expand Down
Loading