From f2b5b52e65f2c03169ea2a0ed5eb9deb997f5b7a Mon Sep 17 00:00:00 2001 From: Ken Lauer <5139267+klauer@users.noreply.github.com> Date: Sun, 8 Dec 2024 10:00:27 -0800 Subject: [PATCH 1/5] DEV: pre-commit autoupdate --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 1efe841fe20cc16698b0c0ae4632d71477f2e2eb Mon Sep 17 00:00:00 2001 From: Ken Lauer <5139267+klauer@users.noreply.github.com> Date: Sun, 8 Dec 2024 10:00:42 -0800 Subject: [PATCH 2/5] STY: flake8 --- qtpynodeeditor/node_graphics_object.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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) From b7e477633519c39692d5f77d28b005a7d86344fa Mon Sep 17 00:00:00 2001 From: Ken Lauer <5139267+klauer@users.noreply.github.com> Date: Sun, 8 Dec 2024 10:01:44 -0800 Subject: [PATCH 3/5] DEV: versioneer file should not be tracked --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) 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 From 6922871ee3665243e13b013d8e4396475d1529e2 Mon Sep 17 00:00:00 2001 From: Ken Lauer <5139267+klauer@users.noreply.github.com> Date: Sun, 8 Dec 2024 10:05:51 -0800 Subject: [PATCH 4/5] CI: can we test on 3.12 and 3.13 too? --- .github/workflows/pcds.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pcds.yml b/.github/workflows/pcds.yml index 1b2c131..f33162b 100644 --- a/.github/workflows/pcds.yml +++ b/.github/workflows/pcds.yml @@ -19,11 +19,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: "Conda" uses: pcdshub/pcds-ci-helpers/.github/workflows/python-conda-test.yml@master @@ -42,11 +43,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 From cc726dcd8c364b25993c8058142261fe9a4e591e Mon Sep 17 00:00:00 2001 From: Ken Lauer <5139267+klauer@users.noreply.github.com> Date: Sun, 8 Dec 2024 10:10:23 -0800 Subject: [PATCH 5/5] CI: remove 3.13 conda --- .github/workflows/pcds.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pcds.yml b/.github/workflows/pcds.yml index f33162b..5da8a59 100644 --- a/.github/workflows/pcds.yml +++ b/.github/workflows/pcds.yml @@ -24,7 +24,6 @@ jobs: - python-version: "3.10" - python-version: "3.11" - python-version: "3.12" - - python-version: "3.13" name: "Conda" uses: pcdshub/pcds-ci-helpers/.github/workflows/python-conda-test.yml@master