Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependencies #136

Merged
merged 20 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c2b88c2
Update mcr.microsoft.com/vscode/devcontainers/python Docker tag to v3.12
renovate[bot] Nov 29, 2023
6ab49d8
Update dependency environs to v11
renovate[bot] Mar 4, 2024
f3df491
Update actions/setup-python action to v5
renovate[bot] Mar 26, 2024
dcbd007
Update dependency marshmallow to v3.21.3
renovate[bot] Jun 6, 2024
3e50680
Update peter-evans/create-pull-request action to v6
renovate[bot] Jun 18, 2024
0a95220
Update actions/checkout action to v4.1.7
renovate[bot] Jun 21, 2024
763f111
Update docker/build-push-action action to v6
renovate[bot] Jun 21, 2024
12bad68
Merge pull request #135 from Norsk-Programmering/renovate/peter-evans…
Roxedus Jun 21, 2024
ab3045a
Merge pull request #134 from Norsk-Programmering/renovate/docker-buil…
Roxedus Jun 21, 2024
87eaf3e
Merge pull request #131 from Norsk-Programmering/renovate/actions-set…
Roxedus Jun 21, 2024
45c0a9f
Merge pull request #123 from Norsk-Programmering/renovate/actions-che…
Roxedus Jun 21, 2024
2d243eb
Merge pull request #130 from Norsk-Programmering/renovate/mcr.microso…
Roxedus Jun 21, 2024
1126ad4
Target python 3.12 in docker
Roxedus Jun 21, 2024
bf194db
Merge pull request #126 from Norsk-Programmering/renovate/marshmallow…
Roxedus Jun 21, 2024
b4d377f
Update dependency python-dateutil to v2.9.0.post0
renovate[bot] Jun 21, 2024
21021aa
Merge pull request #127 from Norsk-Programmering/renovate/python-date…
Roxedus Jun 21, 2024
3776ac9
Update dependency requests to v2.32.3
renovate[bot] Jun 21, 2024
c5eae7f
Merge pull request #128 from Norsk-Programmering/renovate/requests-2.x
Roxedus Jun 21, 2024
e1e74d9
Merge pull request #132 from Norsk-Programmering/renovate/environs-11.x
Roxedus Jun 21, 2024
783aa82
bump version
Roxedus Jun 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .devcontainer/Dockerfile

This file was deleted.

45 changes: 23 additions & 22 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
CheckFiles: "launcher.py cogs/"

steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].7
with:
ref: ${{ github.head_ref }}

- name: Set up Python 3.10
uses: actions/setup-python@v4.7.1
- 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: |
Expand All @@ -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
Expand All @@ -60,7 +60,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].7
- name: Create VARS
id: vars
run: |
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion amd64.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-alpine3.15
FROM python:3.12-alpine3.20

ARG BUILD_DATE
ARG VCS_REF
Expand Down
2 changes: 1 addition & 1 deletion cogs/utils/Bot_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bot_version = "0.1.14"
bot_version = "0.1.15"
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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
requests==2.31.0
marshmallow==3.21.3
python-dateutil==2.9.0.post0
requests==2.32.3