From c2b88c21657eac261ed1976c9f7f6c7abd7f23f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:59:23 +0000 Subject: [PATCH 01/11] Update mcr.microsoft.com/vscode/devcontainers/python Docker tag to v3.12 --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index bdd8992..74f98a3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1 +1 @@ -FROM mcr.microsoft.com/vscode/devcontainers/python:3.11 +FROM mcr.microsoft.com/vscode/devcontainers/python:3.12 From 6ab49d8b6d2050c5f46f03b8585423d7c2b3b2b8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 21:09:29 +0000 Subject: [PATCH 02/11] Update dependency environs to v11 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a5fb7fa..114b120 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ discord.py==2.3.2 -environs==9.5.0 +environs==11.0.0 flask==2.3.3 marshmallow==3.20.1 python-dateutil==2.8.2 From f3df491d2582751da210270cc0d5cc0dac8a5557 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:32:58 +0000 Subject: [PATCH 03/11] Update actions/setup-python action to v5 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9eefd7c..1540828 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: ref: ${{ github.head_ref }} - name: Set up Python 3.10 - uses: actions/setup-python@v4.7.1 + uses: actions/setup-python@v5.1.0 with: python-version: "3.10" From dcbd0076f767e2977fe4ae3befdeb5fd499ec16d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 04:16:48 +0000 Subject: [PATCH 04/11] Update dependency marshmallow to v3.21.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a5fb7fa..b8734ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ discord.py==2.3.2 environs==9.5.0 flask==2.3.3 -marshmallow==3.20.1 +marshmallow==3.21.3 python-dateutil==2.8.2 requests==2.31.0 \ No newline at end of file From 3e50680c148e1a2aebd1defd4966f4987a3b80b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 19:23:37 +0000 Subject: [PATCH 05/11] Update peter-evans/create-pull-request action to v6 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9eefd7c..29b554c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: - name: Create Pull Request if: failure() - uses: peter-evans/create-pull-request@v5.0.2 + uses: peter-evans/create-pull-request@v6.1.0 with: branch: actions/auto commit-message: Changes done by tests From 0a95220a76cf6b495fb59e3033feffc15c1a2022 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 16:54:39 +0000 Subject: [PATCH 06/11] Update actions/checkout action to v4.1.7 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c969bc1..f65fe4e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: CheckFiles: "launcher.py cogs/" steps: - - uses: actions/checkout@v4.1.1 + - uses: actions/checkout@v4.1.7 with: ref: ${{ github.head_ref }} @@ -60,7 +60,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.1.1 + - uses: actions/checkout@v4.1.7 - name: Create VARS id: vars run: | From 763f1113f7392dcd3600b7e3dbd5706e6b83ec99 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 16:58:28 +0000 Subject: [PATCH 07/11] Update docker/build-push-action action to v6 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c969bc1..ab7c6fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,7 +92,7 @@ jobs: driver-opts: image=moby/buildkit:master - name: Build and push - uses: docker/build-push-action@v5.1.0 + uses: docker/build-push-action@v6.1.0 with: push: true attests: type=sbom,generator=docker/buildkit-syft-scanner From 1126ad43b5e30bfbafe05e5983ba339721759bf8 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Fri, 21 Jun 2024 17:11:26 +0000 Subject: [PATCH 08/11] Target python 3.12 in docker --- .devcontainer/Dockerfile | 1 - .devcontainer/devcontainer.json | 45 +++++++++++++++++---------------- .github/workflows/build.yml | 4 +-- amd64.Dockerfile | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 .devcontainer/Dockerfile diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index 74f98a3..0000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM mcr.microsoft.com/vscode/devcontainers/python:3.12 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8a7357c..610d773 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,33 +2,34 @@ // https://github.com/microsoft/vscode-dev-containers/tree/v0.154.2/containers/python-3 { "name": "Python 3", - "build": { - "dockerfile": "Dockerfile", - "context": ".." - }, + "image": "mcr.microsoft.com/vscode/devcontainers/python:3.12", // Set *default* container specific settings.json values on container create. - "settings": { - "python.pythonPath": "/usr/local/bin/python", - "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8", - "python.formatting.blackPath": "/usr/local/py-utils/bin/black", - "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf", - "python.linting.banditPath": "/usr/local/py-utils/bin/bandit", - "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8", - "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy", - "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle", - "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle", - "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint" + "customizations": { + "vscode": { + "settings": { + "python.pythonPath": "/usr/local/bin/python", + "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8", + "python.formatting.blackPath": "/usr/local/py-utils/bin/black", + "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf", + "python.linting.banditPath": "/usr/local/py-utils/bin/bandit", + "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8", + "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy", + "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle", + "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle", + "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint" + }, + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "ms-azuretools.vscode-docker", + "ms-python.python", + "ms-python.vscode-pylance" + ] + } }, - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "ms-azuretools.vscode-docker", - "ms-python.python", - "ms-python.vscode-pylance" - ], // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [], // Use 'postCreateCommand' to run commands after the container is created. "postCreateCommand": "pip3 install --user -r requirements.txt && pip3 install --user isort", // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "vscode" -} +} \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1851db..2d029e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,10 +21,10 @@ jobs: with: ref: ${{ github.head_ref }} - - name: Set up Python 3.10 + - name: Set up Python 3.12 uses: actions/setup-python@v5.1.0 with: - python-version: "3.10" + python-version: "3.12" - name: Install dependencies run: | diff --git a/amd64.Dockerfile b/amd64.Dockerfile index 92854b1..3d03d78 100644 --- a/amd64.Dockerfile +++ b/amd64.Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-alpine3.15 +FROM python:3.12-alpine3.20 ARG BUILD_DATE ARG VCS_REF From b4d377fdb9e89672989141263a87e392c39611a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:24:57 +0000 Subject: [PATCH 09/11] Update dependency python-dateutil to v2.9.0.post0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b8734ac..780168a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,5 @@ discord.py==2.3.2 environs==9.5.0 flask==2.3.3 marshmallow==3.21.3 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 requests==2.31.0 \ No newline at end of file From 3776ac9c4bd11bfba8b4fe7bf5ab9eebc4ddac11 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:27:30 +0000 Subject: [PATCH 10/11] Update dependency requests to v2.32.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 780168a..5c3cbc1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ environs==9.5.0 flask==2.3.3 marshmallow==3.21.3 python-dateutil==2.9.0.post0 -requests==2.31.0 \ No newline at end of file +requests==2.32.3 \ No newline at end of file From 783aa8212de750d325f56254404bd1dc0c190bfc Mon Sep 17 00:00:00 2001 From: Roxedus Date: Fri, 21 Jun 2024 22:57:54 +0000 Subject: [PATCH 11/11] bump version --- cogs/utils/Bot_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/utils/Bot_version.py b/cogs/utils/Bot_version.py index 16e14b3..9128285 100644 --- a/cogs/utils/Bot_version.py +++ b/cogs/utils/Bot_version.py @@ -1 +1 @@ -bot_version = "0.1.14" +bot_version = "0.1.15"