cgitize 5.1.4__tar.gz → 6.0.1__tar.gz

cgitize-6.0.1/.github/dependabot.yml

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

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

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '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 +23,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 +43,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 +60,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.9.1
         with:
           ssh-private-key: '${{ secrets.SSH_KEY }}'
       - name: Integration test (example config)
@@ -87,7 +87,7 @@ jobs:
     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
@@ -120,7 +120,7 @@ jobs:
               echo 'platforms=amd64,armhf,arm64' >> "$GITHUB_OUTPUT"
           fi
       - name: Build and publish
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: '${{ matrix.context }}'
           file: '${{ matrix.file }}'
@@ -135,11 +135,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,7 +147,7 @@ jobs:
       - name: Build package
         run: python -m build
       - name: Publish as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: dist
           path: dist

{cgitize-5.1.4 → cgitize-6.0.1}/DEVELOPMENT.md

@@ -4,12 +4,31 @@ Workspace setup
 * Create a virtual Python environment: `make venv`
 * Use the virtual environment: `. .venv/bin/activate`
     * Deactivate the environment when you're done: `deactivate`
-* Make sure basic tests work: `make test`
 
-Development
------------
+Testing
+-------
+
+N.B.: `make test` is a shortcut for unit tests and the `local` integration
+test.
+
+### Unit tests
+
+    make test/unit
+
+You need to set the following environment variables for the authenticated
+access tests to work:
+
+* `CGITIZE_BITBUCKET_USERNAME`: `cgitize-test`
+* `CGITIZE_BITBUCKET_TOKEN`
+* `CGITIZE_GITHUB_USERNAME`: `cgitize-test`
+* `CGITIZE_GITHUB_TOKEN`
+* `CGITIZE_GITLAB_USERNAME`: `cgitize-test`
+* `CGITIZE_GITLAB_TOKEN`
+
+You can run `. test/set_credentials.sh`; it'll ask you to fill in the secrets.
+
+### Integration
 
-* Run unit tests: `make test/unit`
 * There're three integration tests: `local`, `docker` and `example`.
 Run them using
 
@@ -17,20 +36,21 @@ Run them using
       sudo make test/docker
       make test/example
 
-    * The `example` test uses the forges' APIs and might easily hit rate
+    * The `example` test uses the forges' APIs and might easily hit their rate
 limits.
-Set environment variables described in [examples/cgitize.toml] to use "access
-tokens" and get much higher rate limits.
-    * Run both unit tests and the `local` test using
-
-          make test
+Use the tokens used for unit tests.
+    * Additionally, it tests cloning via SSH (the `clone_via_ssh` setting) too,
+so you need to add the secret project-specific SSH key to your agent as well
+(make sure it's the only one in the agent; if there's a key associated with
+another user, it could get used instead).
 
 [examples/cgitize.toml]: examples/cgitize.toml
 
 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-5.1.4 → cgitize-6.0.1}/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-5.1.4/cgitize.egg-info → cgitize-6.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 5.1.4
+Version: 6.0.1
 Summary: Self-host your repositories using cgit
 Author-email: Egor Tensin <egor@tensin.name>
 License: MIT
@@ -10,13 +10,13 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Version Control :: Git
-Requires-Python: >=3.6
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: atlassian-python-api~=3.28.0
+Requires-Dist: atlassian-python-api~=4.0
 Requires-Dist: importlib-metadata~=4.0; python_version < "3.8"
-Requires-Dist: PyGithub~=1.0
-Requires-Dist: python-gitlab~=2.0
+Requires-Dist: PyGithub~=2.0
+Requires-Dist: python-gitlab~=6.0
 Requires-Dist: tomli~=1.0
 Dynamic: license-file
 

{cgitize-5.1.4 → cgitize-6.0.1}/cgitize/github.py

@@ -5,7 +5,7 @@
 
 import logging
 
-from github import Github, GithubException
+from github import Auth, Github, GithubException
 
 from cgitize.repo import Repo
 
@@ -13,7 +13,10 @@ from cgitize.repo import Repo
 class GitHub:
     def __init__(self, username, token):
         self._username = username
-        self._impl = Github(token)
+        auth = None
+        if token is not None:
+            auth = Auth.Token(token)
+        self._impl = Github(auth=auth)
 
     def get_repo(self, repo):
         try:

{cgitize-5.1.4 → cgitize-6.0.1}/cgitize/main.py

@@ -65,6 +65,8 @@ def main(argv=None):
             logging.info('All repositories were updated successfully')
         else:
             logging.warning("Some repositories couldn't be updated!")
+            if error is not None:
+                logging.warning('Error: %s', error)
 
         setup_error_header_file(config.main.error_header_path, success, error)
         return int(not success)

{cgitize-5.1.4 → cgitize-6.0.1}/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-5.1.4 → cgitize-6.0.1/cgitize.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 5.1.4
+Version: 6.0.1
 Summary: Self-host your repositories using cgit
 Author-email: Egor Tensin <egor@tensin.name>
 License: MIT
@@ -10,13 +10,13 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Version Control :: Git
-Requires-Python: >=3.6
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: atlassian-python-api~=3.28.0
+Requires-Dist: atlassian-python-api~=4.0
 Requires-Dist: importlib-metadata~=4.0; python_version < "3.8"
