repligit 0.2.0__tar.gz → 0.4.0__tar.gz

{repligit-0.2.0 → repligit-0.4.0}/.envrc

@@ -6,5 +6,5 @@
 #------------------------------------------------------------------------
 if type spack &>/dev/null; then
     . $SPACK_ROOT/share/spack/setup-env.sh
-    spack env activate -d spack/
+    spack env activate -d .
 fi

{repligit-0.2.0 → repligit-0.4.0}/.github/dependabot.yml

@@ -3,9 +3,13 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
+    groups:
+      codeql:
+        patterns:
+          - "github/codeql-action*"
 
   - package-ecosystem: "pip"
     directory: "/.github/workflows/requirements"
     schedule:
-      interval: "weekly"
+      interval: "monthly"

{repligit-0.2.0 → repligit-0.4.0}/.github/workflows/ci.yml

@@ -22,13 +22,13 @@ jobs:
       security: ${{ steps.filter.outputs.security }}
       unit-tests: ${{ steps.filter.outputs.unit-tests }}
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # @v2
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # @v2
         if: ${{ github.event_name == 'push' }}
         with:
           fetch-depth: 0
 
         # For pull requests it's not necessary to checkout the code
-      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
+      - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706
         id: filter
         with:
           filters: |

{repligit-0.2.0 → repligit-0.4.0}/.github/workflows/coverage.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout PR branch
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
         with:
           fetch-depth: 2  # https://stackoverflow.com/a/74268200
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97
         with:
           python-version: '3.13'
           cache: 'pip'
@@ -26,14 +26,14 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          pip install .
+          pip install .[aiohttp]
           pip install -r .github/workflows/requirements/unit-tests.txt
 
       - name: Download PR coverage artifact
         if: github.event_name == 'pull_request'
         id: download_pr_cov
         continue-on-error: true
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v8.0.1
         with:
           name: pr-coverage-${{ github.sha }}
 
@@ -64,7 +64,7 @@ jobs:
         if: github.event_name == 'pull_request'
         id: download_base
         continue-on-error: true
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v8.0.1
         with:
           name: base-coverage-${{ env.MERGE_BASE_COMMIT }}
 
@@ -110,7 +110,7 @@ jobs:
 
       - name: Upload base coverage artifact
         if: github.ref_name == 'main' && github.event_name == 'push'
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: base-coverage-${{ github.sha }}
           path: base_coverage.json

{repligit-0.2.0 → repligit-0.4.0}/.github/workflows/label.yml

@@ -18,4 +18,4 @@ jobs:
       contents: read
       pull-requests: write
     steps:
-      - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b
+      - uses: actions/labeler@bf12e9b00b37c5c0ca2b87b79b2daf7891dbda13

{repligit-0.2.0 → repligit-0.4.0}/.github/workflows/publish.yml

@@ -7,12 +7,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
       with:
         persist-credentials: false
+        fetch-depth: 0
 
     - name: Set up Python
-      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548
+      uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97
       with:
         cache: 'pip'
         cache-dependency-path: '.github/workflows/requirements/publish.txt'
@@ -26,7 +27,7 @@ jobs:
         python3 -m build
 
     - name: Save distribution files as artifact
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
       with:
         name: python-package-distributions
         path: dist/
@@ -41,10 +42,10 @@ jobs:
       id-token: write
     steps:
     - name: Download distribution files from artifact
-      uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
       with:
         name: python-package-distributions
         path: dist/
 
     - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
+      uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33

repligit-0.4.0/.github/workflows/requirements/publish.txt

@@ -0,0 +1,3 @@
+hatchling==1.31.0
+hatch-vcs==0.5.0
+build==1.5.0

repligit-0.4.0/.github/workflows/requirements/security.txt

@@ -0,0 +1 @@
+bandit[sarif,toml]==1.9.4

repligit-0.4.0/.github/workflows/requirements/style.txt

@@ -0,0 +1,3 @@
+ruff==0.15.8
+ty==0.0.65
+typos==1.48.0

repligit-0.4.0/.github/workflows/requirements/unit-tests.txt

@@ -0,0 +1,6 @@
+hatchling==1.31.0
+hatch-vcs==0.5.0
+build==1.5.0
+pytest==9.0.2
+pytest-mock==3.15.1
+coverage==7.15.2

{repligit-0.2.0 → repligit-0.4.0}/.github/workflows/security.yml

