diff --git a/.github/workflows/pcds.yml b/.github/workflows/pcds.yml index 1b2c131..5da8a59 100644 --- a/.github/workflows/pcds.yml +++ b/.github/workflows/pcds.yml @@ -19,11 +19,11 @@ jobs: fail-fast: false matrix: include: - - python-version: "3.9" - deploy-on-success: true - - python-version: "3.10" - - python-version: "3.11" - experimental: true + - python-version: "3.9" + deploy-on-success: true + - python-version: "3.10" + - python-version: "3.11" + - python-version: "3.12" name: "Conda" uses: pcdshub/pcds-ci-helpers/.github/workflows/python-conda-test.yml@master @@ -42,11 +42,12 @@ jobs: fail-fast: false matrix: include: - - python-version: "3.9" - deploy-on-success: true - - python-version: "3.10" - - python-version: "3.11" - experimental: true + - python-version: "3.9" + deploy-on-success: true + - python-version: "3.10" + - python-version: "3.11" + - python-version: "3.12" + - python-version: "3.13" name: "Pip" uses: pcdshub/pcds-ci-helpers/.github/workflows/python-pip-test.yml@master diff --git a/.gitignore b/.gitignore index 4c1e673..df6b106 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,6 @@ target/ #Ipython Notebook .ipynb_checkpoints + +# versioneer +qtpynodeeditor/_version.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a4ba65c..e1d98bb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ exclude: | repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v5.0.0 hooks: - id: no-commit-to-branch - id: trailing-whitespace @@ -23,11 +23,11 @@ repos: - id: debug-statements - repo: https://github.com/pycqa/flake8.git - rev: 6.0.0 + rev: 7.1.1 hooks: - id: flake8 - repo: https://github.com/timothycrosley/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort diff --git a/qtpynodeeditor/node_graphics_object.py b/qtpynodeeditor/node_graphics_object.py index 8d3245a..7ec06b6 100644 --- a/qtpynodeeditor/node_graphics_object.py +++ b/qtpynodeeditor/node_graphics_object.py @@ -333,8 +333,10 @@ def embed_q_widget(self): # If the widget wants to use as much vertical space as possible, set it # to have the geomtry's equivalent_widget_height. - if (widget.sizePolicy().verticalPolicy() == QSizePolicy.MinimumExpanding or - widget.sizePolicy().verticalPolicy() == QSizePolicy.Expanding): + if ( + widget.sizePolicy().verticalPolicy() == QSizePolicy.MinimumExpanding + or widget.sizePolicy().verticalPolicy() == QSizePolicy.Expanding + ): self._proxy_widget.setMinimumHeight(geom.equivalent_widget_height()) self._proxy_widget.setPos(geom.widget_position)