-Requires-Dist: PyGithub~=1.0
-Requires-Dist: python-gitlab~=2.0
+Requires-Dist: PyGithub~=2.0
+Requires-Dist: python-gitlab~=6.0
 Requires-Dist: tomli~=1.0
 Dynamic: license-file
 

{cgitize-5.1.4 → cgitize-6.0.1}/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
@@ -47,6 +48,7 @@ docs/auth.md
 examples/cgitize.toml
 examples/docker/cgitize.toml
 test/__init__.py
+test/set_credentials.sh
 test/integration/docker/.dockerignore
 test/integration/docker/docker-compose.yml
 test/integration/docker/test.sh

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

@@ -1,6 +1,6 @@
-atlassian-python-api~=3.28.0
-PyGithub~=1.0
-python-gitlab~=2.0
+atlassian-python-api~=4.0
+PyGithub~=2.0
+python-gitlab~=6.0
 tomli~=1.0
 
 [:python_version < "3.8"]

{cgitize-5.1.4 → cgitize-6.0.1}/docker/README.md

@@ -41,8 +41,6 @@ Compose
 
 Here's an example docker-compose.yml file:
 
-    version: '3'
-
     services:
       cgitize:
         environment:
@@ -50,13 +48,13 @@ Here's an example docker-compose.yml file:
           SCHEDULE: '0 */3 * * *'
           # Set CGITIZE_{GITHUB,BITBUCKET,GITLAB}_{USERNAME,TOKEN} variables
           # here or in the config file.
-        image: egortensin/cgitize:5
+        image: egortensin/cgitize:6
         restart: unless-stopped
         volumes:
           - ./example.toml:/etc/cgitize/cgitize.toml:ro
           - /srv/volumes/cgitize:/mnt/cgitize
       frontend:
-        image: egortensin/cgitize-frontend:5
+        image: egortensin/cgitize-frontend:6
         ports:
           - '127.0.0.1:80:80'
         restart: unless-stopped
@@ -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-5.1.4 → cgitize-6.0.1}/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-5.1.4 → cgitize-6.0.1}/docker-compose.yml

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

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

@@ -9,13 +9,13 @@ license = {text = "MIT"}
 dynamic = ["version"]
 authors = [{name = "Egor Tensin", email = "egor@tensin.name"}]
 readme = "README.md"
-requires-python = ">=3.6"
+requires-python = ">=3.9"
 
 dependencies = [
-    "atlassian-python-api ~= 3.28.0",
+    "atlassian-python-api ~= 4.0",
     'importlib-metadata ~= 4.0 ; python_version < "3.8"',
-    "PyGithub ~= 1.0",
-    "python-gitlab ~= 2.0",
+    "PyGithub ~= 2.0",
+    "python-gitlab ~= 6.0",
     "tomli ~= 1.0",
 ]
 

cgitize-6.0.1/requirements.txt

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

{cgitize-5.1.4 → cgitize-6.0.1}/test/integration/docker/docker-compose.yml

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

{cgitize-5.1.4 → cgitize-6.0.1}/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.1/test/set_credentials.sh

@@ -0,0 +1,13 @@
+IFS= read -r -s -p 'Bitbucket token: ' CGITIZE_BITBUCKET_TOKEN
+echo
+IFS= read -r -s -p 'GitHub token: ' CGITIZE_GITHUB_TOKEN
+echo
+IFS= read -r -s -p 'GitLab token: ' CGITIZE_GITLAB_TOKEN
+echo
+
+export CGITIZE_BITBUCKET_USERNAME=cgitize-test
+export CGITIZE_BITBUCKET_TOKEN
+export CGITIZE_GITHUB_USERNAME=cgitize-test
+export CGITIZE_GITHUB_TOKEN
+export CGITIZE_GITLAB_USERNAME=cgitize-test
+export CGITIZE_GITLAB_TOKEN

{cgitize-5.1.4 → cgitize-6.0.1}/test/unit/test_github.py

@@ -6,12 +6,12 @@
 import os
 import unittest
 
-from github import Github, GithubException
+from github import Auth, Github, GithubException
 
 
 class GitHubTests(unittest.TestCase):
     def setUp(self):
-        self.github = Github(os.environ.get('CGITIZE_GITHUB_TOKEN'))
+        self.github = Github(auth=Auth.Token(os.environ.get('CGITIZE_GITHUB_TOKEN')))
 
     def test_nonexistent_repo(self):
         with self.assertRaises(GithubException):

cgitize-5.1.4/requirements.txt

@@ -1,20 +0,0 @@
-atlassian-python-api==3.28.1
-certifi==2025.7.14
-cffi==1.17.1
-charset-normalizer==3.4.2
-cryptography==45.0.5
-Deprecated==1.2.18
-idna==3.10
-oauthlib==3.3.1
-pycparser==2.22
-PyGithub==1.59.1
-PyJWT==2.10.1
-PyNaCl==1.5.0
-python-gitlab==2.10.1
-requests==2.32.4
-requests-oauthlib==2.0.0
-requests-toolbelt==1.0.0
-six==1.17.0
-tomli==1.2.3
-urllib3==2.5.0
-wrapt==1.17.2