@@ -10,11 +10,11 @@ jobs:
   bandit-scan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
 
       # https://bandit.readthedocs.io/en/latest/faq.html#under-which-version-of-python-should-i-install-bandit
       - name: Set up Python 3.10
-        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97
         with:
           python-version: '3.10'
           cache: 'pip'
@@ -30,7 +30,7 @@ jobs:
       # the PR if any issues are found
       - name: Upload SARIF file
         if: always()
-        uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2
+        uses: github/codeql-action/upload-sarif@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81
         with:
           sarif_file: results.sarif
           category: bandit
@@ -43,15 +43,15 @@ jobs:
         language: [actions, python]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2
+      uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81
       with:
         languages: ${{ matrix.language }}
         build-mode: none
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2
+      uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81
       with:
         category: "/language:${{matrix.language}}"

{repligit-0.2.0 → repligit-0.4.0}/.github/workflows/style.yml

@@ -9,18 +9,23 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97
         with:
           python-version: '3.10'
           cache: 'pip'
-          cache-dependency-path: '.github/workflows/requirements/style.txt'
+          cache-dependency-path: |
+            pyproject.toml
+            .github/workflows/requirements/unit-tests.txt
+            .github/workflows/requirements/style.txt
 
       - name: Install Python dependencies
         run: |
+          pip install -r .github/workflows/requirements/unit-tests.txt
           pip install -r .github/workflows/requirements/style.txt
+          pip install -e .[aiohttp]
 
       - name: Run Ruff
         run: |
@@ -28,5 +33,8 @@ jobs:
           ruff check --select I --diff
           ruff format --check --diff
 
+      - name: Run Type Checker
+        run: ty check
+
       - name: Run Typos
         run: typos

{repligit-0.2.0 → repligit-0.4.0}/.github/workflows/unit-tests.yml

@@ -12,8 +12,8 @@ jobs:
       matrix:
         python-version: ['3.10', '3.13']
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
@@ -23,8 +23,8 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          pip install .
           pip install -r .github/workflows/requirements/unit-tests.txt
+          pip install -e .[aiohttp]
 
       - name: Run Unit Tests (coverage on 3.13)
         run: |
