Skip to content

Commit

Permalink
fix constraints on numpy and qt
Browse files Browse the repository at this point in the history
  • Loading branch information
Czaki committed Jul 18, 2024
1 parent aac66a7 commit 0e5a47d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .azure-pipelines/pyinstaller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ parameters:
type: string

steps:
- {task: UsePythonVersion@0, inputs: {versionSpec: '3.9', architecture: x64}}
- {task: UsePythonVersion@0, inputs: {versionSpec: '3.11', architecture: x64}}
- template: pip_cache.yaml
parameters:
key: pyinstaller | requirements/constraints_py3.9.txt | "$(Agent.OS)" | "$(PY)"
path: ${{ parameters.cache_dir }}
- bash: |
python -m pip install -U pip wheel setuptools
displayName: install libs
- bash: python -m pip install .[pyinstaller] -c requirements/constraints_py3.9.txt
- bash: python -m pip install .[pyinstaller] -c requirements/constraints_py3.11.txt
displayName: install partseg
- bash: |
python build_utils/create_and_pack_executable.py --no-simple-zip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_prereleases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [windows-2022, macos-12, ubuntu-22.04]
python: [3.9]
platform: [windows-2022, macos-14, ubuntu-22.04]
python: [3.12]
steps:
- uses: actions/checkout@v4

Expand Down
11 changes: 8 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ dependencies = [
"mahotas>=1.4.10",
"napari>=0.4.14",
"nme>=0.1.7",
"numpy>=1.18.5",
"numpy>=1.18.5 ; python_version >= '3.10'",
"numpy>=1.18.5, <2 ; python_version < '3.10'",
"oiffile>=2020.1.18",
"openpyxl>=2.5.7",
"packaging>=20.0",
Expand Down Expand Up @@ -119,22 +120,26 @@ pyinstaller_base = [
"pydantic",
]
pyqt = [
"PyQt5!=5.15.0,>=5.12.3",
"PartSeg[pyqt5]",
]
pyqt5 = [
"PyQt5!=5.15.0,>=5.12.3",
"napari[pyqt5]",
]
pyqt6 = [
"PyQt6",
"napari[pyqt6]",
]
pyside = [
"PySide2!=5.15.0,>=5.12.3",
"PartSeg[pyside2]",
]
pyside2 = [
"PySide2!=5.15.0,>=5.12.3",
"napari[pyside]",
]
pyside6 = [
"PySide6",
"napari[pyside6_experimental]",
]
test = [
"coverage",
Expand Down

0 comments on commit 0e5a47d

Please sign in to comment.