cgitize 6.0.0__tar.gz → 6.0.2__tar.gz

cgitize-6.0.2/.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.0 → cgitize-6.0.2}/.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on:
   push:
     paths-ignore:
       - '*.md'
-  pull_request:
   workflow_dispatch:
 
 jobs:
@@ -12,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
     name: 'Test / ${{ matrix.python-version }}'
     env:
       CGITIZE_GITHUB_USERNAME: cgitize-test
@@ -23,11 +22,11 @@ jobs:
       CGITIZE_GITLAB_TOKEN: '${{ secrets.CGITIZE_GITLAB_TOKEN}}'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '${{ matrix.python-version }}'
           cache: pip
@@ -43,7 +42,7 @@ jobs:
     name: 'Test / Docker'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Integration test (Docker)
         run: sudo make test/docker
 
@@ -60,15 +59,15 @@ jobs:
       CGITIZE_GITLAB_TOKEN: '${{ secrets.CGITIZE_GITLAB_TOKEN}}'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           cache: pip
       - name: Install dependencies
         run: pip install -q -r requirements.txt
       - name: Set up ssh-agent
-        uses: webfactory/ssh-agent@v0.8.0
+        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@v4
+        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@v5
+        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:
@@ -135,11 +140,11 @@ jobs:
     name: 'Publish / PyPI'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
       - name: Verify package can be installed
         run: pip install -q .
       - name: Install package builder
@@ -147,13 +152,13 @@ jobs:
       - name: Build package
         run: python -m build
       - name: Publish as artifact
-        uses: actions/upload-artifact@v4
+        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.0 → cgitize-6.0.2}/DEVELOPMENT.md

@@ -49,7 +49,8 @@ another user, it could get used instead).
 Upgrading dependencies
 ----------------------
 
-* Upgrade virtual environment packages: `make venv/upgrade`
+* Upgrade virtual environment packages: `make venv/upgrade`.
+`make maintenance` does that and pushes a commit to the upstream.
 * Upgrade base Docker images.
     * Find the current base images using `git grep -P 'FROM \w+:'`
 * Upgrade the [cmark-gfm] version used in the [cgitize-frontend Docker image].

{cgitize-6.0.0 → cgitize-6.0.2}/Makefile

@@ -23,6 +23,25 @@ venv/upgrade: venv/reset
 		&& pip uninstall -q --yes '$(call escape,$(PROJECT))' \
 		&& pip freeze > requirements.txt
 
+.PHONY: maintenance
+maintenance:
+	$(MAKE) venv/upgrade
+
+	@git_status="$$( git status --porcelain=v1 )" && \
+	if [ -z "$$git_status" ]; then \
+		true; \
+	elif [ "$$git_status" = ' M requirements.txt' ]; then \
+		git commit -am 'requirements.txt: bump dependencies' && \
+			git push -q; \
+	else \
+		echo; \
+		echo '-----------------------------------------------------------------'; \
+		echo 'Error: unrecognized modifications in the repository:'; \
+		echo "$$git_status"; \
+		echo '-----------------------------------------------------------------'; \
+		exit 1; \
+	fi
+
 .PHONY: python
 python:
 	$(venv_activate) && python

{cgitize-6.0.0/cgitize.egg-info → cgitize-6.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 6.0.0
+Version: 6.0.2
 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.0 → cgitize-6.0.2}/cgitize/utils.py

@@ -17,7 +17,7 @@ def setup_logging(verbose=False):
     level = logging.DEBUG if verbose else logging.INFO
     logging.basicConfig(
         level=level,
-        datefmt='%Y-%m-%d %H:%M:%S',
+        datefmt='%Y-%m-%d %H:%M:%S%z',
         format='%(asctime)s | %(levelname)s | %(message)s',
         # Log to stdout, because that's where subprocess's output goes (so that
         # the don't get interleaved).

{cgitize-6.0.0 → cgitize-6.0.2/cgitize.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 6.0.0
+Version: 6.0.2
 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.0 → cgitize-6.0.2}/cgitize.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ docker-compose.yml
 prelude.mk
 pyproject.toml
 requirements.txt
+.github/dependabot.yml
 .github/workflows/ci.yml
 cgitize/__init__.py
 cgitize/bitbucket.py

{cgitize-6.0.0 → cgitize-6.0.2}/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.0 → cgitize-6.0.2}/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.0 → cgitize-6.0.2}/docker/README.md

