From 9e6c9988162066a3ffa39f90d98702f4cbd335c4 Mon Sep 17 00:00:00 2001
From: benoit74 <benoit74@users.noreply.github.com>
Date: Fri, 24 May 2024 14:10:19 +0000
Subject: [PATCH] Bump zimit to 2.0.0-dev5 + use  warc2zim2 branch + remove
 zimit2 image workflow

---
 .../workflows/PublishDockerZimit2Image.yaml   | 30 -------------------
 CHANGELOG.md                                  |  5 ++--
 pyproject.toml                                |  2 +-
 src/zimit/__about__.py                        |  2 +-
 4 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 .github/workflows/PublishDockerZimit2Image.yaml

diff --git a/.github/workflows/PublishDockerZimit2Image.yaml b/.github/workflows/PublishDockerZimit2Image.yaml
deleted file mode 100644
index 45d82da..0000000
--- a/.github/workflows/PublishDockerZimit2Image.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Publish Docker zimit2 image
-
-on:
-  push:
-    branches:
-      - zimit2
-
-jobs:
-  publish:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build and push Docker image
-        uses: openzim/docker-publish-action@v10
-        with:
-          image-name: openzim/zimit
-          manual-tag: zimit2
-          latest-on-tag: false
-          restrict-to: openzim/zimit
-          registries: ghcr.io
-          credentials:
-            GHCRIO_USERNAME=${{ secrets.GHCR_USERNAME }}
-            GHCRIO_TOKEN=${{ secrets.GHCR_TOKEN }}
-          repo_description: auto
-          repo_overview: auto
-          platforms: |
-            linux/amd64
-            linux/arm64
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81dc91d..feb9ad0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,14 +17,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Use `warc2zim` version 2, which works without Service Worker anymore
-- Using `warc2zim2` warc2zim ⚠️ change before releasing!
-- Build temporary `zimit2` Docker image for testing ⚠️ remove before releasing!
+- Using `main` warc2zim ⚠️ change before releasing!
 - Adopt Python bootstrap conventions
 - Removed handling of redirects by zimit, they are handled by browsertrix crawler and detected properly by warc2zim
 - Upgrade to Python 3.12 + upgrade dependencies
 - `--userAgent` CLI argument overrides again the `--userAgentSuffix` and `--adminEmail` values
 - `--userAgent` CLI arguement is not mandatory anymore
-- Upgraded Browsertrix Crawler to 1.0.3
+- Upgraded Browsertrix Crawler to 1.1.3
 
 ### Fixed
 
diff --git a/pyproject.toml b/pyproject.toml
index 4648ac4..a265fee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ dependencies = [
   "requests==2.31.0",
   "inotify==0.2.10",
   "tld==0.13",
-  "warc2zim @ git+https://github.com/openzim/warc2zim@warc2zim2",
+  "warc2zim @ git+https://github.com/openzim/warc2zim@main",
 ]
 dynamic = ["authors", "classifiers", "keywords", "license", "version", "urls"]
 
diff --git a/src/zimit/__about__.py b/src/zimit/__about__.py
index 9eca36d..94eeb45 100644
--- a/src/zimit/__about__.py
+++ b/src/zimit/__about__.py
@@ -1 +1 @@
-__version__ = "2.0.0-dev4"
+__version__ = "2.0.0-dev5"