ruff check

Author: jdavid

build_tag.py

@@ -1,4 +1,5 @@
-import platform, sys
+import platform
+import sys
 
 py = {'CPython': 'cp', 'PyPy': 'pp'}[platform.python_implementation()]
 print(f'{py}{sys.version_info.major}{sys.version_info.minor}')

docs/conf.py

@@ -4,7 +4,8 @@
 # list see the documentation:
 # http://www.sphinx-doc.org/en/master/config
 
-import os, sys
+import os
+import sys
 
 # -- Path setup --------------------------------------------------------------
 

pygit2/credentials.py

@@ -23,8 +23,6 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-from .ffi import C
-
 from .enums import CredentialType
 
 

pygit2/utils.py

@@ -113,18 +113,18 @@ class StrArray:
     contents of 'struct' only remain valid within the StrArray context.
     """
 
-    def __init__(self, l):
+    def __init__(self, lst):
         # Allow passing in None as lg2 typically considers them the same as empty
-        if l is None:
+        if lst is None:
             self.__array = ffi.NULL
             return
 
-        if not isinstance(l, (list, tuple)):
+        if not isinstance(lst, (list, tuple)):
             raise TypeError('Value must be a list')
 
-        strings = [None] * len(l)
-        for i in range(len(l)):
-            li = l[i]
+        strings = [None] * len(lst)
+        for i in range(len(lst)):
+            li = lst[i]
             if not isinstance(li, str) and not hasattr(li, '__fspath__'):
                 raise TypeError('Value must be a string or PathLike object')
 

pyproject.toml

@@ -25,14 +25,8 @@ environment = {LIBGIT2_VERSION="1.9.0", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSIO
 repair-wheel-command = "DYLD_LIBRARY_PATH=/Users/runner/work/pygit2/pygit2/ci/lib delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"
 
 [tool.ruff]
+extend-exclude = [ ".cache", ".coverage", "build", "site-packages", "venv*"]
 target-version = "py310"  # oldest supported Python version
-fix = true
-extend-exclude = [
-    ".cache",
-    ".coverage",
-    "build",
-    "venv*",
-]
 
 [tool.ruff.format]
 quote-style = "single"

test/test_diff.py

@@ -220,7 +220,7 @@ def get_context_for_lines(diff):
 
 def test_diff_revparse(barerepo):
     diff = barerepo.diff('HEAD', 'HEAD~6')
-    assert type(diff) == pygit2.Diff
+    assert type(diff) is pygit2.Diff
 
 
 def test_diff_tree_opts(barerepo):

test/test_object.py

@@ -88,7 +88,7 @@ def test_peel_commit(testrepo):
     # and peel to the tree
     tree = commit.peel(ObjectType.TREE)
 
-    assert type(tree) == Tree
+    assert type(tree) is Tree
     assert tree.id == 'fd937514cb799514d4b81bb24c5fcfeb6472b245'
 
 
@@ -97,7 +97,7 @@ def test_peel_commit_type(testrepo):
     commit = testrepo[commit_id]
     tree = commit.peel(Tree)
 
-    assert type(tree) == Tree
+    assert type(tree) is Tree
     assert tree.id == 'fd937514cb799514d4b81bb24c5fcfeb6472b245'
 
 

test/test_odb.py

@@ -91,4 +91,4 @@ def test_write(odb):
         odb.write(ObjectType.ANY, data)
 
     oid = odb.write(ObjectType.BLOB, data)
-    assert type(oid) == Oid
+    assert type(oid) is Oid

test/test_remote.py

@@ -23,7 +23,6 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-from unittest.mock import patch
 import sys
 
 import pytest
@@ -50,7 +49,7 @@ def test_remote_create(testrepo):
 
     remote = testrepo.remotes.create(name, url)
 
-    assert type(remote) == pygit2.Remote
+    assert type(remote) is pygit2.Remote
     assert name == remote.name
     assert url == remote.url
     assert remote.push_url is None
@@ -66,7 +65,7 @@ def test_remote_create_with_refspec(testrepo):
 
     remote = testrepo.remotes.create(name, url, fetch)
 
-    assert type(remote) == pygit2.Remote
+    assert type(remote) is pygit2.Remote
     assert name == remote.name
     assert url == remote.url
     assert [fetch] == remote.fetch_refspecs
@@ -140,7 +139,7 @@ def test_refspec(testrepo):
     assert refspec.force is True
     assert ORIGIN_REFSPEC == refspec.string
 
-    assert list == type(remote.fetch_refspecs)
+    assert list is type(remote.fetch_refspecs)
     assert 1 == len(remote.fetch_refspecs)
     assert ORIGIN_REFSPEC == remote.fetch_refspecs[0]
 
@@ -149,18 +148,18 @@ def test_refspec(testrepo):
     assert 'refs/remotes/origin/master' == refspec.transform('refs/heads/master')
     assert 'refs/heads/master' == refspec.rtransform('refs/remotes/origin/master')
 
-    assert list == type(remote.push_refspecs)
+    assert list is type(remote.push_refspecs)
     assert 0 == len(remote.push_refspecs)
 
     push_specs = remote.push_refspecs
-    assert list == type(push_specs)
+    assert list is type(push_specs)
     assert 0 == len(push_specs)
 
     testrepo.remotes.add_fetch('origin', '+refs/test/*:refs/test/remotes/*')
     remote = testrepo.remotes['origin']
 
     fetch_specs = remote.fetch_refspecs
-    assert list == type(fetch_specs)
+    assert list is type(fetch_specs)
     assert 2 == len(fetch_specs)
     assert [
         '+refs/heads/*:refs/remotes/origin/*',

test/test_repository.py

@@ -596,7 +596,7 @@ def test_new_repo(tmp_path):
     repo = init_repository(tmp_path, False)
 
     oid = repo.write(ObjectType.BLOB, 'Test')
-    assert type(oid) == Oid
+    assert type(oid) is Oid
 
     assert (tmp_path / '.git').exists()
 

test/test_repository_bare.py

@@ -54,7 +54,7 @@ def test_is_bare(barerepo):
 def test_head(barerepo):
     head = barerepo.head
     assert HEAD_SHA == head.target
-    assert type(head) == pygit2.Reference
+    assert type(head) is pygit2.Reference
     assert not barerepo.head_is_unborn
     assert not barerepo.head_is_detached
 
@@ -94,7 +94,7 @@ def test_write(barerepo):
         barerepo.write(ObjectType.ANY, data)
 
     oid = barerepo.write(ObjectType.BLOB, data)
-    assert type(oid) == pygit2.Oid
+    assert type(oid) is pygit2.Oid
 
 
 def test_contains(barerepo):