cgitize 6.0.1__tar.gz → 6.0.3__tar.gz

cgitize-6.0.3/.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+updates:
+  - package-ecosystem: docker
+    directories:
+      - '**/*'
+    schedule:
+      interval: weekly
+  - package-ecosystem: docker-compose
+    directories:
+      - '**/*'
+    schedule:
+      interval: weekly
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+  - package-ecosystem: pip
+    directory: /
+    schedule:
+      interval: weekly

{cgitize-6.0.1 → cgitize-6.0.3}/.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on:
   push:
     paths-ignore:
       - '*.md'
-  pull_request:
   workflow_dispatch:
 
 jobs:
@@ -68,7 +67,7 @@ jobs:
       - name: Install dependencies
         run: pip install -q -r requirements.txt
       - name: Set up ssh-agent
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@v0.10.0
         with:
           ssh-private-key: '${{ secrets.SSH_KEY }}'
       - name: Integration test (example config)
@@ -84,14 +83,13 @@ jobs:
           - {service: backend, file: docker/Dockerfile, image: cgitize}
           - {service: frontend, context: docker/frontend, image: cgitize-frontend}
     name: 'Publish / Docker Hub / ${{ matrix.service }}'
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))
     steps:
       - name: Checkout
         uses: actions/checkout@v6
       # https://github.com/docker/metadata-action#semver
       - id: meta
         name: Docker Hub metadata
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: '${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.image }}'
           flavor: |
@@ -102,31 +100,38 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: '${{ secrets.DOCKERHUB_USERNAME }}'
-          password: '${{ secrets.DOCKERHUB_TOKEN }}'
-      - id: platforms
-        name: Which platforms?
+        uses: docker/setup-buildx-action@v4
+      - name: Push? Which platforms?
+        id: params
         # Building for ARM for every commit in master is too time-consuming.
         run: |
-          if [ '${{ github.ref }}' = 'refs/heads/master' ]; then
+          if ${{ github.ref == 'refs/heads/master' }}; then
+              echo 'push=true' >> "$GITHUB_OUTPUT"
               echo 'platforms=amd64' >> "$GITHUB_OUTPUT"
-          else
+          elif ${{ startsWith(github.ref, 'refs/tags/') }}; then
+              echo 'push=true' >> "$GITHUB_OUTPUT"
               echo 'platforms=amd64,armhf,arm64' >> "$GITHUB_OUTPUT"
+          else
+              echo 'push=false' >> "$GITHUB_OUTPUT"
+              echo 'platforms=amd64' >> "$GITHUB_OUTPUT"
           fi
+      - name: Login to Docker Hub
+        # https://github.com/orgs/community/discussions/163013
+        if: steps.params.outputs.push == 'true'
+        uses: docker/login-action@v4
+        with:
+          username: '${{ secrets.DOCKERHUB_USERNAME }}'
+          password: '${{ secrets.DOCKERHUB_TOKEN }}'
       - name: Build and publish
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: '${{ matrix.context }}'
           file: '${{ matrix.file }}'
           labels: '${{ steps.meta.outputs.labels }}'
-          platforms: '${{ steps.platforms.outputs.platforms }}'
-          push: true
+          platforms: '${{ steps.params.outputs.platforms }}'
+          push: '${{ steps.params.outputs.push }}'
           tags: '${{ steps.meta.outputs.tags }}'
 
   publish_pypi:
@@ -147,13 +152,13 @@ jobs:
       - name: Build package
         run: python -m build
       - name: Publish as artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: dist
           path: dist
           if-no-files-found: error
       - name: Publish to PyPI
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/')
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__

