Skip to content

Commit

Permalink
Merge pull request #136 from Norsk-Programmering/dev
Browse files Browse the repository at this point in the history
Bump dependencies
  • Loading branch information
Roxedus authored Jun 21, 2024
2 parents 7a63305 + 783aa82 commit 538de80
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 36 deletions.
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

0 comments on commit 538de80

Please sign in to comment.