From 0858fbe4c68aa76060543ede4a865c92d841ef21 Mon Sep 17 00:00:00 2001
From: Naramsim <igougi.ui@gmail.com>
Date: Tue, 7 May 2024 20:28:33 +0200
Subject: [PATCH 1/3] feat: use newer ditto/update python

---
 .circleci/config.yml | 10 +++++-----
 requirements.txt     | 11 -----------
 updater/cmd.bash     |  4 ++--
 3 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0b7c720ccd..425727467b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,17 +1,17 @@
 version: 2.1
 
 executors:
-  python36:
+  python3:
     docker:
-      - image: cimg/python:3.6.15
+      - image: cimg/python:3.12.3
 
 commands:
   ditto-transform:
     description: Run Ditto in order to transform the BASE_URL instead of http://localhost
     steps:
       - run:
-          name: Install requirements.txt
-          command: pip install --user -r requirements.txt
+          name: Install Ditto
+          command: pip install --user pokeapi-ditto
       - run:
           name: Transform api-data's JSON files to have the correct BASE_URL instead of http://localhost
           command: bash -x scripts/transform.sh
@@ -23,7 +23,7 @@ jobs:
       - checkout
       - ditto-transform
   build-and-deploy:
-    executor: python36
+    executor: python3
     steps:
       - checkout
       - ditto-transform
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index f49c103c53..0000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-certifi==2018.8.24
-chardet==3.0.4
-genson==1.0.1
-idna==2.7
-multidict==4.4.2
-odictliteral==1.0.0
-pokeapi-ditto==0.6.1
-requests==2.20.0
-tqdm==4.26.0
-urllib3==1.24.2
-yarl==1.2.6
diff --git a/updater/cmd.bash b/updater/cmd.bash
index 10542b094f..64cfcac1cd 100644
--- a/updater/cmd.bash
+++ b/updater/cmd.bash
@@ -34,8 +34,8 @@ git branch -D "$BRANCH_NAME" || true
 git branch "$BRANCH_NAME"
 git checkout "$BRANCH_NAME"
 
-pip install -r requirements.txt
-rm -r ./data
+pip install pokeapi-ditto
+rm -rf ./data
 ditto clone --src-url http://localhost/ --dest-dir ./data
 # (╯°□°)╯ *always* assume magikarp failed and grab it again #clowntown
 ditto clone --src-url http://localhost/ --dest-dir ./data --select pokemon/129

From 789b1282f396b88fd7c5a465cd9bb3e9cfba9f86 Mon Sep 17 00:00:00 2001
From: Naramsim <igougi.ui@gmail.com>
Date: Tue, 7 May 2024 20:29:43 +0200
Subject: [PATCH 2/3] fix: use right executor

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 425727467b..e877585cb3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,7 @@ commands:
 
 jobs:
   test:
-    executor: python36
+    executor: python3
     steps:
       - checkout
       - ditto-transform

From 1c5c6656bf548d8c35d4ead5e87eb00ce42b9d5a Mon Sep 17 00:00:00 2001
From: Naramsim <igougi.ui@gmail.com>
Date: Tue, 7 May 2024 20:54:46 +0200
Subject: [PATCH 3/3] sec: fix deps

---
 .circleci/config.yml                             | 2 +-
 .github/workflows/{docker-build.yml => test.yml} | 0
 updater/cmd.bash                                 | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename .github/workflows/{docker-build.yml => test.yml} (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e877585cb3..438a78180d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ commands:
     steps:
       - run:
           name: Install Ditto
-          command: pip install --user pokeapi-ditto
+          command: pip install --user 'pokeapi-ditto==1.0.2'
       - run:
           name: Transform api-data's JSON files to have the correct BASE_URL instead of http://localhost
           command: bash -x scripts/transform.sh
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/test.yml
similarity index 100%
rename from .github/workflows/docker-build.yml
rename to .github/workflows/test.yml
diff --git a/updater/cmd.bash b/updater/cmd.bash
index 64cfcac1cd..2fe553f375 100644
--- a/updater/cmd.bash
+++ b/updater/cmd.bash
@@ -34,7 +34,7 @@ git branch -D "$BRANCH_NAME" || true
 git branch "$BRANCH_NAME"
 git checkout "$BRANCH_NAME"
 
-pip install pokeapi-ditto
+pip install 'pokeapi-ditto==1.0.2'
 rm -rf ./data
 ditto clone --src-url http://localhost/ --dest-dir ./data
 # (╯°□°)╯ *always* assume magikarp failed and grab it again #clowntown