{cgitize-6.0.1/cgitize.egg-info → cgitize-6.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 6.0.1
+Version: 6.0.3
 Summary: Self-host your repositories using cgit
 Author-email: Egor Tensin <egor@tensin.name>
 License: MIT
@@ -17,7 +17,7 @@ Requires-Dist: atlassian-python-api~=4.0
 Requires-Dist: importlib-metadata~=4.0; python_version < "3.8"
 Requires-Dist: PyGithub~=2.0
 Requires-Dist: python-gitlab~=6.0
-Requires-Dist: tomli~=1.0
+Requires-Dist: tomli<3,>=1
 Dynamic: license-file
 
 cgitize

{cgitize-6.0.1 → cgitize-6.0.3}/cgitize/config.py

@@ -66,17 +66,26 @@ class ServiceSection(Section, ABC):
         self.repositories = RepositoriesSection(self.impl.get('repositories', {}))
         self.users = UsersSection(self.impl.get('users', {}))
 
-    def enum_repositories(self, cfg):
-        api = self.connect_to_service()
+    def _enum_explicit_repositories(self, cfg, api):
         for r in self.repositories.enum_repositories():
             r = HostedRepo(r)
             yield api.convert_repo(api.get_repo(r), cfg, r.dir)
+
+    def _enum_user_repositories(self, cfg, api, user):
+        for r in api.get_user_repos(user):
+            r = api.convert_repo(r, cfg, user.dir)
+            if r.name in user.skip:
+                continue
+            yield r
+
+    def _sort_repos(self, repos):
+        return sorted(repos, key=lambda repo: repo.name)
+
+    def enum_repositories(self, cfg):
+        api = self.connect_to_service()
+        yield from self._sort_repos(self._enum_explicit_repositories(cfg, api))
         for u in self.users.enum_users():
-            for r in api.get_user_repos(u):
-                r = api.convert_repo(r, cfg, u.dir)
-                if r.name in u.skip:
-                    continue
-                yield r
+            yield from self._sort_repos(self._enum_user_repositories(cfg, api, u))
 
     @abstractmethod
     def connect_to_service(self):
@@ -100,15 +109,18 @@ class GitHubSection(ServiceSection):
     def url_auth(self):
         return self.token
 
+    def _enum_org_repositories(self, cfg, api, org):
+        for repo in api.get_org_repos(org):
+            repo = api.convert_repo(repo, cfg, org.dir)
+            if repo.name in org.skip:
+                continue
+            yield repo
+
     def enum_repositories(self, cfg):
         yield from super().enum_repositories(cfg)
         api = self.connect_to_service()
         for org in self.orgs.enum_orgs():
-            for repo in api.get_org_repos(org):
-                repo = api.convert_repo(repo, cfg, org.dir)
-                if repo.name in org.skip:
-                    continue
-                yield repo
+            yield from self._sort_repos(self._enum_org_repositories(cfg, api, org))
 
     def connect_to_service(self):
         username = self.username

{cgitize-6.0.1 → cgitize-6.0.3}/cgitize/version.py

@@ -1,5 +1,5 @@
 try:
-    import importlib.metadata as metadata
+    from importlib import metadata
 except ImportError:
     import importlib_metadata as metadata
 

{cgitize-6.0.1 → cgitize-6.0.3/cgitize.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 6.0.1
+Version: 6.0.3
 Summary: Self-host your repositories using cgit
 Author-email: Egor Tensin <egor@tensin.name>
 License: MIT
@@ -17,7 +17,7 @@ Requires-Dist: atlassian-python-api~=4.0
 Requires-Dist: importlib-metadata~=4.0; python_version < "3.8"
 Requires-Dist: PyGithub~=2.0
 Requires-Dist: python-gitlab~=6.0
-Requires-Dist: tomli~=1.0
+Requires-Dist: tomli<3,>=1
 Dynamic: license-file
 
 cgitize

{cgitize-6.0.1 → cgitize-6.0.3}/cgitize.egg-info/requires.txt

@@ -1,7 +1,7 @@
 atlassian-python-api~=4.0
 PyGithub~=2.0
 python-gitlab~=6.0
-tomli~=1.0
+tomli<3,>=1
 
 [:python_version < "3.8"]
 importlib-metadata~=4.0

{cgitize-6.0.1 → cgitize-6.0.3}/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13-alpine AS base
+FROM python:3.14-alpine AS base
 
 FROM base AS deps
 

{cgitize-6.0.1 → cgitize-6.0.3}/pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
     'importlib-metadata ~= 4.0 ; python_version < "3.8"',
     "PyGithub ~= 2.0",
     "python-gitlab ~= 6.0",
-    "tomli ~= 1.0",
+    "tomli >= 1,< 3",
 ]
 
 classifiers = [

{cgitize-6.0.1 → cgitize-6.0.3}/requirements.txt

@@ -1,23 +1,23 @@
 atlassian-python-api==4.0.7
 beautifulsoup4==4.14.3
-certifi==2026.1.4
+certifi==2026.2.25
 cffi==2.0.0
-charset-normalizer==3.4.4
-cryptography==46.0.3
+charset-normalizer==3.4.6
+cryptography==46.0.6
 Deprecated==1.3.1
 idna==3.11
-jmespath==1.0.1
+jmespath==1.1.0
 oauthlib==3.3.1
-pycparser==2.23
-PyGithub==2.8.1
-PyJWT==2.10.1
+pycparser==3.0
+PyGithub==2.9.0
+PyJWT==2.12.1
 PyNaCl==1.6.2
 python-gitlab==6.5.0
-requests==2.32.5
+requests==2.33.0
 requests-oauthlib==2.0.0
 requests-toolbelt==1.0.0
-soupsieve==2.8.1
-tomli==1.2.3
+soupsieve==2.8.3
+tomli==2.4.1
 typing_extensions==4.15.0
 urllib3==2.6.3
-wrapt==2.0.1
+wrapt==2.1.2

{cgitize-6.0.1 → cgitize-6.0.3}/test/integration/docker/git_server/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.22
+FROM alpine:3.23
 
 RUN apk add -q --no-cache bash git openssh-server tini && \
     echo 'root:root' | chpasswd && \

cgitize-6.0.1/.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly