Update CI

.github/workflows/python.yml

@@ -15,14 +15,8 @@ jobs:
       with:
         python-version: 3.13
 
-    - name: Install dependencies
-      run: |
-        curl -sSf https://rye.astral.sh/get | bash
-        rye sync
-
-    - name: Lint code
-      run: |
-        make lint
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
 
     - name: Run tests
       run: |
@@ -32,6 +26,10 @@ jobs:
       run: |
         make coverage
 
+    - name: Lint code
+      run: |
+        make lint
+
     - name: Publish coverage
       uses: codecov/codecov-action@v4
       with:

Makefile

@@ -11,10 +11,10 @@ clean:
 	rm -rf dist
 
 lint:
-	ruff check imgdb/ test/
+	uv run ruff check imgdb/ test/
 
 coverage:
-	rye run pytest --cov-report term --cov-report xml --cov=imgdb/ test/
+	uv run pytest --cov-report term --cov-report xml --cov=imgdb/ test/
 
 test:
-	rye run pytest -ra -sv test/
+	uv run pytest -ra -sv test/

imgdb/algorithm.py

@@ -30,7 +30,9 @@ def top_colors(img: Image.Image, cut=TOP_COLOR_CUT) -> list:
     total = len(collect_colors)
     # stat = {k: round(v / total * 100, 1) for k, v in Counter(collect_colors).items() if v / total * 100 >= cut}
     # log.info(f'Collected {len(set(collect_colors)):,} uniq colors, cut to {len(stat):,} colors')
-    return [f'{k[-1]}={round(v/total*100, 1)}' for k, v in Counter(collect_colors).items() if v / total * 100 >= cut]
+    return [
+        f'{k[-1]}={round(v / total * 100, 1)}' for k, v in Counter(collect_colors).items() if v / total * 100 >= cut
+    ]
 
 
 def closest_color(pair: tuple, split=TOP_CLR_ROUND_TO) -> tuple:

imgdb/db.py

@@ -70,7 +70,7 @@ def db_save(db_or_el, fname: str, sort_by='date'):
     ):
         imgs.append(el)
     htm = DB_TMPL.format('\n'.join(str(el) for el in imgs))
-    log.debug(f'Saving {len(imgs):,} imgs, disk size {len(htm)//1024:,} KB')
+    log.debug(f'Saving {len(imgs):,} imgs, disk size {len(htm) // 1024:,} KB')
     return open(fname, 'w').write(htm)
 
 

imgdb/main.py

@@ -247,7 +247,7 @@ def generate_gallery(c: Config):
     metas, imgs = db_filter(db, c=c)
 
     max_pages = len(metas) // c.wrap_at
-    log.info(f'Generating {max_pages+1} galleries from {len(metas):,} pictures...')
+    log.info(f'Generating {max_pages + 1} galleries from {len(metas):,} pictures...')
 
     # add or remove attrs before publishing gallery
     for img in imgs:

pyproject.toml

@@ -53,8 +53,8 @@ build-backend = "hatchling.build"
 use-uv = true
 autosync = true
 
-[tool.rye]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "hatch ~= 1.14",
     "ruff ~= 0.8",
     "pytest ~= 8.3",