From 8ecd624f9390d4bc01963714b6784952ba669ebc Mon Sep 17 00:00:00 2001 From: Jean-Christophe Morin Date: Mon, 14 Oct 2024 10:52:05 -0400 Subject: [PATCH] Update python for the flake8 workflow Signed-off-by: Jean-Christophe Morin --- .github/workflows/flake8.yaml | 2 +- src/rez/package_order.py | 12 ++++++------ src/rez/tests/test_build.py | 2 +- src/rezplugins/shell/_utils/powershell_base.py | 1 - 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml index 31962d070..bef1aead8 100644 --- a/.github/workflows/flake8.yaml +++ b/.github/workflows/flake8.yaml @@ -34,7 +34,7 @@ jobs: - name: Set up Python uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 with: - python-version: 3.7 + python-version: 3.11 - name: Install Dependencies run: | diff --git a/src/rez/package_order.py b/src/rez/package_order.py index e60662d77..706c5f0ca 100644 --- a/src/rez/package_order.py +++ b/src/rez/package_order.py @@ -177,7 +177,7 @@ def __str__(self): raise NotImplementedError def __eq__(self, other): - return type(self) == type(other) and str(self) == str(other) + return type(self) == type(other) and str(self) == str(other) # noqa: E721 def __ne__(self, other): return not self == other @@ -204,7 +204,7 @@ def __str__(self): return "{}" def __eq__(self, other): - return type(self) == type(other) + return type(self) == type(other) # noqa: E721 def to_pod(self): """ @@ -250,7 +250,7 @@ def __str__(self): return str(self.descending) def __eq__(self, other): - return ( + return ( # noqa: E721 type(self) == type(other) and self.descending == other.descending ) @@ -327,7 +327,7 @@ def __str__(self): return str((items, str(self.default_order))) def __eq__(self, other): - return ( + return ( # noqa: E721 type(other) == type(self) and self.order_dict == other.order_dict and self.default_order == other.default_order @@ -419,7 +419,7 @@ def __str__(self): return str(self.first_version) def __eq__(self, other): - return ( + return ( # noqa: E721 type(other) == type(self) and self.first_version == other.first_version ) @@ -582,7 +582,7 @@ def __str__(self): return str((self.timestamp, self.rank)) def __eq__(self, other): - return ( + return ( # noqa: E721 type(other) == type(self) and self.timestamp == other.timestamp and self.rank == other.rank diff --git a/src/rez/tests/test_build.py b/src/rez/tests/test_build.py index 66c8981ff..72fce4885 100644 --- a/src/rez/tests/test_build.py +++ b/src/rez/tests/test_build.py @@ -9,7 +9,7 @@ from rez.build_process import create_build_process from rez.build_system import create_build_system from rez.resolved_context import ResolvedContext -from rez.exceptions import BuildError, BuildContextResolveError,\ +from rez.exceptions import BuildError, BuildContextResolveError, \ PackageFamilyNotFoundError import unittest from rez.tests.util import TestBase, TempdirMixin, find_file_in_path, \ diff --git a/src/rezplugins/shell/_utils/powershell_base.py b/src/rezplugins/shell/_utils/powershell_base.py index ccd7bdd36..89074efef 100644 --- a/src/rezplugins/shell/_utils/powershell_base.py +++ b/src/rezplugins/shell/_utils/powershell_base.py @@ -4,7 +4,6 @@ import os import re -from subprocess import PIPE from rez.config import config from rez.rex import RexExecutor, OutputStyle, EscapedString