Merge branch 'main' of github.com:r-Techsupport/TechSupportBot into patch-warn-ban-message

Author: ajax146

.dockerignore

@@ -0,0 +1,29 @@
+# Temp files, cache files, etc that we do not need in the container
+.venv
+*.pyc
+.vscode
+__pycache__
+.pytest_cache
+.coverage
+.hypothesis
+.idea/
+
+# Folders that contain important information in the repo, but are not used to run the bot itself
+.github/
+DBs/
+documentation/
+tests/
+
+# Files that contain information not relevant to running the code itself
+.dockerignore
+.flake8
+.gitignore
+.pylintrc
+changelog.md
+config.default.yml
+default.env
+docker-compose.yml
+Dockerfile
+LICENSE
+Makefile
+README.md

.flake8

@@ -2,3 +2,4 @@
 ignore = DCO010, DCO023, DOC503, DOC602, DOC603, MDA002, E203, E501, E712, F401, F403, F821, W503
 style = google
 skip-checking-short-docstrings = False
+exclude = .venv

.github/dependabot.yml

@@ -5,8 +5,8 @@
 
 version: 2
 updates:
-  - package-ecosystem: "pip" # See documentation for possible values
+  - package-ecosystem: "uv" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 10
+      interval: "daily"
+    open-pull-requests-limit: 20

.github/workflows/ci.yml

@@ -15,22 +15,16 @@ jobs:
       uses: actions/setup-python@v3
       with:
         python-version: 3.11
-    - name: Install pip
-      run: |
-        python -m pip install pip==$(sed -nE 's/pip = "==(.*)"/\1/p' Pipfile)
-    - name: Install pipenv
-      run: |
-        PIPENV_VERSION=$(sed -nE 's/pipenv = "==(.*)"/\1/p' Pipfile)
-        python -m pip install pipenv==$PIPENV_VERSION
-    - name: Install from pipfile
-      run: |
-        pipenv install --system
+    - name: Install uv
+      run: python -m pip install --upgrade uv
+    - name: Sync dependencies
+      run: uv sync --frozen --all-extras
     - name: Analysing the code with black
       run: |
-        black $(git rev-parse --show-toplevel) --check
+        uv run black $(git rev-parse --show-toplevel) --check
     - name: Analysing the code with pylint
       run: |
-        pylint $(git ls-files '*.py')
+        uv run pylint $(git ls-files '*.py')
     - name: Check for CRLF line endings
       run: |
         for file in $(git ls-files); do
@@ -44,14 +38,13 @@ jobs:
         fi
     - name: Analysing the code with flake8
       run: |
-        flake8 $(git rev-parse --show-toplevel)
+        uv run flake8 $(git rev-parse --show-toplevel)
     - name: Analysing the code with isort
       run: |
-        isort --check-only $(git rev-parse --show-toplevel)/ --profile black
+        uv run isort --check-only $(git rev-parse --show-toplevel)/ --profile black
     - name: Running pytest
       run: |
-        cd techsupport_bot
-        python3.11 -m pytest tests/ -p no:warnings
+        PYTHONPATH=. uv run pytest tests/ -p no:warnings
 
   containerBuild:
     runs-on: ubuntu-latest

.gitignore

@@ -1,4 +1,5 @@
 .env
+.venv
 config.yml
 *.pyc
 .vscode
@@ -8,3 +9,4 @@ __pycache__
 .coverage
 .hypothesis
 .idea/
+configuration/guild_configs

.pylintrc

@@ -36,10 +36,6 @@ persistent=yes
 # Specify a configuration file.
 #rcfile=
 
-# When enabled, pylint would attempt to guess common misconfiguration and emit
-# user-friendly hints instead of false-positive error messages.
-suggestion-mode=yes
-
 # Allow loading of arbitrary C extensions. Extensions are imported into the
 # active Python interpreter and may run arbitrary code.
 unsafe-load-any-extension=no

Dockerfile

@@ -1,19 +1,30 @@
-FROM python:3.11-alpine
+FROM python:3.11-slim
 
-RUN apk update
-RUN apk add --no-cache postgresql-dev gcc musl-dev libpq git
+# Install OS dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    gcc \
+    git \
+    libpq-dev \
+    && rm -rf /var/lib/apt/lists/*
 
+# Install uv
+RUN pip install --no-cache-dir uv
+
+# App directory
 WORKDIR /var/TechSupportBot
 
-COPY Pipfile .
-COPY Pipfile.lock .
+# Copy dependency files first for Docker layer caching
+COPY pyproject.toml uv.lock ./
 
-RUN pip install --no-cache-dir pip==$(sed -nE 's/pip = "==(.*)"/\1/p' Pipfile) 
-RUN pip install --no-cache-dir pipenv==$(sed -nE 's/pipenv = "==(.*)"/\1/p' Pipfile)
-RUN pipenv install --system
+# Install dependencies into project venv
+RUN uv sync --frozen --no-dev
 
+# Copy project files
 COPY . .
 
-WORKDIR /var/TechSupportBot/techsupport_bot
+# Move into bot directory
+WORKDIR /var/TechSupportBot
 
-CMD python3 -u main.py
+# Run bot
+CMD ["uv", "run", "--", "python3", "-u", "main.py"]

Makefile

@@ -1,6 +1,5 @@
 image = rtechsupport/techsupport-bot
 full-image = $(image):prod
-main_dir = techsupport_bot
 
 ifeq ($(shell docker-compose -v > /dev/null 2>&1; echo $$?), 0)
 	DOCKER_COMPOSE_CMD := docker-compose
@@ -9,7 +8,8 @@ else
 endif
 
 make sync:
-	python3 -m pipenv sync -d
+	uv lock
+	uv sync --frozen
 
 check-format:
 	black --check ./
@@ -23,7 +23,7 @@ lint:
 	pylint $(shell git ls-files '*.py')
 
 test:
-	PYTHONPATH=./techsupport_bot pytest techsupport_bot/tests/ -p no:warnings
+	PYTHONPATH=./ pytest ./tests/ -p no:warnings
 
 build:
 	make establish_config