From 1d71247114729f41bf3ea8c8b7132ebf4272b475 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 Nov 2020 20:03:09 +0000 Subject: [PATCH 1/3] Add renovate.json --- renovate.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..f45d8f1 --- /dev/null +++ b/renovate.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "config:base" + ] +} From d60dee39bef77cd6825ee788d51c6bbf35634bc3 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 12 Nov 2020 22:10:27 +0100 Subject: [PATCH 2/3] add python 3.9 support --- .drone.jsonnet | 16 ++++++++-------- Makefile | 20 ++++++++++++++++++++ renovate.json | 15 ++++++++++++--- setup.py | 1 + 4 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 Makefile diff --git a/.drone.jsonnet b/.drone.jsonnet index ac47762..67b9671 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -24,7 +24,7 @@ local PipelineLint = { steps: [ { name: 'flake8', - image: 'python:3.8', + image: 'python:3.9', environment: { PY_COLORS: 1, }, @@ -52,6 +52,7 @@ local PipelineTest = { PythonVersion(pyversion='3.6'), PythonVersion(pyversion='3.7'), PythonVersion(pyversion='3.8'), + PythonVersion(pyversion='3.9'), ], depends_on: [ 'lint', @@ -71,7 +72,7 @@ local PipelineSecurity = { steps: [ { name: 'bandit', - image: 'python:3.8', + image: 'python:3.9', environment: { PY_COLORS: 1, }, @@ -100,7 +101,7 @@ local PipelineBuildPackage = { steps: [ { name: 'build', - image: 'python:3.8', + image: 'python:3.9', commands: [ 'python setup.py sdist bdist_wheel', ], @@ -158,7 +159,7 @@ local PipelineBuildContainer(arch='amd64') = { steps: [ { name: 'build', - image: 'python:3.8', + image: 'python:3.9', commands: [ 'python setup.py bdist_wheel', ], @@ -232,11 +233,10 @@ local PipelineDocs = { }, steps: [ { - name: 'assets', - image: 'byrnedo/alpine-curl', + name: 'generate', + image: 'thegeeklab/alpine-tools', commands: [ - 'mkdir -p docs/themes/hugo-geekdoc/', - 'curl -L https://github.com/thegeeklab/hugo-geekdoc/releases/latest/download/hugo-geekdoc.tar.gz | tar -xz -C docs/themes/hugo-geekdoc/ --strip-components=1', + 'make doc', ], }, { diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..90a6b14 --- /dev/null +++ b/Makefile @@ -0,0 +1,20 @@ +# renovate: datasource=github-releases depName=thegeeklab/hugo-geekdoc +THEME_VERSION := v0.5.0 +THEME := hugo-geekdoc +BASEDIR := docs +THEMEDIR := $(BASEDIR)/themes + +.PHONY: all +all: doc + +.PHONY: doc +doc: doc-assets + +.PHONY: doc-assets +doc-assets: + mkdir -p $(THEMEDIR)/$(THEME)/ ; \ + curl -sSL "https://github.com/thegeeklab/$(THEME)/releases/download/${THEME_VERSION}/$(THEME).tar.gz" | tar -xz -C $(THEMEDIR)/$(THEME)/ --strip-components=1 + +.PHONY: clean +clean: + rm -rf $(THEMEDIR) && \ diff --git a/renovate.json b/renovate.json index f45d8f1..91ced0d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,14 @@ { - "extends": [ - "config:base" - ] + "extends": ["config:base"], + "regexManagers": [ + { + "fileMatch": ["^Makefile$"], + "matchStrings": [ + "# renovate: datasource=(?\\S+) depName=(?\\S+)( versioning=(?.*?))?\\n.*?_VERSION := (?.*)\\s" + ] + } + ], + "droneci": { + "enabled": false + } } diff --git a/setup.py b/setup.py index ce317ee..6b133b8 100755 --- a/setup.py +++ b/setup.py @@ -56,6 +56,7 @@ setup( "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Topic :: Utilities", "Topic :: Software Development", "Topic :: Software Development :: Documentation", From e75db8cdf76d2e12759f54304959f02d4d9989eb Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 12 Nov 2020 22:29:46 +0100 Subject: [PATCH 3/3] add python 3.9 support --- .drone.jsonnet | 5 ++++- .drone.yml | 37 ++++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 67b9671..fee8973 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -313,6 +313,9 @@ local PipelineDocs = { strip_prefix: 'docs/public/', target: '/${DRONE_REPO_NAME}', }, + when: { + ref: ['refs/heads/master', 'refs/tags/**'], + }, }, ], depends_on: [ @@ -322,7 +325,7 @@ local PipelineDocs = { 'build-container-arm', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], }, }; diff --git a/.drone.yml b/.drone.yml index d254ef1..8682f92 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: flake8 - image: python:3.8 + image: python:3.9 commands: - pip install -r dev-requirements.txt -qq - pip install -qq . @@ -75,6 +75,17 @@ steps: depends_on: - clone +- name: python39-pytest + image: python:3.9 + commands: + - pip install -r dev-requirements.txt -qq + - pip install -qq . + - ansible-doctor --help + environment: + PY_COLORS: 1 + depends_on: + - clone + trigger: ref: - refs/heads/master @@ -94,7 +105,7 @@ platform: steps: - name: bandit - image: python:3.8 + image: python:3.9 commands: - pip install -r dev-requirements.txt -qq - pip install -qq . @@ -121,7 +132,7 @@ platform: steps: - name: build - image: python:3.8 + image: python:3.9 commands: - python setup.py sdist bdist_wheel @@ -177,7 +188,7 @@ platform: steps: - name: build - image: python:3.8 + image: python:3.9 commands: - python setup.py bdist_wheel @@ -253,7 +264,7 @@ platform: steps: - name: build - image: python:3.8 + image: python:3.9 commands: - python setup.py bdist_wheel @@ -329,7 +340,7 @@ platform: steps: - name: build - image: python:3.8 + image: python:3.9 commands: - python setup.py bdist_wheel @@ -407,11 +418,10 @@ concurrency: limit: 1 steps: -- name: assets - image: byrnedo/alpine-curl +- name: generate + image: thegeeklab/alpine-tools commands: - - mkdir -p docs/themes/hugo-geekdoc/ - - curl -L https://github.com/thegeeklab/hugo-geekdoc/releases/latest/download/hugo-geekdoc.tar.gz | tar -xz -C docs/themes/hugo-geekdoc/ --strip-components=1 + - make doc - name: markdownlint image: node:lts-alpine @@ -471,11 +481,16 @@ steps: source: docs/public/ strip_prefix: docs/public/ target: /${DRONE_REPO_NAME} + when: + ref: + - refs/heads/master + - refs/tags/** trigger: ref: - refs/heads/master - refs/tags/** + - refs/pull/** depends_on: - build-package @@ -577,6 +592,6 @@ depends_on: --- kind: signature -hmac: c95454a48694f827454d284008d5e4cddce8ec13b0679b5d8000db3e440d2590 +hmac: e633e5064224d4db579e4592dea0ca83a1b601f2dbcecb07ec8064b5cdb39e78 ...