cgitize 5.1.4__tar.gz → 6.0.0__tar.gz

{cgitize-5.1.4 → cgitize-6.0.0}/.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']
     name: 'Test / ${{ matrix.python-version }}'
     env:
       CGITIZE_GITHUB_USERNAME: cgitize-test

{cgitize-5.1.4 → cgitize-6.0.0}/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,13 +36,13 @@ 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
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 5.1.4
+Version: 6.0.0
 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.0}/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.0}/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.0/cgitize.egg-info}/PKG-INFO

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

@@ -47,6 +47,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.0}/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.0}/docker/README.md

@@ -50,13 +50,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

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

@@ -1,20 +1,23 @@
-atlassian-python-api==3.28.1
+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==1.59.1
+PyGithub==2.6.1
 PyJWT==2.10.1
 PyNaCl==1.5.0
-python-gitlab==2.10.1
+python-gitlab==6.1.0
 requests==2.32.4
 requests-oauthlib==2.0.0
 requests-toolbelt==1.0.0
-six==1.17.0
+soupsieve==2.7
 tomli==1.2.3
+typing_extensions==4.14.1
 urllib3==2.5.0
 wrapt==1.17.2

cgitize-6.0.0/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.0}/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):