Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/peter-evans/create…
Browse files Browse the repository at this point in the history
…-pull-request-7.0.5
  • Loading branch information
MVrachev authored Oct 26, 2024
2 parents 085ea9d + 60bb2f2 commit 8674f96
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-versions: [ "3.10", "3.11", "3.12" ]
python-versions: [ "3.12" ]

steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
with:
python-version: ${{ matrix.python-versions }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
ref: ${{ inputs.image_version }}

- name: Set default Python version
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
with:
python-version: '3.10'
python-version: '3.12'

- name: Set up QEMU
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_docker_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
with:
python-version: '3.12'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard (optional).
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/test_docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
with:
python-version: '3.12'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-pre-commit-hooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
with:
python-version: "3.11"
python-version: "3.12"
- name: Install prerequisites
run: |
pip install pre-commit tox
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-python-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
python-versions: ["3.12"]
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
with:
python-version: ${{ matrix.python-versions }}
- name: Install prerequisites
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: end-of-file-fixer
Expand All @@ -20,12 +20,12 @@ repos:
- id: isort
args: [-l79, --profile, black, --check, --diff]
- repo: https://github.com/psf/black
rev: '24.8.0'
rev: '24.10.0'
hooks:
- id: black
args: [-l79, --check, --diff, .]
- repo: https://github.com/PyCQA/bandit
rev: '1.7.9'
rev: '1.7.10'
hooks:
- id: bandit
args: ["-r", "repository_service_tuf_api"]
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#

# Base
FROM python:3.12-slim as base_os
FROM python:3.12-slim AS base_os

# Builder requirements and deps
FROM base_os as builder
FROM base_os AS builder

ENV PYTHONDONTWRITEBYTECODE=1
ADD requirements.txt /builder/requirements.txt
Expand All @@ -19,7 +19,7 @@ RUN apt-get remove gcc --purge -y \
&& apt-get autoremove --yes

# Final image
FROM base_os as pre-final
FROM base_os AS pre-final
COPY --from=builder /root/.local/bin /usr/local/bin/
COPY --from=builder /root/.local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages/

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ else
endif

stop:
docker-compose down -v
docker compose down -v

clean:
$(MAKE) stop
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Usage
Development tools
=================

- Python >=3.10
- Python >=3.12
- pip
- Pipenv
- Docker
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ services:
condition: service_healthy

web:
image: python:3.10-slim-buster
image: python:3.12-slim
command: python -m http.server -d /var/opt/repository-service-tuf/storage 8080
volumes:
- repository-service-tuf-storage:/var/opt/repository-service-tuf/storage
Expand Down
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py310,py311,py312,requirements,precommit,lint,test,test-docs
envlist = py312,requirements,precommit,lint,test,test-docs

[testenv]
setenv =
Expand Down Expand Up @@ -83,6 +83,4 @@ commands =

[gh-actions]
python =
3.10: py310,pep8,lint,requirements,precommit,test,test-docs
3.11: py311,pep8,lint,requirements,precommit,test,test-docs
3.12: py312,pep8,lint,requirements,precommit,test,test-docs

0 comments on commit 8674f96

Please sign in to comment.