@@ -41,8 +41,6 @@ Compose
 
 Here's an example docker-compose.yml file:
 
-    version: '3'
-
     services:
       cgitize:
         environment:
@@ -68,6 +66,6 @@ In this configuration, cgitize pulls repositories defined in example.toml every
 
 To launch containers, run:
 
-    docker-compose up -d
+    docker compose up -d
 
 To inspect the repositories, visit http://localhost:80/.

{cgitize-6.0.0 → cgitize-6.0.2}/docker/frontend/Dockerfile

@@ -8,9 +8,18 @@ ADD ["https://github.com/github/cmark-gfm/archive/refs/tags/$CMARK_GFM_VERSION.z
 
 RUN apk add -q --no-cache cmake g++ make python3 && \
     ln -sf /usr/bin/python3 /usr/bin/python
+
 RUN unzip -q -- "$CMARK_GFM_VERSION.zip" && \
     cd -- "cmark-gfm-$CMARK_GFM_VERSION" && \
-    make INSTALL_PREFIX=/cmark-gfm > /dev/null && \
+    mkdir build && \
+    cd build && \
+    cmake \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+        -DCMAKE_INSTALL_PREFIX=/cmark-gfm \
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+        .. && \
+    make -j && \
     make test && \
     make install > /dev/null
 

{cgitize-6.0.0 → cgitize-6.0.2}/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   cgitize:
     build:

{cgitize-6.0.0 → cgitize-6.0.2}/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.2/requirements.txt

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

{cgitize-6.0.0 → cgitize-6.0.2}/test/integration/docker/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   git_server:
     build:

{cgitize-6.0.0 → cgitize-6.0.2}/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.0 → cgitize-6.0.2}/test/integration/docker/test.sh

@@ -17,12 +17,6 @@ readonly client_key_password='password'
 readonly output_dir="$script_dir/cgitize/output"
 readonly frontend_host=localhost
 
-if command -v docker-compose > /dev/null 2>&1; then
-    readonly docker_compose=docker-compose
-else
-    readonly docker_compose='docker compose'
-fi
-
 dump() {
     local prefix="${FUNCNAME[0]}"
     [ "${#FUNCNAME[@]}" -gt 1 ] && prefix="${FUNCNAME[1]}"
@@ -165,12 +159,12 @@ docker_build() {
     echo Building Docker images
     echo ----------------------------------------------------------------------
 
-    $docker_compose build --progress plain
+    docker compose --progress plain build
 }
 
 docker_cleanup() {
     dump 'cleaning up Docker data'
-    $docker_compose down --rmi all --volumes
+    docker compose down --rmi all --volumes
     # Use `docker system prune` as well?
 }
 
@@ -186,7 +180,7 @@ run_git_server() {
     echo Running the Git server
     echo ----------------------------------------------------------------------
 
-    $docker_compose up -d git_server
+    docker compose up -d git_server
 }
 
 run_cgitize() {
@@ -200,7 +194,7 @@ run_cgitize() {
         return 1
     fi
     dump "SSH_AUTH_SOCK: $SSH_AUTH_SOCK"
-    $docker_compose run --rm cgitize
+    docker compose run --rm cgitize
 }
 
 run_frontend() {
@@ -209,7 +203,7 @@ run_frontend() {
     echo Running the frontend
     echo ----------------------------------------------------------------------
 
-    $docker_compose up -d frontend
+    docker compose up -d frontend
     sleep 2
 }
 

cgitize-6.0.0/requirements.txt

@@ -1,23 +0,0 @@
-atlassian-python-api==4.0.4
-beautifulsoup4==4.13.4
-certifi==2025.7.14
-cffi==1.17.1
-charset-normalizer==3.4.2
-cryptography==45.0.5
-Deprecated==1.2.18
-idna==3.10
-jmespath==1.0.1
-oauthlib==3.3.1
-pycparser==2.22
-PyGithub==2.6.1
-PyJWT==2.10.1
-PyNaCl==1.5.0
-python-gitlab==6.1.0
-requests==2.32.4
-requests-oauthlib==2.0.0
-requests-toolbelt==1.0.0
-soupsieve==2.7
-tomli==1.2.3
-typing_extensions==4.14.1
-urllib3==2.5.0
-wrapt==1.17.2