diff --git a/.cruft.json b/.cruft.json index ee539d4..31589f1 100644 --- a/.cruft.json +++ b/.cruft.json @@ -6,9 +6,9 @@ "project_name": "scmrepo", "package_name": "scmrepo", "friendly_name": "scmrepo", - "author": "Iterative", + "author": "Treeverse", "email": "support@dvc.org", - "github_user": "iterative", + "github_user": "treeverse", "version": "0.0.0", "copyright_year": "2022", "license": "Apache-2.0", diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index a1a5c7d..896011a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -12,8 +12,8 @@ Here is a list of important resources for contributors: - `Code of Conduct`_ .. _Apache 2.0 license: https://opensource.org/licenses/Apache-2.0 -.. _Source Code: https://github.com/iterative/scmrepo -.. _Issue Tracker: https://github.com/iterative/scmrepo/issues +.. _Source Code: https://github.com/treeverse/scmrepo +.. _Issue Tracker: https://github.com/treeverse/scmrepo/issues How to report a bug ------------------- @@ -104,6 +104,6 @@ To run linting and code formatting checks, you can invoke a `lint` session in no It is recommended to open an issue before starting work on anything. This will allow a chance to talk it over with the owners and validate your approach. -.. _pull request: https://github.com/iterative/scmrepo/pulls +.. _pull request: https://github.com/treeverse/scmrepo/pulls .. github-only .. _Code of Conduct: CODE_OF_CONDUCT.rst diff --git a/LICENSE b/LICENSE index 6bc4e6e..c8413d4 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2022 Iterative. + Copyright 2025 Treeverse. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.rst b/README.rst index 194442e..3a41207 100644 --- a/README.rst +++ b/README.rst @@ -17,11 +17,11 @@ scmrepo .. |License| image:: https://img.shields.io/pypi/l/scmrepo :target: https://opensource.org/licenses/Apache-2.0 :alt: License -.. |Tests| image:: https://github.com/iterative/scmrepo/workflows/Tests/badge.svg - :target: https://github.com/iterative/scmrepo/actions?workflow=Tests +.. |Tests| image:: https://github.com/treeverse/scmrepo/workflows/Tests/badge.svg + :target: https://github.com/treeverse/scmrepo/actions?workflow=Tests :alt: Tests -.. |Codecov| image:: https://codecov.io/gh/iterative/scmrepo/branch/main/graph/badge.svg - :target: https://app.codecov.io/gh/iterative/scmrepo +.. |Codecov| image:: https://codecov.io/gh/treeverse/scmrepo/branch/main/graph/badge.svg + :target: https://app.codecov.io/gh/treeverse/scmrepo :alt: Codecov .. |pre-commit| image:: https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white :target: https://github.com/pre-commit/pre-commit @@ -106,7 +106,7 @@ please `file an issue`_ along with a detailed description. .. _fsspec: https://filesystem-spec.readthedocs.io/ .. _fsspec docs: https://filesystem-spec.readthedocs.io/en/latest/api.html?highlight=walk#fsspec.spec.AbstractFileSystem .. _PyPI: https://pypi.org/ -.. _file an issue: https://github.com/iterative/scmrepo/issues +.. _file an issue: https://github.com/treeverse/scmrepo/issues .. _pip: https://pip.pypa.io/ .. github-only .. _Contributor Guide: CONTRIBUTING.rst diff --git a/pyproject.toml b/pyproject.toml index 3334c0f..b703b74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ description = "scmrepo" readme = "README.rst" license = "Apache-2.0" license-files = ["LICENSE"] -authors = [{ name = "Iterative", email = "support@dvc.org" }] +authors = [{ name = "Treeverse", email = "support@dvc.org" }] classifiers = [ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.9", @@ -37,8 +37,8 @@ dependencies = [ ] [project.urls] -Issues = "https://github.com/iterative/scmrepo/issues" -Source = "https://github.com/iterative/scmrepo" +Issues = "https://github.com/treeverse/scmrepo/issues" +Source = "https://github.com/treeverse/scmrepo" [project.optional-dependencies] tests = [ diff --git a/src/scmrepo/git/__init__.py b/src/scmrepo/git/__init__.py index 16649ee..9ff57a4 100644 --- a/src/scmrepo/git/__init__.py +++ b/src/scmrepo/git/__init__.py @@ -294,8 +294,8 @@ def no_commits(self): # with the new backend. # # See: - # https://github.com/iterative/dvc/issues/5641 - # https://github.com/iterative/dvc/issues/7458 + # https://github.com/treeverse/dvc/issues/5641 + # https://github.com/treeverse/dvc/issues/7458 def _backend_func(self, name, *args, **kwargs) -> Any: backends: Iterable[str] = kwargs.pop("backends", self.backends) for key in backends: diff --git a/src/scmrepo/git/backend/dulwich/__init__.py b/src/scmrepo/git/backend/dulwich/__init__.py index e61820b..bb30972 100644 --- a/src/scmrepo/git/backend/dulwich/__init__.py +++ b/src/scmrepo/git/backend/dulwich/__init__.py @@ -119,7 +119,7 @@ def _get_ssh_vendor() -> "SSHVendor": return SubprocessSSHVendor() if sys.platform == "win32" and os.environ.get("MSYSTEM") and shutil.which("ssh"): - # see https://github.com/iterative/dvc/issues/7702 + # see https://github.com/treeverse/dvc/issues/7702 logger.debug( "dulwich: native win32 Python inside MSYS2/git-bash, using MSYS2 OpenSSH" ) @@ -375,7 +375,7 @@ def commit(self, msg: str, no_verify: bool = False): with reraise((Error, CommitError), SCMError("Git commit failed")): try: - commit(self.repo, message=msg, no_verify=no_verify) + commit(self.repo, message=msg, no_verify=no_verify, sign=False) except InvalidUserIdentity as exc: raise SCMError("Git username and email must be configured") from exc except TimezoneFormatError as exc: diff --git a/src/scmrepo/git/backend/gitpython.py b/src/scmrepo/git/backend/gitpython.py index d887675..1d791ee 100644 --- a/src/scmrepo/git/backend/gitpython.py +++ b/src/scmrepo/git/backend/gitpython.py @@ -103,7 +103,7 @@ def open( def name(self) -> str: # NOTE: `obj.name` is not always a basename. See [1] for more details. # - # [1] https://github.com/iterative/dvc/issues/3481 + # [1] https://github.com/treeverse/dvc/issues/3481 return os.path.basename(self.obj.path) @property @@ -266,7 +266,7 @@ def add( self.repo.index.add(paths if isinstance(paths, str) else list(paths)) except AssertionError as exc: # NOTE: GitPython is not currently able to handle index version >= 3. - # See https://github.com/iterative/dvc/issues/610 for more details. + # See https://github.com/treeverse/dvc/issues/610 for more details. raise UnsupportedIndexFormat from exc def commit(self, msg: str, no_verify: bool = False): diff --git a/src/scmrepo/git/backend/pygit2/__init__.py b/src/scmrepo/git/backend/pygit2/__init__.py index 43f90ae..a09cbab 100644 --- a/src/scmrepo/git/backend/pygit2/__init__.py +++ b/src/scmrepo/git/backend/pygit2/__init__.py @@ -259,7 +259,7 @@ def _get_checkout_strategy( # Workaround to force git_backend_odb_pack to release open file handles # in DVC's mixed git-backend environment. - # See https://github.com/iterative/dvc/issues/5641 + # See https://github.com/treeverse/dvc/issues/5641 @contextmanager def release_odb_handles(self): yield diff --git a/src/scmrepo/git/lfs/client.py b/src/scmrepo/git/lfs/client.py index 344b421..7bba3d7 100644 --- a/src/scmrepo/git/lfs/client.py +++ b/src/scmrepo/git/lfs/client.py @@ -58,7 +58,7 @@ async def get_client(**kwargs): return RetryClient( connector=aiohttp.TCPConnector( # Force cleanup of closed SSL transports. - # See https://github.com/iterative/dvc/issues/7414 + # See https://github.com/treeverse/dvc/issues/7414 enable_cleanup_closed=True, ), timeout=aiohttp.ClientTimeout( diff --git a/tests/test_git.py b/tests/test_git.py index c06ac92..58faede 100644 --- a/tests/test_git.py +++ b/tests/test_git.py @@ -428,7 +428,7 @@ def _gen(scm: Git, s: str, commit_timestamp: Optional[float] = None) -> str: f.write(s) scm.dulwich.add([s]) scm.dulwich.repo.get_worktree().commit( - message=s.encode("utf-8"), commit_timestamp=commit_timestamp + message=s.encode("utf-8"), commit_timestamp=commit_timestamp, sign=False ) return scm.get_rev() @@ -1117,7 +1117,7 @@ class _ProxyServer(ProxyTestCase): def test_clone_proxy_server(proxy_server: str, scm: Git, git: Git, tmp_dir: TmpDir): - url = "https://github.com/iterative/dvcyaml-schema" + url = "https://github.com/treeverse/dvcyaml-schema" p = ( Path(os.environ["HOME"] if "HOME" in os.environ else os.environ["USERPROFILE"]) @@ -1138,7 +1138,7 @@ def test_clone_proxy_server(proxy_server: str, scm: Git, git: Git, tmp_dir: TmpD def test_iter_remote_refs_proxy_server(proxy_server: str, scm: Git, tmp_dir: TmpDir): - url = "https://github.com/iterative/dvcyaml-schema" + url = "https://github.com/treeverse/dvcyaml-schema" git = GitBackends.DEFAULT["dulwich"](".") p = ( @@ -1164,7 +1164,7 @@ def test_iter_remote_refs_proxy_server(proxy_server: str, scm: Git, tmp_dir: Tmp def test_fetch_refspecs_proxy_server( proxy_server: str, scm: Git, git: Git, tmp_dir: TmpDir ): - url = "https://github.com/iterative/dvcyaml-schema" + url = "https://github.com/treeverse/dvcyaml-schema" p = ( Path(os.environ["HOME"] if "HOME" in os.environ else os.environ["USERPROFILE"]) diff --git a/tests/test_pygit2.py b/tests/test_pygit2.py index 52a0c7f..d30609b 100644 --- a/tests/test_pygit2.py +++ b/tests/test_pygit2.py @@ -68,9 +68,9 @@ def test_pygit_stash_apply_conflicts( @pytest.mark.parametrize( "url", [ - "git@github.com:iterative/scmrepo.git", - "github.com:iterative/scmrepo.git", - "user@github.com:iterative/scmrepo.git", + "git@github.com:treeverse/scmrepo.git", + "github.com:treeverse/scmrepo.git", + "user@github.com:treeverse/scmrepo.git", "ssh://login@server.com:12345/repository.git", ], ) @@ -104,11 +104,11 @@ def test_pygit_use_env_vars_for_signature( with pytest.raises(SCMError): getattr(git.pygit2, name) - mocker.patch.dict(os.environ, {f"GIT_{name.upper()}_EMAIL": "olivaw@iterative.ai"}) + mocker.patch.dict(os.environ, {f"GIT_{name.upper()}_EMAIL": "olivaw@treeverse.io"}) with pytest.raises(SCMError): getattr(git.pygit2, name) mocker.patch.dict(os.environ, {f"GIT_{name.upper()}_NAME": "R. Daneel Olivaw"}) assert getattr(git.pygit2, name) == Signature( - email="olivaw@iterative.ai", name="R. Daneel Olivaw" + email="olivaw@treeverse.io", name="R. Daneel Olivaw" ) diff --git a/tests/test_scmrepo.py b/tests/test_scmrepo.py index 3011690..b8fa50a 100644 --- a/tests/test_scmrepo.py +++ b/tests/test_scmrepo.py @@ -9,7 +9,7 @@ def test_clone(tmp_dir: TmpDir, matcher: type[Matcher]): progress = MagicMock() - url = "https://github.com/iterative/dvcyaml-schema" + url = "https://github.com/treeverse/dvcyaml-schema" rev = "cf279597596b54c5b0ce089eb4bda41ebbbb5db4" repo = Git.clone(url, "dir", rev=rev, progress=progress) @@ -20,7 +20,7 @@ def test_clone(tmp_dir: TmpDir, matcher: type[Matcher]): def test_clone_shallow(tmp_dir: TmpDir): - url = "https://github.com/iterative/dvcyaml-schema" + url = "https://github.com/treeverse/dvcyaml-schema" shallow_branch = "master" repo = Git.clone(url, "dir", shallow_branch=shallow_branch) diff --git a/tests/test_stash.py b/tests/test_stash.py index 06248bc..0514946 100644 --- a/tests/test_stash.py +++ b/tests/test_stash.py @@ -86,7 +86,7 @@ def test_git_stash_drop(tmp_dir: TmpDir, scm: Git, ref: Optional[str]): reason = """libgit2 stash_save() is flaky on linux when run inside pytest - https://github.com/iterative/dvc/pull/5286#issuecomment-792574294""" + https://github.com/treeverse/dvc/pull/5286#issuecomment-792574294""" @pytest.mark.xfail( diff --git a/tests/test_urls.py b/tests/test_urls.py index f953a68..d3e7970 100644 --- a/tests/test_urls.py +++ b/tests/test_urls.py @@ -6,9 +6,9 @@ @pytest.mark.parametrize( "url", [ - "git@github.com:iterative/scmrepo.git", - "github.com:iterative/scmrepo.git", - "user@github.com:iterative/scmrepo.git", + "git@github.com:treeverse/scmrepo.git", + "github.com:treeverse/scmrepo.git", + "user@github.com:treeverse/scmrepo.git", ], ) def test_scp_url(url: str): @@ -20,11 +20,11 @@ def test_scp_url(url: str): [ r"C:\foo\bar", "C:/foo/bar", - "/home/user/iterative/scmrepo/git", - "~/iterative/scmrepo/git", + "/home/user/treeverse/scmrepo/git", + "~/treeverse/scmrepo/git", "ssh://login@server.com:12345/repository.git", - "https://user:password@github.com/iterative/scmrepo.git", - "https://github.com/iterative/scmrepo.git", + "https://user:password@github.com/treeverse/scmrepo.git", + "https://github.com/treeverse/scmrepo.git", ], ) def test_scp_url_invalid(url: str):