chore(deps): lock file maintenance (#335)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.dictionary

@@ -0,0 +1,2 @@
+PyPi
+docker-autotag

.drone.jsonnet

@@ -1,368 +0,0 @@
-local PythonVersion(pyversion='3.6') = {
-  name: 'python' + std.strReplace(pyversion, '.', '') + '-pytest',
-  image: 'python:' + pyversion,
-  environment: {
-    PY_COLORS: 1,
-  },
-  commands: [
-    'pip install poetry poetry-dynamic-versioning -qq',
-    'poetry install -q',
-    'poetry version',
-    'poetry run docker-autotag --help',
-  ],
-  depends_on: [
-    'fetch',
-  ],
-};
-
-local PipelineLint = {
-  kind: 'pipeline',
-  image_pull_secrets: ['docker_config'],
-  name: 'lint',
-  platform: {
-    os: 'linux',
-    arch: 'amd64',
-  },
-  steps: [
-    {
-      name: 'yapf',
-      image: 'python:3.9',
-      environment: {
-        PY_COLORS: 1,
-      },
-      commands: [
-        'git fetch -tq',
-        'pip install poetry poetry-dynamic-versioning -qq',
-        'poetry install -q',
-        'poetry run yapf -dr ./dockerautotag',
-      ],
-    },
-    {
-      name: 'flake8',
-      image: 'python:3.9',
-      environment: {
-        PY_COLORS: 1,
-      },
-      commands: [
-        'git fetch -tq',
-        'pip install poetry poetry-dynamic-versioning -qq',
-        'poetry install -q',
-        'poetry run flake8 ./dockerautotag',
-      ],
-    },
-  ],
-  trigger: {
-    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
-  },
-};
-
-local PipelineTest = {
-  kind: 'pipeline',
-  image_pull_secrets: ['docker_config'],
-  name: 'test',
-  platform: {
-    os: 'linux',
-    arch: 'amd64',
-  },
-  steps: [
-    {
-      name: 'fetch',
-      image: 'python:3.9',
-      commands: [
-        'git fetch -tq',
-      ],
-    },
-    PythonVersion(pyversion='3.6'),
-    PythonVersion(pyversion='3.7'),
-    PythonVersion(pyversion='3.8'),
-    PythonVersion(pyversion='3.9'),
-  ],
-  depends_on: [
-    'lint',
-  ],
-  trigger: {
-    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
-  },
-};
-
-local PipelineSecurity = {
-  kind: 'pipeline',
-  image_pull_secrets: ['docker_config'],
-  name: 'security',
-  platform: {
-    os: 'linux',
-    arch: 'amd64',
-  },
-  steps: [
-    {
-      name: 'bandit',
-      image: 'python:3.9',
-      environment: {
-        PY_COLORS: 1,
-      },
-      commands: [
-        'git fetch -tq',
-        'pip install poetry poetry-dynamic-versioning -qq',
-        'poetry install -q',
-        'poetry run bandit -r ./dockerautotag -x ./dockerautotag/test',
-      ],
-    },
-  ],
-  depends_on: [
-    'test',
-  ],
-  trigger: {
-    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
-  },
-};
-
-local PipelineBuildPackage = {
-  kind: 'pipeline',
-  image_pull_secrets: ['docker_config'],
-  name: 'build-package',
-  platform: {
-    os: 'linux',
-    arch: 'amd64',
-  },
-  steps: [
-    {
-      name: 'build',
-      image: 'python:3.9',
-      commands: [
-        'git fetch -tq',
-        'pip install poetry poetry-dynamic-versioning -qq',
-        'poetry build',
-      ],
-    },
-    {
-      name: 'checksum',
-      image: 'alpine',
-      commands: [
-        'cd dist/ && sha256sum * > ../sha256sum.txt',
-      ],
-    },
-    {
-      name: 'publish-github',
-      image: 'plugins/github-release',
-      settings: {
-        overwrite: true,
-        api_key: { from_secret: 'github_token' },
-        files: ['dist/*', 'sha256sum.txt'],
-        title: '${DRONE_TAG}',
-        note: 'CHANGELOG.md',
-      },
-      when: {
-        ref: ['refs/tags/**'],
-      },
-    },
-    {
-      name: 'publish-pypi',
-      image: 'python:3.9',
-      commands: [
-        'git fetch -tq',
-        'pip install poetry poetry-dynamic-versioning -qq',
-        'poetry publish -n',
-      ],
-      environment: {
-        POETRY_HTTP_BASIC_PYPI_USERNAME: { from_secret: 'pypi_username' },
-        POETRY_HTTP_BASIC_PYPI_PASSWORD: { from_secret: 'pypi_password' },
-      },
-      when: {
-        ref: ['refs/tags/**'],
-      },
-    },
-  ],
-  depends_on: [
-    'security',
-  ],
-  trigger: {
-    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
-  },
-};
-
-local PipelineBuildContainer(arch='amd64') = {
-  kind: 'pipeline',
-  image_pull_secrets: ['docker_config'],
-  name: 'build-container-' + arch,
-  platform: {
-    os: 'linux',
-    arch: arch,
-  },
-  steps: [
-    {
-      name: 'build',
-      image: 'python:3.9',
-      commands: [
-        'git fetch -tq',
-        'pip install poetry poetry-dynamic-versioning -qq',
-        'poetry build',
-      ],
-    },
-    {
-      name: 'dryrun',
-      image: 'plugins/docker:19',
-      settings: {
-        config: { from_secret: 'docker_config' },
-        dry_run: true,
-        dockerfile: 'docker/Dockerfile.' + arch,
-        repo: 'thegeeklab/${DRONE_REPO_NAME}',
-        username: { from_secret: 'docker_username' },
-        password: { from_secret: 'docker_password' },
-      },
-      depends_on: ['build'],
-      when: {
-        ref: ['refs/pull/**'],
-      },
-    },
-    {
-      name: 'publish-dockerhub',
-      image: 'plugins/docker:19',
-      settings: {
-        config: { from_secret: 'docker_config' },
-        auto_tag: true,
-        auto_tag_suffix: arch,
-        dockerfile: 'docker/Dockerfile.' + arch,
-        repo: 'thegeeklab/${DRONE_REPO_NAME}',
-        username: { from_secret: 'docker_username' },
-        password: { from_secret: 'docker_password' },
-      },
-      when: {
-        ref: ['refs/heads/main', 'refs/tags/**'],
-      },
-      depends_on: ['dryrun'],
-    },
-    {
-      name: 'publish-quay',
-      image: 'plugins/docker:19',
-      settings: {
-        config: { from_secret: 'docker_config' },
-        auto_tag: true,
-        auto_tag_suffix: arch,
-        dockerfile: 'docker/Dockerfile.' + arch,
-        registry: 'quay.io',
-        repo: 'quay.io/thegeeklab/${DRONE_REPO_NAME}',
-        username: { from_secret: 'quay_username' },
-        password: { from_secret: 'quay_password' },
-      },
-      when: {
-        ref: ['refs/heads/main', 'refs/tags/**'],
-      },
-      depends_on: ['dryrun'],
-    },
-  ],
-  depends_on: [
-    'security',
-  ],
-  trigger: {
-    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
-  },
-};
-
-local PipelineNotifications = {
-  kind: 'pipeline',
-  image_pull_secrets: ['docker_config'],
-  name: 'notifications',
-  platform: {
-    os: 'linux',
-    arch: 'amd64',
-  },
-  steps: [
-    {
-      image: 'plugins/manifest',
-      name: 'manifest-dockerhub',
-      settings: {
-        ignore_missing: true,
-        auto_tag: true,
-        username: { from_secret: 'docker_username' },
-        password: { from_secret: 'docker_password' },
-        spec: 'docker/manifest.tmpl',
-      },
-      when: {
-        status: ['success'],
-      },
-    },
-    {
-      image: 'plugins/manifest',
-      name: 'manifest-quay',
-      settings: {
-        ignore_missing: true,
-        auto_tag: true,
-        username: { from_secret: 'quay_username' },
-        password: { from_secret: 'quay_password' },
-        spec: 'docker/manifest-quay.tmpl',
-      },
-      when: {
-        status: ['success'],
-      },
-    },
-    {
-      name: 'pushrm-dockerhub',
-      pull: 'always',
-      image: 'chko/docker-pushrm:1',
-      environment: {
-        DOCKER_PASS: {
-          from_secret: 'docker_password',
-        },
-        DOCKER_USER: {
-          from_secret: 'docker_username',
-        },
-        PUSHRM_FILE: 'README.md',
-        PUSHRM_SHORT: 'Create docker tags from a given version string',
-        PUSHRM_TARGET: 'thegeeklab/${DRONE_REPO_NAME}',
-      },
-      when: {
-        status: ['success'],
-      },
-    },
-    {
-      name: 'pushrm-quay',
-      pull: 'always',
-      image: 'chko/docker-pushrm:1',
-      environment: {
-        APIKEY__QUAY_IO: {
-          from_secret: 'quay_token',
-        },
-        PUSHRM_FILE: 'README.md',
-        PUSHRM_TARGET: 'quay.io/thegeeklab/${DRONE_REPO_NAME}',
-      },
-      when: {
-        status: ['success'],
-      },
-    },
-    {
-      name: 'matrix',
-      image: 'plugins/matrix',
-      settings: {
-        homeserver: { from_secret: 'matrix_homeserver' },
-        roomid: { from_secret: 'matrix_roomid' },
-        template: 'Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}',
-        username: { from_secret: 'matrix_username' },
-        password: { from_secret: 'matrix_password' },
-      },
-      when: {
-        status: ['success', 'failure'],
-      },
-    },
-  ],
-  depends_on: [
-    'build-package',
-    'build-container-amd64',
-    'build-container-arm64',
-    'build-container-arm',
-  ],
-  trigger: {
-    ref: ['refs/heads/main', 'refs/tags/**'],
-    status: ['success', 'failure'],
-  },
-};
-
-[
-  PipelineLint,
-  PipelineTest,
-  PipelineSecurity,
-  PipelineBuildPackage,
-  PipelineBuildContainer(arch='amd64'),
-  PipelineBuildContainer(arch='arm64'),
-  PipelineBuildContainer(arch='arm'),
-  PipelineNotifications,
-]

.drone.yml

@@ -1,570 +0,0 @@
----
-kind: pipeline
-name: lint
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: yapf
-  image: python:3.9
-  commands:
-  - git fetch -tq
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry install -q
-  - poetry run yapf -dr ./dockerautotag
-  environment:
-    PY_COLORS: 1
-
-- name: flake8
-  image: python:3.9
-  commands:
-  - git fetch -tq
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry install -q
-  - poetry run flake8 ./dockerautotag
-  environment:
-    PY_COLORS: 1
-
-image_pull_secrets:
-- docker_config
-
-trigger:
-  ref:
-  - refs/heads/main
-  - refs/tags/**
-  - refs/pull/**
-
----
-kind: pipeline
-name: test
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: fetch
-  image: python:3.9
-  commands:
-  - git fetch -tq
-
-- name: python36-pytest
-  image: python:3.6
-  commands:
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry install -q
-  - poetry version
-  - poetry run docker-autotag --help
-  environment:
-    PY_COLORS: 1
-  depends_on:
-  - fetch
-
-- name: python37-pytest
-  image: python:3.7
-  commands:
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry install -q
-  - poetry version
-  - poetry run docker-autotag --help
-  environment:
-    PY_COLORS: 1
-  depends_on:
-  - fetch
-
-- name: python38-pytest
-  image: python:3.8
-  commands:
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry install -q
-  - poetry version
-  - poetry run docker-autotag --help
-  environment:
-    PY_COLORS: 1
-  depends_on:
-  - fetch
-
-- name: python39-pytest
-  image: python:3.9
-  commands:
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry install -q
-  - poetry version
-  - poetry run docker-autotag --help
-  environment:
-    PY_COLORS: 1
-  depends_on:
-  - fetch
-
-image_pull_secrets:
-- docker_config
-
-trigger:
-  ref:
-  - refs/heads/main
-  - refs/tags/**
-  - refs/pull/**
-
-depends_on:
-- lint
-
----
-kind: pipeline
-name: security
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: bandit
-  image: python:3.9
-  commands:
-  - git fetch -tq
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry install -q
-  - poetry run bandit -r ./dockerautotag -x ./dockerautotag/test
-  environment:
-    PY_COLORS: 1
-
-image_pull_secrets:
-- docker_config
-
-trigger:
-  ref:
-  - refs/heads/main
-  - refs/tags/**
-  - refs/pull/**
-
-depends_on:
-- test
-
----
-kind: pipeline
-name: build-package
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: build
-  image: python:3.9
-  commands:
-  - git fetch -tq
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry build
-
-- name: checksum
-  image: alpine
-  commands:
-  - cd dist/ && sha256sum * > ../sha256sum.txt
-
-- name: publish-github
-  image: plugins/github-release
-  settings:
-    api_key:
-      from_secret: github_token
-    files:
-    - dist/*
-    - sha256sum.txt
-    note: CHANGELOG.md
-    overwrite: true
-    title: ${DRONE_TAG}
-  when:
-    ref:
-    - refs/tags/**
-
-- name: publish-pypi
-  image: python:3.9
-  commands:
-  - git fetch -tq
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry publish -n
-  environment:
-    POETRY_HTTP_BASIC_PYPI_PASSWORD:
-      from_secret: pypi_password
-    POETRY_HTTP_BASIC_PYPI_USERNAME:
-      from_secret: pypi_username
-  when:
-    ref:
-    - refs/tags/**
-
-image_pull_secrets:
-- docker_config
-
-trigger:
-  ref:
-  - refs/heads/main
-  - refs/tags/**
-  - refs/pull/**
-
-depends_on:
-- security
-
----
-kind: pipeline
-name: build-container-amd64
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: build
-  image: python:3.9
-  commands:
-  - git fetch -tq
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry build
-
-- name: dryrun
-  image: plugins/docker:19
-  settings:
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.amd64
-    dry_run: true
-    password:
-      from_secret: docker_password
-    repo: thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: docker_username
-  when:
-    ref:
-    - refs/pull/**
-  depends_on:
-  - build
-
-- name: publish-dockerhub
-  image: plugins/docker:19
-  settings:
-    auto_tag: true
-    auto_tag_suffix: amd64
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.amd64
-    password:
-      from_secret: docker_password
-    repo: thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: docker_username
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/**
-  depends_on:
-  - dryrun
-
-- name: publish-quay
-  image: plugins/docker:19
-  settings:
-    auto_tag: true
-    auto_tag_suffix: amd64
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.amd64
-    password:
-      from_secret: quay_password
-    registry: quay.io
-    repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: quay_username
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/**
-  depends_on:
-  - dryrun
-
-image_pull_secrets:
-- docker_config
-
-trigger:
-  ref:
-  - refs/heads/main
-  - refs/tags/**
-  - refs/pull/**
-
-depends_on:
-- security
-
----
-kind: pipeline
-name: build-container-arm64
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-- name: build
-  image: python:3.9
-  commands:
-  - git fetch -tq
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry build
-
-- name: dryrun
-  image: plugins/docker:19
-  settings:
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.arm64
-    dry_run: true
-    password:
-      from_secret: docker_password
-    repo: thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: docker_username
-  when:
-    ref:
-    - refs/pull/**
-  depends_on:
-  - build
-
-- name: publish-dockerhub
-  image: plugins/docker:19
-  settings:
-    auto_tag: true
-    auto_tag_suffix: arm64
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.arm64
-    password:
-      from_secret: docker_password
-    repo: thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: docker_username
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/**
-  depends_on:
-  - dryrun
-
-- name: publish-quay
-  image: plugins/docker:19
-  settings:
-    auto_tag: true
-    auto_tag_suffix: arm64
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.arm64
-    password:
-      from_secret: quay_password
-    registry: quay.io
-    repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: quay_username
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/**
-  depends_on:
-  - dryrun
-
-image_pull_secrets:
-- docker_config
-
-trigger:
-  ref:
-  - refs/heads/main
-  - refs/tags/**
-  - refs/pull/**
-
-depends_on:
-- security
-
----
-kind: pipeline
-name: build-container-arm
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build
-  image: python:3.9
-  commands:
-  - git fetch -tq
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry build
-
-- name: dryrun
-  image: plugins/docker:19
-  settings:
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.arm
-    dry_run: true
-    password:
-      from_secret: docker_password
-    repo: thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: docker_username
-  when:
-    ref:
-    - refs/pull/**
-  depends_on:
-  - build
-
-- name: publish-dockerhub
-  image: plugins/docker:19
-  settings:
-    auto_tag: true
-    auto_tag_suffix: arm
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.arm
-    password:
-      from_secret: docker_password
-    repo: thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: docker_username
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/**
-  depends_on:
-  - dryrun
-
-- name: publish-quay
-  image: plugins/docker:19
-  settings:
-    auto_tag: true
-    auto_tag_suffix: arm
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.arm
-    password:
-      from_secret: quay_password
-    registry: quay.io
-    repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: quay_username
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/**
-  depends_on:
-  - dryrun
-
-image_pull_secrets:
-- docker_config
-
-trigger:
-  ref:
-  - refs/heads/main
-  - refs/tags/**
-  - refs/pull/**
-
-depends_on:
-- security
-
----
-kind: pipeline
-name: notifications
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: manifest-dockerhub
-  image: plugins/manifest
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    password:
-      from_secret: docker_password
-    spec: docker/manifest.tmpl
-    username:
-      from_secret: docker_username
-  when:
-    status:
-    - success
-
-- name: manifest-quay
-  image: plugins/manifest
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    password:
-      from_secret: quay_password
-    spec: docker/manifest-quay.tmpl
-    username:
-      from_secret: quay_username
-  when:
-    status:
-    - success
-
-- name: pushrm-dockerhub
-  pull: always
-  image: chko/docker-pushrm:1
-  environment:
-    DOCKER_PASS:
-      from_secret: docker_password
-    DOCKER_USER:
-      from_secret: docker_username
-    PUSHRM_FILE: README.md
-    PUSHRM_SHORT: Create docker tags from a given version string
-    PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
-  when:
-    status:
-    - success
-
-- name: pushrm-quay
-  pull: always
-  image: chko/docker-pushrm:1
-  environment:
-    APIKEY__QUAY_IO:
-      from_secret: quay_token
-    PUSHRM_FILE: README.md
-    PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
-  when:
-    status:
-    - success
-
-- name: matrix
-  image: plugins/matrix
-  settings:
-    homeserver:
-      from_secret: matrix_homeserver
-    password:
-      from_secret: matrix_password
-    roomid:
-      from_secret: matrix_roomid
-    template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}"
-    username:
-      from_secret: matrix_username
-  when:
-    status:
-    - success
-    - failure
-
-image_pull_secrets:
-- docker_config
-
-trigger:
-  ref:
-  - refs/heads/main
-  - refs/tags/**
-  status:
-  - success
-  - failure
-
-depends_on:
-- build-package
-- build-container-amd64
-- build-container-arm64
-- build-container-arm
-
----
-kind: signature
-hmac: 89b486c8acd23db08d74f6c0c26ccae5a491727a28757201c7ec0ddd3a1de3ac
-
-...

.flake8

@@ -1,3 +0,0 @@
-[flake8]
-# Requires `flake8-colors`. This is the formatting suggested by the package (and used in flake8 repository itself).
-format = ${cyan}%(path)s${reset}:${yellow_bold}%(row)d${reset}:${green_bold}%(col)d${reset}: ${red_bold}%(code)s${reset} %(text)s

.github/settings.yml

@@ -1,4 +1,3 @@
----
 repository:
   name: docker-autotag
   description: Create docker tags from a given version string
@@ -8,7 +7,7 @@ repository:
   has_issues: true
   has_projects: false
   has_wiki: false
-  has_downloads: false
+  has_downloads: true
 
   default_branch: main
 
@@ -50,8 +49,13 @@ branches:
     protection:
       required_pull_request_reviews: null
       required_status_checks:
-        strict: true
+        strict: false
         contexts:
-          - continuous-integration/drone/pr
-      enforce_admins: null
+          - ci/woodpecker/pr/lint
+          - ci/woodpecker/pr/test
+          - ci/woodpecker/pr/build-package
+          - ci/woodpecker/pr/build-container
+          - ci/woodpecker/pr/docs
+      enforce_admins: false
+      required_linear_history: true
       restrictions: null

.gitignore

@@ -101,3 +101,7 @@ env*/
 .pytest_cache
 
 pip-wheel-metadata
+
+# Misc
+CHANGELOG.md
+.ruff_cache

.gitsv/config.yml

@@ -0,0 +1,47 @@
+---
+version: "1.1"
+
+versioning:
+  update-major: []
+  update-minor: [feat]
+  update-patch: [fix, perf, refactor, chore, test, ci, docs]
+
+tag:
+  pattern: "v%d.%d.%d"
+
+release-notes:
+  sections:
+    - name: Features
+      commit-types: [feat]
+      section-type: commits
+    - name: Bug Fixes
+      commit-types: [fix]
+      section-type: commits
+    - name: Performance Improvements
+      commit-types: [perf]
+      section-type: commits
+    - name: Code Refactoring
+      commit-types: [refactor]
+      section-type: commits
+    - name: Others
+      commit-types: [chore]
+      section-type: commits
+    - name: Testing
+      commit-types: [test]
+      section-type: commits
+    - name: CI Pipeline
+      commit-types: [ci]
+      section-type: commits
+    - name: Documentation
+      commit-types: [docs]
+      section-type: commits
+    - name: Breaking Changes
+      section-type: breaking-changes
+
+commit-message:
+  footer:
+    issue:
+      key: issue
+      add-value-prefix: "#"
+  issue:
+    regex: "#?[0-9]+"

.lycheeignore

@@ -0,0 +1 @@
+https://hub.docker.com/r/thegeeklab/*

.markdownlint.yml

@@ -0,0 +1,6 @@
+---
+default: True
+MD013: False
+MD041: False
+MD004:
+  style: dash

.prettierignore

@@ -0,0 +1,2 @@
+*.tpl.md
+LICENSE

.woodpecker/build-container.yml

@@ -0,0 +1,73 @@
+---
+when:
+  - event: [pull_request, tag]
+  - event: [push, manual]
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+steps:
+  - name: build
+    image: docker.io/library/python:3.12
+    commands:
+      - pip install poetry poetry-dynamic-versioning -qq
+      - poetry build
+
+  - name: dryrun
+    image: quay.io/thegeeklab/wp-docker-buildx:4
+    settings:
+      containerfile: Containerfile.multiarch
+      dry_run: true
+      platforms:
+        - linux/amd64
+        - linux/arm64
+      provenance: false
+      repo: ${CI_REPO}
+    when:
+      - event: [pull_request]
+
+  - name: publish-dockerhub
+    image: quay.io/thegeeklab/wp-docker-buildx:4
+    group: container
+    settings:
+      auto_tag: true
+      containerfile: Containerfile.multiarch
+      password:
+        from_secret: docker_password
+      platforms:
+        - linux/amd64
+        - linux/arm64
+      provenance: false
+      repo: ${CI_REPO}
+      username:
+        from_secret: docker_username
+    when:
+      - event: [tag]
+      - event: [push, manual]
+        branch:
+          - ${CI_REPO_DEFAULT_BRANCH}
+
+  - name: publish-quay
+    image: quay.io/thegeeklab/wp-docker-buildx:4
+    group: container
+    settings:
+      auto_tag: true
+      containerfile: Containerfile.multiarch
+      password:
+        from_secret: quay_password
+      platforms:
+        - linux/amd64
+        - linux/arm64
+      provenance: false
+      registry: quay.io
+      repo: quay.io/${CI_REPO}
+      username:
+        from_secret: quay_username
+    when:
+      - event: [tag]
+      - event: [push, manual]
+        branch:
+          - ${CI_REPO_DEFAULT_BRANCH}
+
+depends_on:
+  - lint
+  - test

.woodpecker/build-package.yml

@@ -0,0 +1,56 @@
+---
+when:
+  - event: [pull_request, tag]
+  - event: [push, manual]
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+steps:
+  - name: build
+    image: docker.io/library/python:3.12
+    commands:
+      - pip install poetry poetry-dynamic-versioning -qq
+      - poetry build
+
+  - name: checksum
+    image: quay.io/thegeeklab/alpine-tools
+    commands:
+      - cd dist/ && sha256sum * > ../sha256sum.txt
+
+  - name: changelog
+    image: quay.io/thegeeklab/git-sv
+    commands:
+      - git sv current-version
+      - git sv release-notes -t ${CI_COMMIT_TAG:-next} -o CHANGELOG.md
+      - cat CHANGELOG.md
+
+  - name: publish-github
+    image: docker.io/plugins/github-release
+    settings:
+      api_key:
+        from_secret: github_token
+      files:
+        - dist/*
+        - sha256sum.txt
+      note: CHANGELOG.md
+      overwrite: true
+      title: ${CI_COMMIT_TAG}
+    when:
+      - event: [tag]
+
+  - name: publish-pypi
+    image: docker.io/library/python:3.12
+    secrets:
+      - source: pypi_password
+        target: POETRY_HTTP_BASIC_PYPI_PASSWORD
+      - source: pypi_username
+        target: POETRY_HTTP_BASIC_PYPI_USERNAME
+    commands:
+      - pip install poetry poetry-dynamic-versioning -qq
+      - poetry publish -n
+    when:
+      - event: [tag]
+
+depends_on:
+  - lint
+  - test

.woodpecker/docs.yml

@@ -0,0 +1,62 @@
+---
+when:
+  - event: [pull_request, tag]
+  - event: [push, manual]
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+steps:
+  - name: markdownlint
+    image: quay.io/thegeeklab/markdownlint-cli
+    group: test
+    commands:
+      - markdownlint 'README.md' 'CONTRIBUTING.md'
+
+  - name: spellcheck
+    image: quay.io/thegeeklab/alpine-tools
+    group: test
+    commands:
+      - spellchecker --files 'docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls
+    environment:
+      FORCE_COLOR: "true"
+
+  - name: link-validation
+    image: docker.io/lycheeverse/lychee
+    group: test
+    commands:
+      - lychee --no-progress --format detailed README.md
+
+  - name: pushrm-dockerhub
+    image: docker.io/chko/docker-pushrm:1
+    secrets:
+      - source: docker_password
+        target: DOCKER_PASS
+      - source: docker_username
+        target: DOCKER_USER
+    environment:
+      PUSHRM_FILE: README.md
+      PUSHRM_SHORT: Create docker tags from a given version string
+      PUSHRM_TARGET: ${CI_REPO}
+    when:
+      - event: [push, manual]
+        branch:
+          - ${CI_REPO_DEFAULT_BRANCH}
+        status: [success]
+
+  - name: pushrm-quay
+    image: docker.io/chko/docker-pushrm:1
+    secrets:
+      - source: quay_token
+        target: APIKEY__QUAY_IO
+    environment:
+      PUSHRM_FILE: README.md
+      PUSHRM_TARGET: quay.io/${CI_REPO}
+    when:
+      - event: [push, manual]
+        branch:
+          - ${CI_REPO_DEFAULT_BRANCH}
+        status: [success]
+
+depends_on:
+  - build-package
+  - build-container

.woodpecker/lint.yml

@@ -0,0 +1,25 @@
+---
+when:
+  - event: [pull_request, tag]
+  - event: [push, manual]
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+steps:
+  - name: check-format
+    image: docker.io/library/python:3.12
+    commands:
+      - pip install poetry poetry-dynamic-versioning -qq
+      - poetry install
+      - poetry run ruff format --check --diff ./${CI_REPO_NAME//-/}
+    environment:
+      PY_COLORS: "1"
+
+  - name: check-coding
+    image: docker.io/library/python:3.12
+    commands:
+      - pip install poetry poetry-dynamic-versioning -qq
+      - poetry install
+      - poetry run ruff check ./${CI_REPO_NAME//-/}
+    environment:
+      PY_COLORS: "1"

.woodpecker/notify.yml

@@ -0,0 +1,26 @@
+---
+when:
+  - event: [tag]
+  - event: [push, manual]
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+runs_on: [success, failure]
+
+steps:
+  - name: matrix
+    image: quay.io/thegeeklab/wp-matrix
+    settings:
+      homeserver:
+        from_secret: matrix_homeserver
+      password:
+        from_secret: matrix_password
+      roomid:
+        from_secret: matrix_roomid
+      username:
+        from_secret: matrix_username
+    when:
+      - status: [success, failure]
+
+depends_on:
+  - docs

.woodpecker/test.yml

@@ -0,0 +1,38 @@
+---
+when:
+  - event: [pull_request, tag]
+  - event: [push, manual]
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+variables:
+  - &pytest_base
+    group: pytest
+    commands:
+      - pip install poetry poetry-dynamic-versioning -qq
+      - poetry install
+      - poetry version
+      - poetry run ${CI_REPO_NAME} --help
+    environment:
+      PY_COLORS: "1"
+
+steps:
+  - name: python-312
+    image: docker.io/library/python:3.12
+    <<: *pytest_base
+
+  - name: python-311
+    image: docker.io/library/python:3.11
+    <<: *pytest_base
+
+  - name: python-310
+    image: docker.io/library/python:3.10
+    <<: *pytest_base
+
+  - name: python-39
+    image: docker.io/library/python:3.9
+    <<: *pytest_base
+
+  - name: python-38
+    image: docker.io/library/python:3.8
+    <<: *pytest_base

CHANGELOG.md

@@ -1,20 +0,0 @@
-# Changelog
-
-## v0.2.0 (2021-01-03)
-
-### Docs
-
-- add contributing information
-
-### Others
-
-- migrate to poetry
-- replace master by main as default branch
-- **deps**: pin docker digests ([#4](https://github.com/thegeeklab/docker-autotag/issues/4))
-- **docker**: use standalone dockerfiles for multiarch
-- **docker**: switch to org.opencontainers image labels
-- use renovate preset config
-
-### Breaking Changes
-
-- drop Python 3.5 support

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 ## Security
 
 If you think you have found a **security issue**, please do not mention it in this repository.
-Instead, send an email to security@thegeeklab.de with as many details as possible so it can be handled confidential.
+Instead, send an email to `security@thegeeklab.de` with as many details as possible so it can be handled confidential.
 
 ## Bug Reports and Feature Requests
 

Containerfile.multiarch

@@ -1,4 +1,4 @@
-FROM amd64/python:3.9-alpine@sha256:0267b3631f06804da6b1a66c3b399e6335ed394d04d8c714b7a4dfa866c35337
+FROM python:3.12-alpine@sha256:5365725a6cd59b72a927628fdda9965103e3dc671676c89ef3ed8b8b0e22e812
 
 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@@ -8,10 +8,11 @@ LABEL org.opencontainers.image.source="https://github.com/thegeeklab/docker-auto
 LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/docker-autotag"
 
 ENV PY_COLORS=1
+ENV TZ=UTC
 
 ADD dist/docker_autotag-*.whl /
 
-RUN apk --update add --virtual .build-deps build-base libffi-dev libressl-dev && \
+RUN apk --update add --virtual .build-deps build-base libffi-dev openssl-dev && \
     apk --update add git && \
     pip install --upgrade --no-cache-dir pip && \
     pip install --no-cache-dir $(find / -name "docker_autotag-*.whl") && \

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Robert Kaussow <mail@thegeeklab.de>
+Copyright (c) 2022 Robert Kaussow <mail@thegeeklab.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,7 +2,7 @@
 
 Create docker tags from a given version string
 
-[![Build Status](https://img.shields.io/drone/build/thegeeklab/docker-autotag?logo=drone)](https://cloud.drone.io/thegeeklab/docker-autotag)
+[![Build Status](https://ci.thegeeklab.de/api/badges/thegeeklab/docker-autotag/status.svg)](https://ci.thegeeklab.de/repos/thegeeklab/docker-autotag)
 [![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/docker-autotag)
 [![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/docker-autotag)
 [![Python Version](https://img.shields.io/pypi/pyversions/docker-autotag.svg)](https://pypi.org/project/docker-autotag/)
@@ -21,6 +21,8 @@ Simple tool to create a list of docker tags from a given version string.
 DOCKER_AUTOTAG_OUTPUT_FILE=
 # adds a given suffix to every determined tag
 DOCKER_AUTOTAG_SUFFIX=
+# returns only tags with the applied suffix
+DOCKER_AUTOTAG_SUFFIX_STRICT=False
 # version string to use; returns 'latest' if nothing is specified
 DOCKER_AUTOTAG_VERSION=
 # comma-seprated list of static tags to add to the result set
@@ -59,13 +61,16 @@ DOCKER_AUTOTAG_IGNORE_PRERELEASE=True DOCKER_AUTOTAG_VERSION=1.0.0-beta docker-a
 DOCKER_AUTOTAG_SUFFIX=amd64 DOCKER_AUTOTAG_VERSION=1.0.0 docker-autotag
 # 1.0.0,1.0,1,1.0.0-amd64,1.0-amd64,1-amd64
 
+DOCKER_AUTOTAG_SUFFIX=amd64 DOCKER_AUTOTAG_SUFFIX_STRICT=True DOCKER_AUTOTAG_VERSION=1.0.0 docker-autotag
+# 1.0.0-amd64,1.0-amd64,1-amd64
+
 DOCKER_AUTOTAG_EXTRA_TAGS=extra1,extra2 DOCKER_AUTOTAG_VERSION=1.0.0 docker-autotag
 # 1.0.0,1.0,1,extra1,extra2
 ```
 
 ## Contributors
 
-Special thanks goes to all [contributors](https://github.com/thegeeklab/docker-autotag/graphs/contributors). If you would like to contribute,
+Special thanks to all [contributors](https://github.com/thegeeklab/docker-autotag/graphs/contributors). If you would like to contribute,
 please see the [instructions](https://github.com/thegeeklab/docker-autotag/blob/main/CONTRIBUTING.md).
 
 ## License

docker/Dockerfile.arm

@@ -1,25 +0,0 @@
-FROM arm32v7/python:3.9-alpine@sha256:6286e21b9e3472294444c4d7ae04b571ef342f26dfa828643bb3fea4ea2df708
-
-LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
-LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
-LABEL org.opencontainers.image.title="docker-autotag"
-LABEL org.opencontainers.image.url="https://github.com/thegeeklab/docker-autotag"
-LABEL org.opencontainers.image.source="https://github.com/thegeeklab/docker-autotag"
-LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/docker-autotag"
-
-ENV PY_COLORS=1
-
-ADD dist/docker_autotag-*.whl /
-
-RUN apk --update add --virtual .build-deps build-base libffi-dev libressl-dev && \
-    apk --update add git && \
-    pip install --upgrade --no-cache-dir pip && \
-    pip install --no-cache-dir $(find / -name "docker_autotag-*.whl") && \
-    apk del .build-deps && \
-    rm -f docker_autotag-*.whl && \
-    rm -rf /var/cache/apk/* && \
-    rm -rf /root/.cache/
-
-USER root
-CMD []
-ENTRYPOINT ["/usr/local/bin/docker-autotag"]

docker/Dockerfile.arm64

@@ -1,25 +0,0 @@
-FROM arm64v8/python:3.9-alpine@sha256:967915ae7fd5154ec94d32f884e59dc7e5a46a7f71f0b32ff7a1258bc285fe99
-
-LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
-LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
-LABEL org.opencontainers.image.title="docker-autotag"
-LABEL org.opencontainers.image.url="https://github.com/thegeeklab/docker-autotag"
-LABEL org.opencontainers.image.source="https://github.com/thegeeklab/docker-autotag"
-LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/docker-autotag"
-
-ENV PY_COLORS=1
-
-ADD dist/docker_autotag-*.whl /
-
-RUN apk --update add --virtual .build-deps build-base libffi-dev libressl-dev && \
-    apk --update add git && \
-    pip install --upgrade --no-cache-dir pip && \
-    pip install --no-cache-dir $(find / -name "docker_autotag-*.whl") && \
-    apk del .build-deps && \
-    rm -f docker_autotag-*.whl && \
-    rm -rf /var/cache/apk/* && \
-    rm -rf /root/.cache/
-
-USER root
-CMD []
-ENTRYPOINT ["/usr/local/bin/docker-autotag"]

docker/manifest-quay.tmpl

@@ -1,24 +0,0 @@
-image: quay.io/thegeeklab/docker-autotag:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
-{{#if build.tags}}
-tags:
-{{#each build.tags}}
-  - {{this}}
-{{/each}}
-{{/if}}
-manifests:
-  - image: quay.io/thegeeklab/docker-autotag:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
-    platform:
-      architecture: amd64
-      os: linux
-
-  - image: quay.io/thegeeklab/docker-autotag:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64
-    platform:
-      architecture: arm64
-      os: linux
-      variant: v8
-
-  - image: quay.io/thegeeklab/docker-autotag:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7

docker/manifest.tmpl

@@ -1,24 +0,0 @@
-image: thegeeklab/docker-autotag:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
-{{#if build.tags}}
-tags:
-{{#each build.tags}}
-  - {{this}}
-{{/each}}
-{{/if}}
-manifests:
-  - image: thegeeklab/docker-autotag:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
-    platform:
-      architecture: amd64
-      os: linux
-
-  - image: thegeeklab/docker-autotag:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64
-    platform:
-      architecture: arm64
-      os: linux
-      variant: v8
-
-  - image: thegeeklab/docker-autotag:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7

dockerautotag/cli.py

@@ -3,16 +3,14 @@
 import argparse
 import copy
 import os
+import sys
 from collections import defaultdict
 
 import semantic_version
 
 from dockerautotag import __version__
 from dockerautotag.logging import SingleLog
-from dockerautotag.utils import normalize_path
-from dockerautotag.utils import to_bool
-from dockerautotag.utils import to_prerelease
-from dockerautotag.utils import trim_prefix
+from dockerautotag.utils import normalize_path, to_bool, to_prerelease, trim_prefix
 
 
 class Autotag:
@@ -29,9 +27,7 @@ class Autotag:
         parser = argparse.ArgumentParser(
             description=("Creates a list of docker tags from a given version string.")
         )
-        parser.add_argument(
-            "--version", action="version", version="%(prog)s {}".format(__version__)
-        )
+        parser.add_argument("--version", action="version", version=f"%(prog)s {__version__}")
 
         return parser.parse_args()
 
@@ -42,6 +38,7 @@ class Autotag:
         config["file"] = normalize_path(output_raw)
 
         config["suffix"] = os.environ.get("DOCKER_AUTOTAG_SUFFIX", None)
+        config["suffix_strict"] = to_bool(os.environ.get("DOCKER_AUTOTAG_SUFFIX_STRICT", False))
         config["version"] = os.environ.get("DOCKER_AUTOTAG_VERSION", None)
         config["extra"] = os.environ.get("DOCKER_AUTOTAG_EXTRA_TAGS", None)
         config["force_latest"] = to_bool(os.environ.get("DOCKER_AUTOTAG_FORCE_LATEST", False))
@@ -58,16 +55,19 @@ class Autotag:
         return tags + e
 
     @staticmethod
-    def _tag_suffix(tags, suffix):
+    def _tag_suffix(tags, suffix, suffix_strict):
         if not suffix:
             return tags
 
-        res = copy.deepcopy(tags)
+        res = []
+        if not suffix_strict:
+            res = copy.deepcopy(tags)
+
         for t in tags:
             if t == "latest":
                 res.append(suffix)
             else:
-                res.append("{}-{}".format(t, suffix))
+                res.append(f"{t}-{suffix}")
 
         return res
 
@@ -90,25 +90,23 @@ class Autotag:
         except ValueError:
             try:
                 version = semantic_version.Version.coerce(ref)
-            except Exception:
+            except Exception:  # noqa: BLE001
                 return default
-        except Exception:
+        except Exception:  # noqa: BLE001
             return default
 
         if version.prerelease:
             tags.append(
-                "{}.{}.{}-{}".format(
-                    version.major, version.minor, version.patch, to_prerelease(version.prerelease)
-                )
+                f"{version.major}.{version.minor}.{version.patch}-{to_prerelease(version.prerelease)}"
             )
             if not ignore_pre:
                 return tags
 
-        tags.append("{}.{}".format(version.major, version.minor))
-        tags.append("{}.{}.{}".format(version.major, version.minor, version.patch))
+        tags.append(f"{version.major}.{version.minor}")
+        tags.append(f"{version.major}.{version.minor}.{version.patch}")
 
         if version.major > 0:
-            tags.append("{}".format(version.major))
+            tags.append(f"{version.major}")
 
         return tags
 
@@ -116,17 +114,18 @@ class Autotag:
         config = self.config
 
         v = self._default_tags(config["version"], config["ignore_pre"], config["force_latest"])
-        v = self._tag_suffix(v, config["suffix"])
+        v = self._tag_suffix(v, config["suffix"], config["suffix_strict"])
         v = self._tag_extra(v, config["extra"])
 
-        if config["file"]:
-            try:
+        try:
+            if config["file"]:
                 with open(config["file"], "w") as f:
                     f.write(",".join(v))
-            except IOError as e:
-                self.logger.error("Unable to write file: {}".format(str(e)))
-
-        print(",".join(v))
+            else:
+                sys.stdout.write(",".join(v))
+                sys.stdout.write("\n")
+        except OSError as e:
+            self.logger.error(f"Unable to write file: {e!s}")
 
 
 def main():

dockerautotag/logging.py

@@ -7,11 +7,10 @@ import sys
 import colorama
 from pythonjsonlogger import jsonlogger
 
-from dockerautotag.utils import Singleton
-from dockerautotag.utils import to_bool
+from dockerautotag.utils import Singleton, to_bool
 
 CONSOLE_FORMAT = "{}[%(levelname)s]{} %(message)s"
-JSON_FORMAT = "(asctime) (levelname) (message)"
+JSON_FORMAT = "%(asctime)s %(levelname)s %(message)s"
 
 
 def _should_do_markup():
@@ -25,7 +24,7 @@ def _should_do_markup():
 colorama.init(autoreset=True, strip=not _should_do_markup())
 
 
-class LogFilter(object):
+class LogFilter:
     """A custom log filter which excludes log messages above the logged level."""
 
     def __init__(self, level):
@@ -46,15 +45,15 @@ class LogFilter(object):
 class MultilineFormatter(logging.Formatter):
     """Logging Formatter to reset color after newline characters."""
 
-    def format(self, record):  # noqa
-        record.msg = record.msg.replace("\n", "\n{}... ".format(colorama.Style.RESET_ALL))
+    def format(self, record):
+        record.msg = record.msg.replace("\n", f"\n{colorama.Style.RESET_ALL}... ")
         return logging.Formatter.format(self, record)
 
 
 class MultilineJsonFormatter(jsonlogger.JsonFormatter):
     """Logging Formatter to remove newline characters."""
 
-    def format(self, record):  # noqa
+    def format(self, record):
         record.msg = record.msg.replace("\n", " ")
         return jsonlogger.JsonFormatter.format(self, record)
 
@@ -62,11 +61,11 @@ class MultilineJsonFormatter(jsonlogger.JsonFormatter):
 class Log:
     """Base logging object."""
 
-    def __init__(self, level=logging.WARN, name="ansibledoctor", json=False):
+    def __init__(self, level=logging.WARNING, name="ansibledoctor", json=False):
         self.logger = logging.getLogger(name)
         self.logger.setLevel(level)
         self.logger.addHandler(self._get_error_handler(json=json))
-        self.logger.addHandler(self._get_warn_handler(json=json))
+        self.logger.addHandler(self._get_warning_handler(json=json))
         self.logger.addHandler(self._get_info_handler(json=json))
         self.logger.addHandler(self._get_critical_handler(json=json))
         self.logger.addHandler(self._get_debug_handler(json=json))
@@ -87,13 +86,13 @@ class Log:
 
         return handler
 
-    def _get_warn_handler(self, json=False):
+    def _get_warning_handler(self, json=False):
         handler = logging.StreamHandler(sys.stdout)
-        handler.setLevel(logging.WARN)
-        handler.addFilter(LogFilter(logging.WARN))
+        handler.setLevel(logging.WARNING)
+        handler.addFilter(LogFilter(logging.WARNING))
         handler.setFormatter(
             MultilineFormatter(
-                self.warn(CONSOLE_FORMAT.format(colorama.Fore.YELLOW, colorama.Style.RESET_ALL))
+                self.warning(CONSOLE_FORMAT.format(colorama.Fore.YELLOW, colorama.Style.RESET_ALL))
             )
         )
 
@@ -162,8 +161,8 @@ class Log:
         """Format error messages and return string."""
         return msg
 
-    def warn(self, msg):
-        """Format warn messages and return string."""
+    def warning(self, msg):
+        """Format warning messages and return string."""
         return msg
 
     def info(self, msg):
@@ -179,7 +178,7 @@ class Log:
         :returns: string
 
         """
-        return "{}{}{}".format(color, msg, colorama.Style.RESET_ALL)
+        return f"{color}{msg}{colorama.Style.RESET_ALL}"
 
     def sysexit(self, code=1):
         sys.exit(code)

dockerautotag/utils.py

@@ -1,13 +1,38 @@
 """Global utility methods and classes."""
 
 import os
-from distutils.util import strtobool
 
 
 def normalize_path(path):
     if path:
         return os.path.abspath(os.path.expanduser(os.path.expandvars(path)))
 
+    return None
+
+
+def strtobool(value):
+    """Convert a string representation of truth to true or false."""
+
+    _map = {
+        "y": True,
+        "yes": True,
+        "t": True,
+        "true": True,
+        "on": True,
+        "1": True,
+        "n": False,
+        "no": False,
+        "f": False,
+        "false": False,
+        "off": False,
+        "0": False,
+    }
+
+    try:
+        return _map[str(value).lower()]
+    except KeyError as err:
+        raise ValueError(f'"{value}" is not a valid bool value') from err
+
 
 def to_bool(string):
     return bool(strtobool(str(string)))
@@ -15,13 +40,12 @@ def to_bool(string):
 
 def trim_prefix(text, prefix):
     if text.startswith(prefix):
-        return text[len(prefix):]
+        return text[len(prefix) :]
     return text
 
 
 def to_prerelease(tup):
-    res = "".join(tup)
-    return res
+    return ".".join(tup)
 
 
 class Singleton(type):
@@ -31,5 +55,5 @@ class Singleton(type):
 
     def __call__(cls, *args, **kwargs):
         if cls not in cls._instances:
-            cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
+            cls._instances[cls] = super().__call__(*args, **kwargs)
         return cls._instances[cls]

pyproject.toml

@@ -10,77 +10,52 @@ classifiers = [
   "Natural Language :: English",
   "Operating System :: POSIX",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.6",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Topic :: Utilities",
   "Topic :: Software Development",
 ]
 description = "Creates a list of docker tags from a given version string."
 documentation = "https://github.com/thegeeklab/docker-autotag/"
 homepage = "https://github.com/thegeeklab/docker-autotag/"
-include = [
-  "LICENSE",
-]
+include = ["LICENSE"]
 keywords = ["docker", "versioning", "automation", "ci"]
 license = "MIT"
 name = "docker-autotag"
-packages = [
-  {include = "dockerautotag"},
-]
+packages = [{ include = "dockerautotag" }]
 readme = "README.md"
 repository = "https://github.com/thegeeklab/docker-autotag/"
 version = "0.0.0"
 
 [tool.poetry.dependencies]
-colorama = "^0.4.4"
-python = "^3.6.0"
-python-json-logger = "^2.0.1"
-semantic-version = "^2.8.5"
-
-[tool.poetry.dev-dependencies]
-bandit = "^1.7.0"
-flake8 = "^3.8.4"
-flake8-blind-except = "^0.1.1"
-flake8-builtins = "^1.5.3"
-flake8-colors = "^0.1.9"
-flake8-docstrings = "^1.5.0"
-flake8-eradicate = "^1.0.0"
-flake8-isort = "^4.0.0"
-flake8-logging-format = "^0.6.0"
-flake8-pep3101 = "^1.3.0"
-flake8-polyfill = "^1.0.2"
-flake8-quotes = "^3.2.0"
-pdoc3 = "^0.9.2"
-pep8-naming = "^0.11.1"
-pydocstyle = "^5.1.1"
-pytest = "^6.2.1"
-pytest-cov = "^2.10.1"
-pytest-mock = "^3.4.0"
-requests-mock = "^1.8.0"
-yapf = "^0.30.0"
+colorama = "0.4.6"
+python = "^3.8.0"
+python-json-logger = "2.0.7"
+semantic-version = "2.10.0"
 
 [tool.poetry.scripts]
 docker-autotag = "dockerautotag.cli:main"
 
+[tool.poetry.group.dev.dependencies]
+ruff = "0.4.5"
+pytest = "8.2.1"
+pytest-mock = "3.14.0"
+pytest-cov = "5.0.0"
+toml = "0.10.2"
+
 [tool.poetry-dynamic-versioning]
 enable = true
 style = "semver"
 vcs = "git"
 
-[tool.isort]
-default_section = "THIRDPARTY"
-force_single_line = true
-line_length = 99
-sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
-skip_glob = ["**/.env*", "**/env/*", "**/docs/*"]
-
 [tool.pytest.ini_options]
-addopts = "dockerautotag --cov=dockerautotag --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail"
+addopts = "dockerautotag --cov=dockerautotag --cov-report=xml:coverage.xml --cov-report=term --no-cov-on-fail"
 filterwarnings = [
   "ignore::FutureWarning",
-  "ignore:.*collections.*:DeprecationWarning",
+  "ignore::DeprecationWarning",
   "ignore:.*pep8.*:FutureWarning",
 ]
 
@@ -88,5 +63,70 @@ filterwarnings = [
 omit = ["**/test/*"]
 
 [build-system]
-build-backend = "poetry.core.masonry.api"
+build-backend = "poetry_dynamic_versioning.backend"
 requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning"]
+
+[tool.ruff]
+exclude = [
+  ".git",
+  "__pycache__",
+  "build",
+  "dist",
+  "test",
+  "*.pyc",
+  "*.egg-info",
+  ".cache",
+  ".eggs",
+  "env*",
+]
+
+line-length = 99
+indent-width = 4
+
+[tool.ruff.lint]
+# Explanation of errors
+#
+# D102: Missing docstring in public method
+# D103: Missing docstring in public function
+# D105: Missing docstring in magic method
+# D107: Missing docstring in __init__
+# D202: No blank lines allowed after function docstring
+# D203: One blank line required before class docstring
+# D212: Multi-line docstring summary should start at the first line
+ignore = [
+  "D102",
+  "D103",
+  "D105",
+  "D107",
+  "D202",
+  "D203",
+  "D212",
+  "UP038",
+  "RUF012",
+]
+select = [
+  "D",
+  "E",
+  "F",
+  "Q",
+  "W",
+  "I",
+  "S",
+  "BLE",
+  "N",
+  "UP",
+  "B",
+  "A",
+  "C4",
+  "T20",
+  "SIM",
+  "RET",
+  "ARG",
+  "ERA",
+  "RUF",
+]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+line-ending = "lf"

renovate.json

@@ -1,4 +1,12 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["github>thegeeklab/renovate-presets"]
+  "extends": ["github>thegeeklab/renovate-presets"],
+  "packageRules": [
+    {
+      "matchManagers": ["woodpecker"],
+      "matchFileNames": [".woodpecker/test.yml"],
+      "matchPackageNames": ["docker.io/library/python"],
+      "enabled": false
+    }
+  ]
 }

setup.cfg

@@ -1,24 +0,0 @@
-[flake8]
-# Explanation of errors
-#
-# D102: Missing docstring in public method
-# D103: Missing docstring in public function
-# D107: Missing docstring in __init__
-# D202: No blank lines allowed after function docstring
-# W503:Line break occurred before a binary operator
-ignore = D102, D103, D107, D202, W503
-max-line-length = 99
-inline-quotes = double
-exclude = .git, __pycache__, build, dist, test, *.pyc, *.egg-info, .cache, .eggs, env*
-# NOTE: The format for flake8 output is set in the `.flake8` file. This is separate
-#       because `setup.cfg` is parsed on setup, but it would require flake8-colors
-#       to run successfully (which will only be available after install). So we define
-#       it in `.flake8`, and it seems to successfully combine the settings in the
-#       two files together.
-
-[yapf]
-based_on_style = google
-column_limit = 99
-dedent_closing_brackets = true
-coalesce_brackets = true
-split_before_logical_operator = true