Update dependencies and Dockerfiles for revival

- Update python-telegram-bot from 20.6 to 21.11.1 (latest 21.x)
- Update pandas to 3.0.1, requests to 2.32.5, cachetools to 7.0.1
- Update humanize to 4.15.0, markdownify to 1.2.2, schedule to 1.2.2
- Update mplfinance to 0.12.10a7, ruff to 0.15.2
- Add pytest 9.0.2 to dev requirements
- Update Dockerfiles to Python 3.12-bookworm/slim
- Enable ruff linting in GitLab CI with updated Python 3.12 image

.gitlab-ci.yml

@@ -1,21 +1,23 @@
-stages:
+stages:
-  - lint
+  - lint
-  - build_site
+  - build_site
-  - deploy
+  - deploy
-
+
-# ruff:
+ruff:
-#   stage: lint
+  stage: lint
-#   image: python:3.11-slim
+  image: python:3.12-slim
-#   script:
+  script:
-#     - pip3 install ruff
+    - pip3 install ruff==0.15.2
-#     - ruff . --output-format gitlab; ruff format . --diff
+    - ruff check . --output-format gitlab
-
+    - ruff format . --check
-# prettier:
+  allow_failure: false
-#   stage: lint
+
-#   image: node:16-slim # Use Node.js image since prettier is a Node.js tool
+# prettier:
-#   script:
+#   stage: lint
-#     - npm install prettier
+#   image: node:16-slim # Use Node.js image since prettier is a Node.js tool
-#     - npx prettier --check . # Adjust the path as needed
+#   script:
-
+#     - npm install prettier
-include:
+#     - npx prettier --check . # Adjust the path as needed
-  - local: /site/.gitlab-ci.yml
+
+include:
+  - local: /site/.gitlab-ci.yml

common/requirements.txt

@@ -1,8 +1,8 @@
-cachetools==5.3.1
+cachetools==7.0.1
-humanize==4.8.0
+humanize==4.15.0
-markdownify==0.11.6
+markdownify==1.2.2
-mplfinance==0.12.10b0
+mplfinance==0.12.10a7
-pandas==2.1.1
+pandas==3.0.1
-requests==2.31.0
+requests==2.32.5
-rush==2021.4.0
+rush==2021.4.0
-schedule==1.2.1
+schedule==1.2.2

dev-reqs.txt

@@ -1,10 +1,11 @@
--r common/requirements.txt
+-r common/requirements.txt
--r site/requirements.txt
+-r site/requirements.txt
-ipython==8.16.1
+ipython==8.16.1
-jupyter_client==8.4.0
+jupyter_client==8.4.0
-jupyter_core==5.4.0
+jupyter_core==5.4.0
-pylama==8.4.1
+pylama==8.4.1
-mypy==1.5.1
+mypy==1.5.1
-types-cachetools==5.3.0.6
+types-cachetools==5.3.0.6
-types-pytz==2023.3.1.1
+types-pytz==2023.3.1.1
-ruff==0.1.6
+ruff==0.15.2
+pytest==9.0.2

discord/Dockerfile

@@ -1,19 +1,19 @@
-FROM python:3.11-buster AS builder
+FROM python:3.12-bookworm AS builder
-
+
-
+
-COPY discord/discord-reqs.txt .
+COPY discord/discord-reqs.txt .
-COPY common/requirements.txt .
+COPY common/requirements.txt .
-
+
-RUN pip install --user -r discord-reqs.txt
+RUN pip install --user -r discord-reqs.txt
-
+
-
+
-FROM python:3.11-slim
+FROM python:3.12-slim
-
+
-ENV MPLBACKEND=Agg
+ENV MPLBACKEND=Agg
-
+
-COPY --from=builder /root/.local /root/.local
+COPY --from=builder /root/.local /root/.local
-
+
-COPY common common
+COPY common common
-COPY discord .
+COPY discord .
-
+
-CMD [ "python", "./bot.py" ]
+CMD [ "python", "./bot.py" ]

telegram/Dockerfile

@@ -1,22 +1,22 @@
-FROM python:3.11-buster AS builder
+FROM python:3.12-bookworm AS builder
-
+
-
+
-COPY telegram/telegram-reqs.txt .
+COPY telegram/telegram-reqs.txt .
-COPY common/requirements.txt .
+COPY common/requirements.txt .
-
+
-RUN pip install --user -r telegram-reqs.txt
+RUN pip install --user -r telegram-reqs.txt
-
+
-
+
-FROM python:3.11-slim
+FROM python:3.12-slim
-
+
-ENV MPLBACKEND=Agg
+ENV MPLBACKEND=Agg
-
+
-COPY --from=builder /root/.local /root/.local
+COPY --from=builder /root/.local /root/.local
-
+
-
+
-COPY common common
+COPY common common
-COPY telegram .
+COPY telegram .
-
+
-
+
-
+
-CMD [ "python", "./bot.py" ]
+CMD [ "python", "./bot.py" ]

telegram/telegram-reqs.txt

@@ -1,2 +1,2 @@
-python-telegram-bot==20.6
+python-telegram-bot==21.11.1
--r requirements.txt
+-r requirements.txt