scmrepo 1.5.0__tar.gz → 1.6.0__tar.gz

{scmrepo-1.5.0 → scmrepo-1.6.0}/.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/iterative/py-template",
-  "commit": "0aac03d10cbc7b2f7e144e728de5043b7a3458cb",
+  "commit": "15ee26df315020399731c6291d61bef81a3fc5d3",
   "context": {
     "cookiecutter": {
       "project_name": "scmrepo",

{scmrepo-1.5.0 → scmrepo-1.6.0}/.gitignore

@@ -136,3 +136,5 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
+
+.DS_Store

{scmrepo-1.5.0 → scmrepo-1.6.0}/.pre-commit-config.yaml

@@ -1,10 +1,6 @@
 default_language_version:
   python: python3
 repos:
-  - repo: https://github.com/psf/black
-    rev: 23.9.1
-    hooks:
-      - id: black
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
@@ -24,6 +20,12 @@ repos:
         args: ['--fix=lf']
       - id: sort-simple-yaml
       - id: trailing-whitespace
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: 'v0.1.5'
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.5
     hooks:
@@ -34,22 +36,3 @@ repos:
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - flake8-bugbear==23.7.10
-          - flake8-comprehensions==3.14.0
-          - flake8-debugger==4.1.2
-          - flake8-string-format==0.3.0
-  - repo: https://github.com/pycqa/bandit
-    rev: 1.7.5
-    hooks:
-      - id: bandit
-        args: ["-c", "pyproject.toml"]
-        additional_dependencies: [".[toml]"]

{scmrepo-1.5.0/src/scmrepo.egg-info → scmrepo-1.6.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 1.5.0
-Summary: SCM wrapper and fsspec filesystem for Git for use in DVC
-Home-page: https://github.com/iterative/scmrepo
-Maintainer-email: support@dvc.org
+Version: 1.6.0
+Summary: scmrepo
+Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
-Platform: any
+Project-URL: Issues, https://github.com/iterative/scmrepo/issues
+Project-URL: Source, https://github.com/iterative/scmrepo
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -24,14 +24,13 @@ Requires-Dist: pathspec>=0.9.0
 Requires-Dist: asyncssh<3,>=2.13.1
 Requires-Dist: funcy>=1.14
 Requires-Dist: shortuuid>=0.5.0
-Requires-Dist: dvc-objects<2,>=1.0.1
+Requires-Dist: dvc-objects<3,>=1.0.1
 Requires-Dist: dvc-http>=2.29.0
 Provides-Extra: tests
 Requires-Dist: pytest==7.2.0; extra == "tests"
 Requires-Dist: pytest-sugar==0.9.5; extra == "tests"
 Requires-Dist: pytest-cov==3.0.0; extra == "tests"
 Requires-Dist: pytest-mock==3.8.2; extra == "tests"
-Requires-Dist: pylint==2.15.0; extra == "tests"
 Requires-Dist: mypy==0.971; extra == "tests"
 Requires-Dist: pytest-test-utils==0.0.8; extra == "tests"
 Requires-Dist: pytest-asyncio==0.18.3; extra == "tests"
@@ -42,20 +41,7 @@ Requires-Dist: types-certifi==2021.10.8.3; extra == "tests"
 Requires-Dist: types-mock==5.1.0.2; extra == "tests"
 Requires-Dist: types-paramiko==3.3.0.0; extra == "tests"
 Provides-Extra: dev
-Requires-Dist: pytest==7.2.0; extra == "dev"
-Requires-Dist: pytest-sugar==0.9.5; extra == "dev"
-Requires-Dist: pytest-cov==3.0.0; extra == "dev"
-Requires-Dist: pytest-mock==3.8.2; extra == "dev"
-Requires-Dist: pylint==2.15.0; extra == "dev"
-Requires-Dist: mypy==0.971; extra == "dev"
-Requires-Dist: pytest-test-utils==0.0.8; extra == "dev"
-Requires-Dist: pytest-asyncio==0.18.3; extra == "dev"
-Requires-Dist: pytest-docker==0.12.0; (python_version < "3.10" and implementation_name != "pypy") and extra == "dev"
-Requires-Dist: mock==5.1.0; extra == "dev"
-Requires-Dist: paramiko==3.3.1; extra == "dev"
-Requires-Dist: types-certifi==2021.10.8.3; extra == "dev"
-Requires-Dist: types-mock==5.1.0.2; extra == "dev"
-Requires-Dist: types-paramiko==3.3.0.0; extra == "dev"
+Requires-Dist: scmrepo[tests]; extra == "dev"
 
 scmrepo
 =======

{scmrepo-1.5.0 → scmrepo-1.6.0}/noxfile.py

@@ -29,7 +29,6 @@ def lint(session: nox.Session) -> None:
     args = *(session.posargs or ("--show-diff-on-failure",)), "--all-files"
     session.run("pre-commit", "run", *args)
     session.run("python", "-m", "mypy")
-    session.run("python", "-m", "pylint", *locations)
 
 
 @nox.session

scmrepo-1.6.0/pyproject.toml

@@ -0,0 +1,126 @@
+[build-system]
+requires = ["setuptools>=48", "setuptools_scm[toml]>=6.3.1"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+
+[project]
+name = "scmrepo"
+description = "scmrepo"
+readme = "README.rst"
+license = {text = "Apache-2.0"}
+authors = [{ name = "Iterative", email = "support@dvc.org" }]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Development Status :: 4 - Beta",
+]
+requires-python = ">=3.8"
+dynamic = ["version"]
+dependencies = [
+    "gitpython>3",
+    "dulwich>=0.21.6",
+    "pygit2>=1.13.3",
+    "pygtrie>=2.3.2",
+    "fsspec>=2021.7.0",
+    "pathspec>=0.9.0",
+    "asyncssh>=2.13.1,<3",
+    "funcy>=1.14",
+    "shortuuid>=0.5.0",
+    "dvc-objects>=1.0.1,<3",
+    "dvc-http>=2.29.0",
+]
+
+[project.urls]
+Issues = "https://github.com/iterative/scmrepo/issues"
+Source = "https://github.com/iterative/scmrepo"
+
+[project.optional-dependencies]
+tests = [
+    "pytest==7.2.0",
+    "pytest-sugar==0.9.5",
+    "pytest-cov==3.0.0",
+    "pytest-mock==3.8.2",
+    "mypy==0.971",
+    "pytest-test-utils==0.0.8",
+    "pytest-asyncio==0.18.3",
+    # https://github.com/docker/docker-py/issues/2902
+    "pytest-docker==0.12.0; python_version < '3.10' and implementation_name != 'pypy'",
+    "mock==5.1.0",
+    "paramiko==3.3.1",
+    "types-certifi==2021.10.8.3",
+    "types-mock==5.1.0.2",
+    "types-paramiko==3.3.0.0",
+]
+dev = [
+    "scmrepo[tests]",
+]
+
+[tool.setuptools.package-data]
+dvc_objects = ["py.typed"]
+
+[tool.setuptools.packages.find]
+where = ["src"]
+namespaces = false
+
+[tool.pytest.ini_options]
+addopts = "-ra"
+markers = [
+    "skip_git_backend: skip tests for given backend",
+    "slow: mark test as slow to run",
+]
+
+[tool.coverage.run]
+branch = true
+source = ["scmrepo", "tests"]
+
+[tool.coverage.paths]
+source = ["src", "*/site-packages"]
+
+[tool.coverage.report]
+show_missing = true
+exclude_lines = [
+    "pragma: no cover",
+    "if __name__ == .__main__.:",
+    "if typing.TYPE_CHECKING:",
+    "if TYPE_CHECKING:",
+    "raise NotImplementedError",
+    "raise AssertionError",
+    "@overload",
+]
+
+[tool.mypy]
+# Error output
+show_column_numbers = true
+show_error_codes = true
+show_error_context = true
+show_traceback = true
+pretty = true
+check_untyped_defs = false
+# Warnings
+warn_no_return = true
+warn_redundant_casts = true
+warn_unreachable = true
+files = ["src", "tests"]
+
+[[tool.mypy.overrides]]
+module = [
+    "pygtrie",
+    "dvc_http.*",
+    "funcy",
+    "git",
+    "gitdb.*",
+    "fsspec.*",
+    "pathspec.patterns",
+    "asyncssh.*",
+    "pygit2.*",
+    "pytest_docker.plugin",
+    "urllib3.*",
+]
+ignore_missing_imports = true
+
+[tool.codespell]
+ignore-words-list = "cachable, keypair"

scmrepo-1.6.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{scmrepo-1.5.0 → scmrepo-1.6.0}/src/scmrepo/git/credentials.py

@@ -292,7 +292,8 @@ def _input_tty(prompt: str = "Username: ") -> str:
     with ExitStack() as stack:
         try:
             fd = os.open(
-                "/dev/tty", os.O_RDWR | os.O_NOCTTY  # pylint: disable=no-member
+                "/dev/tty",
+                os.O_RDWR | os.O_NOCTTY,  # pylint: disable=no-member
             )
             tty = io.FileIO(fd, "w+")
             stack.enter_context(tty)

{scmrepo-1.5.0 → scmrepo-1.6.0}/src/scmrepo/git/lfs/client.py

@@ -190,15 +190,10 @@ class LFSClient(AbstractContextManager):
         **kwargs,
     ):
         async def _get_one(from_path: str, to_path: str, **kwargs):
-            get_coro = callback.wrap_and_branch_coro(
-                self.httpfs._get_file  # pylint: disable=protected-access
-            )
             with as_atomic(localfs, to_path, create_parents=True) as tmp_file:
-                return await get_coro(
-                    from_path,
-                    tmp_file,
-                    **kwargs,
-                )
+                with callback.branch(from_path, tmp_file, kwargs):
+                    await self.httpfs._get_file(from_path, tmp_file, **kwargs)  # pylint: disable=protected-access
+                    callback.relative_update()
 
         resp_data = await self._batch_request(objects, **kwargs)
         if resp_data.get("transfer") != "basic":

{scmrepo-1.5.0 → scmrepo-1.6.0/src/scmrepo.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 1.5.0
-Summary: SCM wrapper and fsspec filesystem for Git for use in DVC
-Home-page: https://github.com/iterative/scmrepo
-Maintainer-email: support@dvc.org
+Version: 1.6.0
+Summary: scmrepo
+Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
-Platform: any
+Project-URL: Issues, https://github.com/iterative/scmrepo/issues
+Project-URL: Source, https://github.com/iterative/scmrepo
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -24,14 +24,13 @@ Requires-Dist: pathspec>=0.9.0
 Requires-Dist: asyncssh<3,>=2.13.1
 Requires-Dist: funcy>=1.14
 Requires-Dist: shortuuid>=0.5.0
-Requires-Dist: dvc-objects<2,>=1.0.1
+Requires-Dist: dvc-objects<3,>=1.0.1
 Requires-Dist: dvc-http>=2.29.0
 Provides-Extra: tests
 Requires-Dist: pytest==7.2.0; extra == "tests"
 Requires-Dist: pytest-sugar==0.9.5; extra == "tests"
 Requires-Dist: pytest-cov==3.0.0; extra == "tests"
 Requires-Dist: pytest-mock==3.8.2; extra == "tests"
-Requires-Dist: pylint==2.15.0; extra == "tests"
 Requires-Dist: mypy==0.971; extra == "tests"
 Requires-Dist: pytest-test-utils==0.0.8; extra == "tests"
 Requires-Dist: pytest-asyncio==0.18.3; extra == "tests"
@@ -42,20 +41,7 @@ Requires-Dist: types-certifi==2021.10.8.3; extra == "tests"
 Requires-Dist: types-mock==5.1.0.2; extra == "tests"
 Requires-Dist: types-paramiko==3.3.0.0; extra == "tests"
 Provides-Extra: dev
-Requires-Dist: pytest==7.2.0; extra == "dev"
-Requires-Dist: pytest-sugar==0.9.5; extra == "dev"
-Requires-Dist: pytest-cov==3.0.0; extra == "dev"
-Requires-Dist: pytest-mock==3.8.2; extra == "dev"
-Requires-Dist: pylint==2.15.0; extra == "dev"
-Requires-Dist: mypy==0.971; extra == "dev"
-Requires-Dist: pytest-test-utils==0.0.8; extra == "dev"
-Requires-Dist: pytest-asyncio==0.18.3; extra == "dev"
-Requires-Dist: pytest-docker==0.12.0; (python_version < "3.10" and implementation_name != "pypy") and extra == "dev"
-Requires-Dist: mock==5.1.0; extra == "dev"
-Requires-Dist: paramiko==3.3.1; extra == "dev"
-Requires-Dist: types-certifi==2021.10.8.3; extra == "dev"
-Requires-Dist: types-mock==5.1.0.2; extra == "dev"
-Requires-Dist: types-paramiko==3.3.0.0; extra == "dev"
+Requires-Dist: scmrepo[tests]; extra == "dev"
 
 scmrepo
 =======

{scmrepo-1.5.0 → scmrepo-1.6.0}/src/scmrepo.egg-info/SOURCES.txt

@@ -9,7 +9,6 @@ LICENSE
 README.rst
 noxfile.py
 pyproject.toml
-setup.cfg
 .github/dependabot.yml
 .github/workflows/release.yaml
 .github/workflows/tests.yaml
@@ -26,7 +25,6 @@ src/scmrepo/utils.py
 src/scmrepo.egg-info/PKG-INFO
 src/scmrepo.egg-info/SOURCES.txt
 src/scmrepo.egg-info/dependency_links.txt
-src/scmrepo.egg-info/not-zip-safe
 src/scmrepo.egg-info/requires.txt
 src/scmrepo.egg-info/top_level.txt
 src/scmrepo/git/__init__.py

{scmrepo-1.5.0 → scmrepo-1.6.0}/src/scmrepo.egg-info/requires.txt

@@ -7,33 +7,17 @@ pathspec>=0.9.0
 asyncssh<3,>=2.13.1
 funcy>=1.14
 shortuuid>=0.5.0
-dvc-objects<2,>=1.0.1
+dvc-objects<3,>=1.0.1
 dvc-http>=2.29.0
 
 [dev]
-pytest==7.2.0
-pytest-sugar==0.9.5
-pytest-cov==3.0.0
-pytest-mock==3.8.2
-pylint==2.15.0
-mypy==0.971
-pytest-test-utils==0.0.8
-pytest-asyncio==0.18.3
-mock==5.1.0
-paramiko==3.3.1
-types-certifi==2021.10.8.3
-types-mock==5.1.0.2
-types-paramiko==3.3.0.0
-
-[dev:python_version < "3.10" and implementation_name != "pypy"]
-pytest-docker==0.12.0
+scmrepo[tests]
 
 [tests]
 pytest==7.2.0
 pytest-sugar==0.9.5
 pytest-cov==3.0.0
 pytest-mock==3.8.2
-pylint==2.15.0
 mypy==0.971
 pytest-test-utils==0.0.8
 pytest-asyncio==0.18.3

{scmrepo-1.5.0 → scmrepo-1.6.0}/tests/test_credentials.py

@@ -174,13 +174,11 @@ def test_get_matching_commands():
     from dulwich.config import ConfigFile
 
     config_file = io.BytesIO(
-        """
+        b"""
 [credential]
     helper = /usr/local/bin/my-helper
     UseHttpPath = true
-""".encode(
-            "ascii"
-        )
+"""
     )
     config_file.seek(0)
     config = ConfigFile.from_file(config_file)
@@ -189,12 +187,10 @@ def test_get_matching_commands():
     ) == [("/usr/local/bin/my-helper", True)]
 
     config_file = io.BytesIO(
-        """
+        b"""
 [credential]
     helper = /usr/local/bin/my-helper
-""".encode(
-            "ascii"
-        )
+"""
     )
     config_file.seek(0)
     config = ConfigFile.from_file(config_file)
@@ -203,12 +199,10 @@ def test_get_matching_commands():
     ) == [("/usr/local/bin/my-helper", False)]
 
     config_file = io.BytesIO(
-        """
+        b"""
 [credential]
     helper =
-""".encode(
-            "ascii"
-        )
+"""
     )
     config_file.seek(0)
     config = ConfigFile.from_file(config_file)

scmrepo-1.5.0/pyproject.toml

@@ -1,109 +0,0 @@
-[build-system]
-requires = ["setuptools>=48", "setuptools_scm[toml]>=6.3.1"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools_scm]
-
-[tool.black]
-line-length = 88
-include = '\.pyi?$'
-exclude = '''
-/(
-    \.eggs
-  | \.git
-  | \.hg
-  | \.mypy_cache
-  | \.tox
-  | \.venv
-  | _build
-  | buck-out
-  | build
-  | dist
-)/
-'''
-
-[tool.isort]
-profile = "black"
-known_first_party = ["scmrepo"]
-line_length = 88
-
-[tool.pytest.ini_options]
-addopts = "-ra"
-markers = [
-    "skip_git_backend: skip tests for given backend",
-    "slow: mark test as slow to run",
-]
-
-[tool.coverage.run]
-branch = true
-source = ["scmrepo", "tests"]
-
-[tool.coverage.paths]
-source = ["src", "*/site-packages"]
-
-[tool.coverage.report]
-show_missing = true
-exclude_lines = [
-    "pragma: no cover",
-    "if __name__ == .__main__.:",
-    "if typing.TYPE_CHECKING:",
-    "if TYPE_CHECKING:",
-    "raise NotImplementedError",
-    "raise AssertionError",
-    "@overload",
-]
-
-[tool.mypy]
-# Error output
-show_column_numbers = true
-show_error_codes = true
-show_error_context = true
-show_traceback = true
-pretty = true
-check_untyped_defs = false
-# Warnings
-warn_no_return = true
-warn_redundant_casts = true
-warn_unreachable = true
-files = ["src", "tests"]
-
-[[tool.mypy.overrides]]
-module = [
-    "pygtrie",
-    "dvc_http.*",
-    "funcy",
-    "git",
-    "gitdb.*",
-    "fsspec.*",
-    "pathspec.patterns",
-    "asyncssh.*",
-    "pygit2.*",
-    "pytest_docker.plugin",
-    "urllib3.*",
-]
-ignore_missing_imports = true
-
-[tool.pylint.format]
-max-line-length = 88
-
-[tool.pylint.master]
-extension-pkg-whitelist = ["pygit2"]
-
-[tool.pylint.message_control]
-disable = [
-    "format", "refactoring", "design", "invalid-name", "duplicate-code",
-    "missing-function-docstring", "missing-module-docstring", "missing-class-docstring",
-    "raise-missing-from", "import-outside-toplevel", "cyclic-import", "fixme",
-]
-enable = ["c-extension-no-member", "no-else-return"]
-
-[tool.pylint.variables]
-dummy-variables-rgx = "_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_"
-ignored-argument-names = "_.*|^ignored_|^unused_|args|kwargs"
-
-[tool.codespell]
-ignore-words-list = "cachable, keypair"
-
-[tool.bandit]
-exclude_dirs = ["tests"]
-skips = ["B101"]

scmrepo-1.5.0/setup.cfg

@@ -1,82 +0,0 @@
-[metadata]
-description = SCM wrapper and fsspec filesystem for Git for use in DVC
-name = scmrepo
-long_description = file: README.rst
-long_description_content_type = text/x-rst
-license = Apache-2.0
-license_file = LICENSE
-url = https://github.com/iterative/scmrepo
-platforms = any
-authors = Iterative
-maintainer_email = support@dvc.org
-classifiers = 
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.8
-	Programming Language :: Python :: 3.9
-	Programming Language :: Python :: 3.10
-	Programming Language :: Python :: 3.11
-	Development Status :: 4 - Beta
-
-[options]
-python_requires = >=3.8
-zip_safe = False
-package_dir = 
-	=src
-packages = find:
-install_requires = 
-	gitpython>3
-	dulwich>=0.21.6
-	pygit2>=1.13.3
-	pygtrie>=2.3.2
-	fsspec>=2021.7.0
-	pathspec>=0.9.0
-	asyncssh>=2.13.1,<3
-	funcy>=1.14
-	shortuuid>=0.5.0
-	dvc-objects>=1.0.1,<2
-	dvc-http>=2.29.0
-
-[options.extras_require]
-tests = 
-	pytest==7.2.0
-	pytest-sugar==0.9.5
-	pytest-cov==3.0.0
-	pytest-mock==3.8.2
-	pylint==2.15.0
-	mypy==0.971
-	pytest-test-utils==0.0.8
-	pytest-asyncio==0.18.3
-	pytest-docker==0.12.0; python_version < '3.10' and implementation_name != 'pypy'
-	mock==5.1.0
-	paramiko==3.3.1
-	types-certifi==2021.10.8.3
-	types-mock==5.1.0.2
-	types-paramiko==3.3.0.0
-dev = 
-	%(tests)s
-
-[options.packages.find]
-exclude = 
-	tests
-	tests.*
-where = src
-
-[options.package_data]
-scmrepo = py.typed
-
-[flake8]
-ignore = 
-	E203
-	E266
-	W503
-	P1
-max_line_length = 88
-max-complexity = 15
-select = B,C,E,F,W,T4,B902,T,P
-show_source = true
-count = true
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

scmrepo-1.5.0/src/scmrepo.egg-info/not-zip-safe

@@ -1 +0,0 @@
-