@@ -41,7 +41,7 @@ jobs:
       - name: Upload coverage artifact
         # this is needed so we can compare diffs in coverage.yml
         if: ${{ matrix.python-version == '3.13' }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: pr-coverage-${{ github.sha }}
           path: pr_coverage.json

{repligit-0.2.0 → repligit-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: repligit
-Version: 0.2.0
+Version: 0.4.0
 Summary: A python library implementing the git http transfer protocol.
 Project-URL: Homepage, https://github.com/llnl/repligit
 Project-URL: Issues, https://github.com/llnl/repligit/issues
@@ -12,6 +12,13 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Provides-Extra: aiohttp
 Requires-Dist: aiohttp; extra == 'aiohttp'
+Provides-Extra: dev
+Requires-Dist: coverage; extra == 'dev'
+Requires-Dist: pytest; extra == 'dev'
+Requires-Dist: pytest-mock; extra == 'dev'
+Requires-Dist: ruff; extra == 'dev'
+Requires-Dist: ty; extra == 'dev'
+Requires-Dist: typos; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # repligit
@@ -57,7 +64,7 @@ def main():
     gl_refs = ls_remote(
         dest_remote_url,
         username=dest_username,
-        password=dest_password
+        password=dest_password,
     )
 
     want_sha = gh_refs[target_ref]
@@ -65,7 +72,7 @@ def main():
 
     from_sha = gl_refs.get(target_ref) or ("0" * 40)
 
-    if want_sha in have_shas:
+    if from_sha == want_sha:
         print("Everything is up to date")
         return
 
@@ -92,7 +99,6 @@ def main():
 
 if __name__ == "__main__":
     main()
-
 ```
 
 ## License

{repligit-0.2.0 → repligit-0.4.0}/README.md

@@ -41,7 +41,7 @@ def main():
     gl_refs = ls_remote(
         dest_remote_url,
         username=dest_username,
-        password=dest_password
+        password=dest_password,
     )
 
     want_sha = gh_refs[target_ref]
@@ -49,7 +49,7 @@ def main():
 
     from_sha = gl_refs.get(target_ref) or ("0" * 40)
 
-    if want_sha in have_shas:
+    if from_sha == want_sha:
         print("Everything is up to date")
         return
 
@@ -76,7 +76,6 @@ def main():
 
 if __name__ == "__main__":
     main()
-
 ```
 
 ## License

{repligit-0.2.0 → repligit-0.4.0}/examples/git_mirror.py

@@ -27,7 +27,7 @@ def main():
 
     from_sha = gl_refs.get(target_ref) or ("0" * 40)
 
-    if want_sha in have_shas:
+    if from_sha == want_sha:
         print("Everything is up to date")
         return
 
@@ -40,6 +40,10 @@ def main():
         # password=src_password,  # Uncomment if source repo requires auth
     )
 
+    if packfile is None:
+        print("Failed to fetch packfile")
+        return
+
     # Upload packfile to destination repository
     send_pack(
         dest_remote_url,

{repligit-0.2.0 → repligit-0.4.0}/examples/git_mirror_async.py

@@ -31,7 +31,7 @@ async def main():
 
     from_sha = gl_refs.get(target_ref) or ("0" * 40)
 
-    if want_sha in have_shas:
+    if from_sha == want_sha:
         print("Everything is up to date")
         return
 
@@ -44,6 +44,10 @@ async def main():
         # password=src_password,  # Uncomment if source repo requires auth
     )
 
+    if packfile is None:
+        print("Failed to fetch packfile")
+        return
+
     # Upload packfile to destination repository
     await send_pack(
         dest_remote_url,

{repligit-0.2.0 → repligit-0.4.0}/pyproject.toml

@@ -1,11 +1,10 @@
 [build-system]
-requires = ["hatchling"]
+requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"
 
 [project]
 name = "repligit"
-version = "0.2.0"
-dependencies = []
+dynamic = ["version"]
 authors = [
   { name="Alec Scott" },
   { name="Caetano Melone"},
@@ -25,6 +24,10 @@ Issues = "https://github.com/llnl/repligit/issues"
 
 [project.optional-dependencies]
 aiohttp = ["aiohttp"]
+dev = ["ty", "ruff", "typos", "coverage", "pytest", "pytest-mock"]
+
+[tool.hatch.version]
+source = "vcs"
 
 [tool.pytest.ini_options]
 pythonpath = [
@@ -39,3 +42,7 @@ exclude = ["spack"]
 exclude_dirs = []
 # allow use of assert
 skips = ["B101"]
+
+[tool.ty.src]
+# exclude spack directory from type checking
+exclude = ["spack/**"]

{repligit-0.2.0 → repligit-0.4.0}/spack/repos/spack_repo/repligit/packages/py_repligit/package.py

@@ -28,5 +28,6 @@ class PyRepligit(PythonPackage):
 
     depends_on("python@3.10:", type=("build", "run"))
     depends_on("py-hatchling", type="build")
+    depends_on("py-hatch-vcs", type="build", when="@main")
 
     depends_on("py-aiohttp", type=("build", "run"), when="+aiohttp")

{repligit-0.2.0/spack → repligit-0.4.0}/spack.yaml

@@ -3,20 +3,22 @@
 # It describes a set of packages to be installed, along with
 # configuration settings.
 spack:
-  # add package specs to the `specs` list
   repos:
-  - $env/repos/spack_repo/repligit
+    repligit: spack/repos/spack_repo/repligit
   specs:
   - py-codespell
   - py-pytest
-  - py-repligit
+  - py-repligit +aiohttp
   - py-bandit
   - py-ruff
   - py-pip
+  - py-ty
+  - py-build
+  - py-hatch-vcs
   view: true
   concretizer:
     unify: true
   develop:
     py-repligit:
       spec: py-repligit@=main
-      path: $env/../
+      path: .

{repligit-0.2.0 → repligit-0.4.0}/src/repligit/__init__.py

@@ -1,3 +1,3 @@
 from repligit.client import fetch_pack, ls_remote, send_pack
 
-__all__ = ["ls_remote", "fetch_pack", "send_pack"]
+__all__ = ["fetch_pack", "ls_remote", "send_pack"]

{repligit-0.2.0 → repligit-0.4.0}/src/repligit/asyncio/__init__.py

@@ -5,4 +5,4 @@ except ModuleNotFoundError:
 
 from repligit.asyncio.client import fetch_pack, ls_remote, send_pack
 
-__all__ = ["ls_remote", "fetch_pack", "send_pack"]
+__all__ = ["fetch_pack", "ls_remote", "send_pack"]

repligit-0.4.0/src/repligit/asyncio/client.py

@@ -0,0 +1,130 @@
+from typing import Iterable
+
+import aiohttp
+
+from repligit.asyncio.parse import read_pkt_lines
+from repligit.exceptions import (
+    RefUpdateRejected,
+    RemoteError,
+    UnexpectedResponse,
+    UnpackFailed,
+)
+from repligit.parse import generate_fetch_pack_request, generate_send_pack_header
+
+
+async def ls_remote(
+    url: str, username: str | None = None, password: str | None = None
+) -> dict[str, str]:
+    """Get commit hash of remote master branch, return SHA-1 hex string or
+    None if no remote commits.
+    """
+
+    url = f"{url}/info/refs?service=git-upload-pack"
+    auth = aiohttp.BasicAuth(username or "", password) if password else None
+    async with aiohttp.ClientSession(auth=auth) as session:
+        async with session.get(url, raise_for_status=True) as resp:
+            lines = read_pkt_lines(resp.content)
+            service_line = await anext(lines)
+            if service_line != "# service=git-upload-pack":
+                raise UnexpectedResponse(f"invalid service line: {service_line!r}")
+
+            refs: dict[str, str] = {}
+            async for line in lines:
+                # The first ref line carries the server capabilities after a NUL byte.
+                sha, ref = line.split("\x00", 1)[0].split()
+                refs[ref] = sha
+            return refs
+
+
+async def fetch_pack(
+    url: str,
+    want_sha: str,
+    have_shas: Iterable[str],
+    username: str | None = None,
+    password: str | None = None,
+) -> bytes | None:
+    """Download a packfile from a remote server."""
+    # ensure have_shas is a set, else packfile errors will occur
+    have_shas = set(have_shas)
+
+    url = f"{url}/git-upload-pack"
+    auth = aiohttp.BasicAuth(username or "", password) if password else None
+
+    request = generate_fetch_pack_request(want_sha, have_shas)
+
+    async with aiohttp.ClientSession(auth=auth) as session:
+        async with session.post(
+            url,
+            headers={
+                "Content-type": "application/x-git-upload-pack-request",
+            },
+            data=request,
+            raise_for_status=True,
+            timeout=None,
+        ) as resp:
+            # Consume negotiation pkt-lines. With multi-ack the server may
+            # send several "ACK <sha> continue|common|ready" lines before the
+            # terminating "NAK" or final "ACK <sha>", then the packfile.
+            while True:
+                length_bytes = await resp.content.readexactly(4)
+                line_length = int(length_bytes, 16)
+
+                line = await resp.content.readexactly(line_length - 4)
+
+                prefix = line[:3]
+
+                # e.g. "ERR upload-pack: not our ref <sha>"
+                if prefix == b"ERR":
+                    raise RemoteError(line.decode("utf-8").strip())
+
+                if prefix not in (b"NAK", b"ACK"):
+                    return None
+                if prefix == b"NAK" or len(line.split()) == 2:
+                    # "NAK" or final "ACK <sha>": negotiation done, packfile
+                    # follows. Unlike the sync API, the body must be read
+                    # within this context to be usable by the caller.
+                    return await resp.content.read()
+                # intermediate multi-ack line: "ACK <sha> continue|common|ready"
+
+
+async def send_pack(
+    url: str,
+    ref: str,
+    from_sha: str,
+    to_sha: str,
+    packfile: bytes,
+    username: str | None = None,
+    password: str | None = None,
+) -> None:
+    """Send a packfile to a remote server."""
+    url = f"{url}/git-receive-pack"
+    auth = aiohttp.BasicAuth(username or "", password) if password else None
+
+    header = generate_send_pack_header(ref, from_sha, to_sha)
+    # unlike in the sync version the packfile is already read into memory
+    receive_pack_request = header + packfile
+
+    async with aiohttp.ClientSession(auth=auth) as session:
+        async with session.post(
+            url,
+            headers={
+                "Content-type": "application/x-git-receive-pack-request",
+            },
+            data=receive_pack_request,
+            raise_for_status=True,
+        ) as resp:
+            lines = read_pkt_lines(resp.content)
+            unpack_status = await anext(lines)
+            if unpack_status != "unpack ok":
+                raise UnpackFailed(unpack_status)
+
+            # "ng <ref> <reason>" (ng = not good) means the remote rejected the
+            # update. The reason may be non-fast-forward, hook declined, etc.
+            ref_status = await anext(lines)
+            prefix = f"ng {ref} "
+            if ref_status.startswith(prefix):
+                reason_str = ref_status[len(prefix) :]
+                raise RefUpdateRejected(reason_str)
+
+            if ref_status != f"ok {ref}":
+                raise UnexpectedResponse(f"unexpected ref status line: {ref_status!r}")