From 9f1cf783fd339a9476a749d4b9d3529f98d9fede Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Nov 2018 05:22:05 -0800 Subject: [PATCH 01/72] Update awscli from 1.16.48 to 1.16.49 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ca94ccd..3fdf625 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.2 -awscli==1.16.48 +awscli==1.16.49 bandit==1.5.1 black==18.9b0 boto3==1.9.38 From 00fe79cf373f2381b57bf13cf84f3617695c23ee Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Nov 2018 05:22:07 -0800 Subject: [PATCH 02/72] Update boto3 from 1.9.38 to 1.9.39 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3fdf625..9458148 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.2 awscli==1.16.49 bandit==1.5.1 black==18.9b0 -boto3==1.9.38 +boto3==1.9.39 flake8==3.6.0 Markdown==3.0.1 pelican==3.7.1 From 6da3db2fdcdfe7faec970c23a55553e1ab915dd9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 8 Nov 2018 05:22:05 -0800 Subject: [PATCH 03/72] Update awscli from 1.16.49 to 1.16.50 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9458148..3cb9ddc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.2 -awscli==1.16.49 +awscli==1.16.50 bandit==1.5.1 black==18.9b0 boto3==1.9.39 From c56a46033e417404b22075cc4498a611818abf66 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 8 Nov 2018 05:22:07 -0800 Subject: [PATCH 04/72] Update boto3 from 1.9.39 to 1.9.40 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3cb9ddc..162392f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.2 awscli==1.16.50 bandit==1.5.1 black==18.9b0 -boto3==1.9.39 +boto3==1.9.40 flake8==3.6.0 Markdown==3.0.1 pelican==3.7.1 From c65cd81becbc08a09ea0427eb94eb7db4bcd9f13 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Nov 2018 05:22:06 -0800 Subject: [PATCH 05/72] Update awscli from 1.16.50 to 1.16.51 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 162392f..4c11fad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.2 -awscli==1.16.50 +awscli==1.16.51 bandit==1.5.1 black==18.9b0 boto3==1.9.40 From 80518ce59b4df2cf282d829328fe802e055e81ea Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Nov 2018 05:22:07 -0800 Subject: [PATCH 06/72] Update boto3 from 1.9.40 to 1.9.41 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4c11fad..8d8c793 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.2 awscli==1.16.51 bandit==1.5.1 black==18.9b0 -boto3==1.9.40 +boto3==1.9.41 flake8==3.6.0 Markdown==3.0.1 pelican==3.7.1 From e28ef25d97d06a14b1ab038997dbba5159ce5a2b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 11 Nov 2018 05:22:06 -0800 Subject: [PATCH 07/72] Update awscli from 1.16.51 to 1.16.52 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8d8c793..8af284f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.2 -awscli==1.16.51 +awscli==1.16.52 bandit==1.5.1 black==18.9b0 boto3==1.9.41 From ddd33efc5f5b31775a92bdbb71033c75f29cc29d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 11 Nov 2018 05:22:08 -0800 Subject: [PATCH 08/72] Update boto3 from 1.9.41 to 1.9.42 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8af284f..61e29e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.2 awscli==1.16.52 bandit==1.5.1 black==18.9b0 -boto3==1.9.41 +boto3==1.9.42 flake8==3.6.0 Markdown==3.0.1 pelican==3.7.1 From 127ba3065fec4181ec273e1c8e3484e54f1b8b0c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 13 Nov 2018 05:22:06 -0800 Subject: [PATCH 09/72] Update autopep8 from 1.4.2 to 1.4.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 61e29e4..9cb1eab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -autopep8==1.4.2 +autopep8==1.4.3 awscli==1.16.52 bandit==1.5.1 black==18.9b0 From 7d8588ffb7af61b7807480a75b870136a5963f64 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 13 Nov 2018 05:22:07 -0800 Subject: [PATCH 10/72] Update awscli from 1.16.52 to 1.16.53 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9cb1eab..c2a5911 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.3 -awscli==1.16.52 +awscli==1.16.53 bandit==1.5.1 black==18.9b0 boto3==1.9.42 From 2b610f7aed6f4ada303c27eb13a4fb2be91b67a9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 13 Nov 2018 05:22:09 -0800 Subject: [PATCH 11/72] Update boto3 from 1.9.42 to 1.9.43 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c2a5911..16b8685 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.3 awscli==1.16.53 bandit==1.5.1 black==18.9b0 -boto3==1.9.42 +boto3==1.9.43 flake8==3.6.0 Markdown==3.0.1 pelican==3.7.1 From 8025d83c73c2fa8707ffa17c4b6ab5bd2730d652 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 21 Nov 2018 05:24:06 -0800 Subject: [PATCH 12/72] Update awscli from 1.16.53 to 1.16.59 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 16b8685..40b55e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.3 -awscli==1.16.53 +awscli==1.16.59 bandit==1.5.1 black==18.9b0 boto3==1.9.43 From 56800c1d7ed77d505e898085fb9238fb8def925e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 21 Nov 2018 05:24:07 -0800 Subject: [PATCH 13/72] Update boto3 from 1.9.43 to 1.9.49 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 40b55e8..3875d3b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.3 awscli==1.16.59 bandit==1.5.1 black==18.9b0 -boto3==1.9.43 +boto3==1.9.49 flake8==3.6.0 Markdown==3.0.1 pelican==3.7.1 From 31f03ffb4542ffe8d258f9379296004c65f8f5df Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 21 Nov 2018 05:24:09 -0800 Subject: [PATCH 14/72] Update pelican from 3.7.1 to 4.0.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3875d3b..92f7637 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ black==18.9b0 boto3==1.9.49 flake8==3.6.0 Markdown==3.0.1 -pelican==3.7.1 +pelican==4.0.0 pydocstyle==3.0.0 pylint==2.1.1 safety==1.8.4 From 1e19c56eb823bd87bd52a9a99c150078b1bfa016 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 22 Nov 2018 05:25:06 -0800 Subject: [PATCH 15/72] Update awscli from 1.16.59 to 1.16.60 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 92f7637..7d827a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.3 -awscli==1.16.59 +awscli==1.16.60 bandit==1.5.1 black==18.9b0 boto3==1.9.49 From e8f782808c4945e3a09526bbb69e404740c216c0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 22 Nov 2018 05:25:08 -0800 Subject: [PATCH 16/72] Update boto3 from 1.9.49 to 1.9.50 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7d827a1..d6f7299 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.3 awscli==1.16.60 bandit==1.5.1 black==18.9b0 -boto3==1.9.49 +boto3==1.9.50 flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 From ce3ee07a04f42b746cddae8d6095d8c3b1196b63 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 26 Nov 2018 05:25:06 -0800 Subject: [PATCH 17/72] Update awscli from 1.16.60 to 1.16.61 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d6f7299..b221b6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.3 -awscli==1.16.60 +awscli==1.16.61 bandit==1.5.1 black==18.9b0 boto3==1.9.50 From 93067ac55a7d4ba4eea951c0d4c922a4f8fca296 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 26 Nov 2018 05:25:07 -0800 Subject: [PATCH 18/72] Update boto3 from 1.9.50 to 1.9.51 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b221b6d..f5c1107 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.3 awscli==1.16.61 bandit==1.5.1 black==18.9b0 -boto3==1.9.50 +boto3==1.9.51 flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 From da79c97363cbb36e38f10049162b39d9be4c7cb6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 26 Nov 2018 05:25:09 -0800 Subject: [PATCH 19/72] Update pylint from 2.1.1 to 2.2.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f5c1107..532fa32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 pydocstyle==3.0.0 -pylint==2.1.1 +pylint==2.2.0 safety==1.8.4 From 409489a631ae8d0220d637c5f2fc3469c6e08b8b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 27 Nov 2018 05:25:07 -0800 Subject: [PATCH 20/72] Update awscli from 1.16.61 to 1.16.62 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 532fa32..778adac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.3 -awscli==1.16.61 +awscli==1.16.62 bandit==1.5.1 black==18.9b0 boto3==1.9.51 From 5c627ef356a2454e2c273c19e072d2f12627d663 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 27 Nov 2018 05:25:08 -0800 Subject: [PATCH 21/72] Update boto3 from 1.9.51 to 1.9.52 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 778adac..a284eac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.3 awscli==1.16.62 bandit==1.5.1 black==18.9b0 -boto3==1.9.51 +boto3==1.9.52 flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 From 02ad4ceebefdba5eb5304c9fe9d6bc9542e869bc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 27 Nov 2018 05:25:10 -0800 Subject: [PATCH 22/72] Update pylint from 2.2.0 to 2.2.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a284eac..4c97cb4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 pydocstyle==3.0.0 -pylint==2.2.0 +pylint==2.2.1 safety==1.8.4 From 287b54ac23002d5ae056be841bdacd864e50dc6a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Nov 2018 05:26:06 -0800 Subject: [PATCH 23/72] Update awscli from 1.16.62 to 1.16.63 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4c97cb4..29bfa16 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.3 -awscli==1.16.62 +awscli==1.16.63 bandit==1.5.1 black==18.9b0 boto3==1.9.52 From 45f7b313876d5b66276df780fe556250a3919e5c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Nov 2018 05:26:08 -0800 Subject: [PATCH 24/72] Update boto3 from 1.9.52 to 1.9.53 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 29bfa16..8632738 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.3 awscli==1.16.63 bandit==1.5.1 black==18.9b0 -boto3==1.9.52 +boto3==1.9.53 flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 From a1b4f3b87199fbe16230470496b1e9fb0865ead7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Nov 2018 05:26:09 -0800 Subject: [PATCH 25/72] Update pylint from 2.2.1 to 2.2.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8632738..cd2668f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 pydocstyle==3.0.0 -pylint==2.2.1 +pylint==2.2.2 safety==1.8.4 From 86eb9311e8938c4059c8ed13479336359e9d0972 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 29 Nov 2018 05:26:06 -0800 Subject: [PATCH 26/72] Update awscli from 1.16.63 to 1.16.65 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cd2668f..1c8ece2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.3 -awscli==1.16.63 +awscli==1.16.65 bandit==1.5.1 black==18.9b0 boto3==1.9.53 From 5d39750d136d477792018679324f3a3b0fce3780 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 29 Nov 2018 05:26:07 -0800 Subject: [PATCH 27/72] Update boto3 from 1.9.53 to 1.9.55 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1c8ece2..89d08f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.3 awscli==1.16.65 bandit==1.5.1 black==18.9b0 -boto3==1.9.53 +boto3==1.9.55 flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 From 98ea42954fa8e92a80cb8e143cbb297606469bbf Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Nov 2018 05:26:07 -0800 Subject: [PATCH 28/72] Update awscli from 1.16.65 to 1.16.67 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 89d08f1..79fcb4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.4.3 -awscli==1.16.65 +awscli==1.16.67 bandit==1.5.1 black==18.9b0 boto3==1.9.55 From 8a485a710e56de5a29595810e1fb6c485c88141c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Nov 2018 05:26:08 -0800 Subject: [PATCH 29/72] Update boto3 from 1.9.55 to 1.9.57 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 79fcb4a..0672c2f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.3 awscli==1.16.67 bandit==1.5.1 black==18.9b0 -boto3==1.9.55 +boto3==1.9.57 flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 From bf8528039be01d7ef1cacf73c8b8d58795949d34 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Fri, 30 Nov 2018 08:32:41 -0800 Subject: [PATCH 30/72] Let awscli & boto float as they update so often --- Dockerfile | 2 ++ requirements-float.txt | 4 ++++ requirements.txt | 2 -- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 requirements-float.txt diff --git a/Dockerfile b/Dockerfile index cb92a53..765c5bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN npm install -g markdownlint-cli # needed for Pylint 2.0.0 COPY requirements.txt /build/requirements.txt +COPY requirements-float.txt /build/requirements-float.txt # Note that these 3 commands have to be combined to save on built # image size. If we separate into multiple Docker commands then @@ -27,5 +28,6 @@ COPY requirements.txt /build/requirements.txt # With this all as one command I found I saved over 100MB on the final # built image. RUN apk add --no-cache --update python3-dev gcc build-base && \ + pip3 install -r /build/requirements-float.txt && \ pip3 install -r /build/requirements.txt && \ apk del python3-dev gcc build-base diff --git a/requirements-float.txt b/requirements-float.txt new file mode 100644 index 0000000..794c4f6 --- /dev/null +++ b/requirements-float.txt @@ -0,0 +1,4 @@ +# These are dependencies that are allowed to "float", ie not be +# version pinned. For pinned dependencies see requirements.txt +awscli +boto3 diff --git a/requirements.txt b/requirements.txt index 0672c2f..5537548 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,6 @@ autopep8==1.4.3 -awscli==1.16.67 bandit==1.5.1 black==18.9b0 -boto3==1.9.57 flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 From 6f08007f48cb71f357d72ecf6cc86db317650edc Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sat, 1 Dec 2018 16:25:46 -0800 Subject: [PATCH 31/72] Don't pin stuff in requirements-float.txt --- .pyup.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.pyup.yml b/.pyup.yml index a479c10..56612e9 100644 --- a/.pyup.yml +++ b/.pyup.yml @@ -8,3 +8,9 @@ label_prs: pyup assignees: - pzelnip + + +requirements: + - requirements/requirements-float.txt: + update: False + pin: False From 873fcf74acf7809bb9cbadef1d3c7a89bd444b89 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sun, 24 Mar 2019 13:13:23 -0700 Subject: [PATCH 32/72] Update pylint (why didn't pyup find this?) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5537548..7601956 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,5 @@ flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 pydocstyle==3.0.0 -pylint==2.2.2 +pylint==2.3.1 safety==1.8.4 From ebe56c0f6d658841f024e0fcaa46d18b0b5d422a Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Wed, 25 Mar 2020 13:35:23 -0700 Subject: [PATCH 33/72] Update Safety --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7601956..7cfe0d1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ Markdown==3.0.1 pelican==4.0.0 pydocstyle==3.0.0 pylint==2.3.1 -safety==1.8.4 +safety==1.8.6 From 3a390454ae1f1a785691e2aad801c589d9da03cc Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Thu, 26 Mar 2020 10:52:26 -0700 Subject: [PATCH 34/72] Update Safety --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7cfe0d1..d585e89 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ Markdown==3.0.1 pelican==4.0.0 pydocstyle==3.0.0 pylint==2.3.1 -safety==1.8.6 +safety==1.8.7 From f9622b7782a7611a7032a73244cbeb3b4d22b28a Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Mon, 15 Jun 2020 17:23:07 -0700 Subject: [PATCH 35/72] Rename base branch to mainline --- .pyup.yml | 2 +- .travis.yml | 2 +- Makefile | 2 +- Readme.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pyup.yml b/.pyup.yml index 56612e9..40eb070 100644 --- a/.pyup.yml +++ b/.pyup.yml @@ -2,7 +2,7 @@ update: all schedule: "every day" -branch: master +branch: mainline label_prs: pyup diff --git a/.travis.yml b/.travis.yml index 70a8c8c..8a09a41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ script: branches: only: - - master + - mainline notifications: email: false diff --git a/Makefile b/Makefile index 6dbef76..a0e3d98 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ dockerpush: docker push $(USER_NAME)/$(SITE_NAME):$(SHA) triggerdownstream: - curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_TOKEN)" -d '{ "request": { "branch":"master" }}' https://api.travis-ci.com/repo/pzelnip%2Fwww.codependentcodr.com/requests + curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_TOKEN)" -d '{ "request": { "branch":"mainline" }}' https://api.travis-ci.com/repo/pzelnip%2Fwww.codependentcodr.com/requests deploy: dockerbuild safety dockerpush triggerdownstream diff --git a/Readme.md b/Readme.md index 0b76689..c7cf96d 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ # Codependent Codr Base Image -[![Build Status](https://travis-ci.com/pzelnip/codependentcodrbase.svg?branch=master)](https://travis-ci.com/pzelnip/codependentcodrbase) +[![Build Status](https://travis-ci.com/pzelnip/codependentcodrbase.svg?branch=mainline)](https://travis-ci.com/pzelnip/codependentcodrbase) This is the base Docker image that I use for my blog. From 8870e11b85b80f80d9dc82d2a22ec2f76e41f43f Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Mon, 15 Jun 2020 17:23:07 -0700 Subject: [PATCH 36/72] Rename base branch to mainline Inspired by: https://twitter.com/mheap/status/1272277332783497218 --- .pyup.yml | 2 +- .travis.yml | 2 +- Makefile | 2 +- Readme.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pyup.yml b/.pyup.yml index 56612e9..40eb070 100644 --- a/.pyup.yml +++ b/.pyup.yml @@ -2,7 +2,7 @@ update: all schedule: "every day" -branch: master +branch: mainline label_prs: pyup diff --git a/.travis.yml b/.travis.yml index 70a8c8c..8a09a41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ script: branches: only: - - master + - mainline notifications: email: false diff --git a/Makefile b/Makefile index 6dbef76..a0e3d98 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ dockerpush: docker push $(USER_NAME)/$(SITE_NAME):$(SHA) triggerdownstream: - curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_TOKEN)" -d '{ "request": { "branch":"master" }}' https://api.travis-ci.com/repo/pzelnip%2Fwww.codependentcodr.com/requests + curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_TOKEN)" -d '{ "request": { "branch":"mainline" }}' https://api.travis-ci.com/repo/pzelnip%2Fwww.codependentcodr.com/requests deploy: dockerbuild safety dockerpush triggerdownstream diff --git a/Readme.md b/Readme.md index 0b76689..c7cf96d 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ # Codependent Codr Base Image -[![Build Status](https://travis-ci.com/pzelnip/codependentcodrbase.svg?branch=master)](https://travis-ci.com/pzelnip/codependentcodrbase) +[![Build Status](https://travis-ci.com/pzelnip/codependentcodrbase.svg?branch=mainline)](https://travis-ci.com/pzelnip/codependentcodrbase) This is the base Docker image that I use for my blog. From 9be4732d1ac7e1d597fc2aa832229c6c3c50369f Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Mon, 15 Jun 2020 17:29:42 -0700 Subject: [PATCH 37/72] Update pylint to satisfy safety --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d585e89..0d5c518 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,5 @@ flake8==3.6.0 Markdown==3.0.1 pelican==4.0.0 pydocstyle==3.0.0 -pylint==2.3.1 +pylint==2.5.0 safety==1.8.7 From ac8313bb13a8780b909bc6632c391b4199f60347 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sat, 1 Aug 2020 13:18:29 -0700 Subject: [PATCH 38/72] Create build.yml --- .github/workflows/build.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..0040196 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +# This is a basic workflow to help you get started with Actions + +name: Build Docker Image + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the mainline branch +on: + pull_request: + branches: [ mainline ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + # Runs a single command using the runners shell + - name: Run Docker Build + run: docker build -t codependentcodrbase:latest . + + # Runs a single command using the runners shell + - name: Run Safety + run: docker run -it --rm codependentcodrbase:latest safety check -r /build/requirements.txt --full-report + From 6836d91f2750566f8e1957034be74db5acfdfe05 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sat, 1 Aug 2020 13:19:12 -0700 Subject: [PATCH 39/72] Should fail the build --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 0d5c518..6b49f19 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,4 @@ pelican==4.0.0 pydocstyle==3.0.0 pylint==2.5.0 safety==1.8.7 +Django==2.0.0 From 8c47bf5a43201b12374c62a80d52436db0341554 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sat, 1 Aug 2020 13:26:39 -0700 Subject: [PATCH 40/72] Correct vulnerability --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6b49f19..0d5c518 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,3 @@ pelican==4.0.0 pydocstyle==3.0.0 pylint==2.5.0 safety==1.8.7 -Django==2.0.0 From 5e7a41c98d6f0a65ac3434f08a19b40362779de0 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sat, 6 Mar 2021 19:49:24 -0800 Subject: [PATCH 41/72] Upgrade pelican to 4.5.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0d5c518..0106681 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ bandit==1.5.1 black==18.9b0 flake8==3.6.0 Markdown==3.0.1 -pelican==4.0.0 +pelican==4.5.4 pydocstyle==3.0.0 pylint==2.5.0 safety==1.8.7 From 6a67664d4485873e4e0e593809591cc3b106fb32 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sat, 6 Mar 2021 19:55:00 -0800 Subject: [PATCH 42/72] Update pylint --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0106681..ee60f9e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,5 @@ flake8==3.6.0 Markdown==3.0.1 pelican==4.5.4 pydocstyle==3.0.0 -pylint==2.5.0 +pylint==2.7.2 safety==1.8.7 From 18966e16e0821f78ea21c21ced862a18f00131ba Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sun, 7 Mar 2021 14:00:51 -0800 Subject: [PATCH 43/72] Update black --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ee60f9e..5cbb234 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ autopep8==1.4.3 bandit==1.5.1 -black==18.9b0 +black==20.8b1 flake8==3.6.0 Markdown==3.0.1 pelican==4.5.4 From c97c720586afc66563d7c5e30ae46bcd7af3aa53 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sun, 7 Mar 2021 14:03:17 -0800 Subject: [PATCH 44/72] Update safety --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5cbb234..24a619c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ Markdown==3.0.1 pelican==4.5.4 pydocstyle==3.0.0 pylint==2.7.2 -safety==1.8.7 +safety==1.10.3 From 244019d88052182ed9998550cdf8c727f08abeb8 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sun, 7 Mar 2021 15:45:56 -0800 Subject: [PATCH 45/72] Remove Travis --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 24 ++++++++++++++++++++++++ .travis.yml | 18 ------------------ Makefile | 5 +---- 4 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/deploy.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8ff8cc..674fced 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ # This is a basic workflow to help you get started with Actions -name: Build Docker Image +name: Build PR # Controls when the action will run. Triggers the workflow on push or pull request # events but only for the mainline branch diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..8227681 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,24 @@ +name: Build And Push Image + +on: + push: + branches: [ mainline ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + env: + DOCKER_USERNAME: pzelnip + + steps: + - uses: actions/checkout@v2 + + # Runs a single command using the runners shell + - name: Build And Push Image + shell: 'script -q -e -c "bash {0}"' + run: make deploy + env: + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8a09a41..0000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: bash - -sudo: required - -services: -- docker - -script: -- make deploy - -branches: - only: - - mainline - -notifications: - email: false - slack: - secure: "km7RBKh+IcKOXPz/CLrjmLStdfbRLlI28bDnApZcZR6rA+iSO9HW8tEYIIPAMq6GDfOcnZgpSw5kiJXDjSyuuXoNjP41D4Uyt8z+q9aXcF3QxUBP44hfcF2M+6XnFNin02nZCRPJutK8nMH+DzspmaEZTraG660Oc3ZZPyE8Gvn7uaIyyB7aJe1NlI2hbOCw7A4A2wvjkmHEnNKmE0tpE7FSxHE0YQ/xj7PGAtot7io603brBneZwkNoQ5t5x8DdoD0IVdyvXQQ/W3WX84ePW02JPpBtNLfN+dnzPeZZO86X6ZTKvQjgOqVUDop+MPcWbPO0Wa8IukKj5Sg7MdXwCs+DhsljXr14Hcm1ynnVstEjKTwHFfLXQjRTmcIc3GcRCBaR5FJNh5SvfousDWpE14Vp48RZ744ac80fgxt3treMCkk9eDacW8l1olYoOn32WkMoI6sHnLn4omLqttqXMi842b+Cmzq3Tip2/9jxGtjC7rM+9KrHq1Naldak3rAVGGzB8IDrHf7o+8R6GCIkaDMb39l0vnOSOhMXFO3DS+VFy6nPu1N3WKn13FUaw4GHkND1gHmvH6YlmpiD0W96cuz9BoHcwenCH1gwUsqRR4nA1n1KfwPrtveufHdzWXVzTKoiB1d90b4gV5/U1OAoA56vU9YrdhxvsHQAKzLRfIw=" diff --git a/Makefile b/Makefile index a0e3d98..42c7c90 100644 --- a/Makefile +++ b/Makefile @@ -15,10 +15,7 @@ dockerpush: docker push $(USER_NAME)/$(SITE_NAME):latest docker push $(USER_NAME)/$(SITE_NAME):$(SHA) -triggerdownstream: - curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_TOKEN)" -d '{ "request": { "branch":"mainline" }}' https://api.travis-ci.com/repo/pzelnip%2Fwww.codependentcodr.com/requests - -deploy: dockerbuild safety dockerpush triggerdownstream +deploy: dockerbuild safety dockerpush clean: docker images | grep $(SITE_NAME) | awk {'print $3'} | xargs docker rmi From 17c11304b2137b3abd50a66fa2b10311c4f2eaad Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sun, 7 Mar 2021 15:57:27 -0800 Subject: [PATCH 46/72] Update readme to remove travis reference --- Readme.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index c7cf96d..e6667f4 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ # Codependent Codr Base Image -[![Build Status](https://travis-ci.com/pzelnip/codependentcodrbase.svg?branch=mainline)](https://travis-ci.com/pzelnip/codependentcodrbase) +[![Actions Status](https://github.com/pzelnip/codependentcodrbase/workflows/Build%20And%20Push%20Image/badge.svg)](https://github.com/pzelnip/codependentcodrbase/actions) This is the base Docker image that I use for my blog. @@ -16,7 +16,6 @@ that installing git, curl, npm, etc on every build when I posted a new blog post really made for some long builds. Those packages almost never change, so I pulled that stuff out -into the Dockerfile you find here in this repo. This gets built -nightly by Travis, and pushed to Dockerhub. I then use that +into the Dockerfile you find here in this repo. I then use that built image as the base image for CDC builds, which speeds up my build times for that repo. From 8d3fd771f8cc66614ff170ad72b062333b0c6af8 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Wed, 10 Mar 2021 10:41:23 -0800 Subject: [PATCH 47/72] Fix pyup yml --- .pyup.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.pyup.yml b/.pyup.yml index 40eb070..02b08f2 100644 --- a/.pyup.yml +++ b/.pyup.yml @@ -9,8 +9,7 @@ label_prs: pyup assignees: - pzelnip - requirements: - - requirements/requirements-float.txt: - update: False - pin: False + requirements/requirements-float.txt: + update: False + pin: False From 3417535aabf011d772d3e9bfaf0605a6cdf730c7 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Wed, 10 Mar 2021 10:59:09 -0800 Subject: [PATCH 48/72] Add pyup badges to readme --- Readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Readme.md b/Readme.md index e6667f4..54081a5 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,8 @@ # Codependent Codr Base Image [![Actions Status](https://github.com/pzelnip/codependentcodrbase/workflows/Build%20And%20Push%20Image/badge.svg)](https://github.com/pzelnip/codependentcodrbase/actions) +[![Updates](https://pyup.io/repos/github/pzelnip/codependentcodrbase/shield.svg)](https://pyup.io/repos/github/pzelnip/codependentcodrbase/) +[![Python 3](https://pyup.io/repos/github/pzelnip/codependentcodrbase/python-3-shield.svg)](https://pyup.io/repos/github/pzelnip/codependentcodrbase/) This is the base Docker image that I use for my blog. From f6a0105faa08df2fad84753fb46a6db5270ded69 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Mar 2021 06:10:22 -0800 Subject: [PATCH 49/72] Pin awscli to latest version 1.19.25 --- requirements-float.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-float.txt b/requirements-float.txt index 794c4f6..017d365 100644 --- a/requirements-float.txt +++ b/requirements-float.txt @@ -1,4 +1,4 @@ # These are dependencies that are allowed to "float", ie not be # version pinned. For pinned dependencies see requirements.txt -awscli +awscli==1.19.25 boto3 From 04e48a1fc68ecffafcb737214fc8f8cf4da36656 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Mar 2021 06:10:23 -0800 Subject: [PATCH 50/72] Pin boto3 to latest version 1.17.24 --- requirements-float.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-float.txt b/requirements-float.txt index 017d365..6b9b463 100644 --- a/requirements-float.txt +++ b/requirements-float.txt @@ -1,4 +1,4 @@ # These are dependencies that are allowed to "float", ie not be # version pinned. For pinned dependencies see requirements.txt awscli==1.19.25 -boto3 +boto3==1.17.24 From 07cd4331ddc6d920997dddf2a84f15047a681577 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Mar 2021 06:10:23 -0800 Subject: [PATCH 51/72] Update autopep8 from 1.4.3 to 1.5.5 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 24a619c..9006d09 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -autopep8==1.4.3 +autopep8==1.5.5 bandit==1.5.1 black==20.8b1 flake8==3.6.0 From 9878e038355234332996c76c84c2526efe72f433 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Mar 2021 06:10:23 -0800 Subject: [PATCH 52/72] Update bandit from 1.5.1 to 1.7.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9006d09..68c7b68 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ autopep8==1.5.5 -bandit==1.5.1 +bandit==1.7.0 black==20.8b1 flake8==3.6.0 Markdown==3.0.1 From d10dda42cf854593c7c79114e4050df0e7f225ba Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Mar 2021 06:10:24 -0800 Subject: [PATCH 53/72] Update flake8 from 3.6.0 to 3.8.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 68c7b68..ed852a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ autopep8==1.5.5 bandit==1.7.0 black==20.8b1 -flake8==3.6.0 +flake8==3.8.4 Markdown==3.0.1 pelican==4.5.4 pydocstyle==3.0.0 From 518cb7e865328c7cf6493c9a2b4cf269d8da93b8 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Mar 2021 06:10:24 -0800 Subject: [PATCH 54/72] Update markdown from 3.0.1 to 3.3.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ed852a9..a82640f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.5.5 bandit==1.7.0 black==20.8b1 flake8==3.8.4 -Markdown==3.0.1 +Markdown==3.3.4 pelican==4.5.4 pydocstyle==3.0.0 pylint==2.7.2 From 316af0e073d8df7f329ebd218ed42cb8fda0c827 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Mar 2021 06:10:24 -0800 Subject: [PATCH 55/72] Update pydocstyle from 3.0.0 to 5.1.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a82640f..7114138 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ black==20.8b1 flake8==3.8.4 Markdown==3.3.4 pelican==4.5.4 -pydocstyle==3.0.0 +pydocstyle==5.1.1 pylint==2.7.2 safety==1.10.3 From 50730aadfb61a72e134563860522c2dba8bd7645 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Thu, 11 Mar 2021 09:04:06 -0800 Subject: [PATCH 56/72] Make pyup not look at floating requirements --- .pyup.yml | 4 ++-- requirements-float.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pyup.yml b/.pyup.yml index 02b08f2..5da568b 100644 --- a/.pyup.yml +++ b/.pyup.yml @@ -11,5 +11,5 @@ assignees: requirements: requirements/requirements-float.txt: - update: False - pin: False + update: False + pin: False diff --git a/requirements-float.txt b/requirements-float.txt index 6b9b463..794c4f6 100644 --- a/requirements-float.txt +++ b/requirements-float.txt @@ -1,4 +1,4 @@ # These are dependencies that are allowed to "float", ie not be # version pinned. For pinned dependencies see requirements.txt -awscli==1.19.25 -boto3==1.17.24 +awscli +boto3 From 0e367eabadccd89c7050349b94c10f058486e77a Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Fri, 12 Mar 2021 07:05:32 -0800 Subject: [PATCH 57/72] Trying to fix pyup one more time --- .pyup.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.pyup.yml b/.pyup.yml index 5da568b..5ff6333 100644 --- a/.pyup.yml +++ b/.pyup.yml @@ -10,6 +10,9 @@ assignees: - pzelnip requirements: - requirements/requirements-float.txt: - update: False - pin: False + - requirements/requirements-float.txt: + update: False + pin: False + - requirements.txt: + update: all + pin: True From 345b853d581681ea4240b6e1469169ff23542fe5 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Fri, 12 Mar 2021 07:13:52 -0800 Subject: [PATCH 58/72] Adjust GH actions to only do full build on deploy --- .github/workflows/build.yml | 21 +++++++-------------- .github/workflows/deploy.yml | 3 +++ Makefile | 16 +++++++++++++--- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 674fced..8ee771c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,29 +1,22 @@ -# This is a basic workflow to help you get started with Actions - name: Build PR -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the mainline branch on: pull_request: branches: [ mainline ] + # enable manual running in the actions ui + workflow_dispatch: -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" build: - # The type of runner that the job will run on runs-on: ubuntu-latest - # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - # Runs a single command using the runners shell - - name: Run Docker Build - run: docker build -t codependentcodrbase:latest . + # Do safety check using the most recent version of the image + - name: Run Safety on Requirements.txt + run: cat requirements.txt | docker run -i --rm pyupio/safety safety check --stdin - # Runs a single command using the runners shell - - name: Run Safety - run: docker run --rm codependentcodrbase:latest safety check -r /build/requirements.txt --full-report + - name: Run Safety on Requirements-float.txt + run: cat requirements-float.txt | docker run -i --rm pyupio/safety safety check --stdin diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8227681..f0c95fb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,6 +3,9 @@ name: Build And Push Image on: push: branches: [ mainline ] + # enable manual running in the actions ui + workflow_dispatch: + branches: [ mainline ] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/Makefile b/Makefile index 42c7c90..04dac7d 100644 --- a/Makefile +++ b/Makefile @@ -5,18 +5,28 @@ SHA := $(shell git rev-parse --short HEAD) dockerbuild: docker build -t $(SITE_NAME):latest . -safety: dockerbuild - docker run -it --rm $(SITE_NAME):latest safety check -r /build/requirements.txt --full-report +safety: + cat requirements.txt | docker run -i --rm pyupio/safety safety check --stdin + cat requirements-float.txt | docker run -i --rm pyupio/safety safety check --stdin -dockerpush: +dockerlogin: echo "$(DOCKER_PASSWORD)" | docker login -u "$(DOCKER_USERNAME)" --password-stdin + +dockerpush: dockerlogin docker tag $(SITE_NAME) $(USER_NAME)/$(SITE_NAME):latest docker tag $(SITE_NAME) $(USER_NAME)/$(SITE_NAME):$(SHA) docker push $(USER_NAME)/$(SITE_NAME):latest docker push $(USER_NAME)/$(SITE_NAME):$(SHA) +dockerpull: + docker pull $(USER_NAME)/$(SITE_NAME):latest + deploy: dockerbuild safety dockerpush +quickscan: + cat requirements.txt | docker run -i --rm pyupio/safety safety check --stdin + cat requirements-float.txt | docker run -i --rm pyupio/safety safety check --stdin + clean: docker images | grep $(SITE_NAME) | awk {'print $3'} | xargs docker rmi From 0919672e00d0371b4d23ce5dd460a0f1ef9d2c6a Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Fri, 12 Mar 2021 11:57:12 -0800 Subject: [PATCH 59/72] Try out build/push to dockerhub --- .github/workflows/deploy.yml | 41 ++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f0c95fb..74b7bf2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,11 +17,40 @@ jobs: DOCKER_USERNAME: pzelnip steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 + + # Do safety check using the most recent version of the image + - name: Run Safety on Requirements.txt + run: cat requirements.txt | docker run -i --rm pyupio/safety safety check --stdin + + - name: Run Safety on Requirements-float.txt + run: cat requirements-float.txt | docker run -i --rm pyupio/safety safety check --stdin + + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: | + pzelnip/codependentcodrbase:latest + pzelnip/codependentcodrbase:${{ github.sha }} + # Runs a single command using the runners shell - - name: Build And Push Image - shell: 'script -q -e -c "bash {0}"' - run: make deploy - env: - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + # - name: Build And Push Image + # shell: 'script -q -e -c "bash {0}"' + # run: make deploy + # env: + # DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} From 45eef7c5a1c65b70adf1bcaf5ba02938a485977d Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Fri, 12 Mar 2021 13:10:53 -0800 Subject: [PATCH 60/72] Remove makefile as now everyhing is GH actions --- .github/workflows/deploy.yml | 8 -------- Makefile | 33 --------------------------------- 2 files changed, 41 deletions(-) delete mode 100644 Makefile diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 74b7bf2..5085962 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -46,11 +46,3 @@ jobs: tags: | pzelnip/codependentcodrbase:latest pzelnip/codependentcodrbase:${{ github.sha }} - - - # Runs a single command using the runners shell - # - name: Build And Push Image - # shell: 'script -q -e -c "bash {0}"' - # run: make deploy - # env: - # DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} diff --git a/Makefile b/Makefile deleted file mode 100644 index 04dac7d..0000000 --- a/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -SITE_NAME=codependentcodrbase -USER_NAME=pzelnip -SHA := $(shell git rev-parse --short HEAD) - -dockerbuild: - docker build -t $(SITE_NAME):latest . - -safety: - cat requirements.txt | docker run -i --rm pyupio/safety safety check --stdin - cat requirements-float.txt | docker run -i --rm pyupio/safety safety check --stdin - -dockerlogin: - echo "$(DOCKER_PASSWORD)" | docker login -u "$(DOCKER_USERNAME)" --password-stdin - -dockerpush: dockerlogin - docker tag $(SITE_NAME) $(USER_NAME)/$(SITE_NAME):latest - docker tag $(SITE_NAME) $(USER_NAME)/$(SITE_NAME):$(SHA) - docker push $(USER_NAME)/$(SITE_NAME):latest - docker push $(USER_NAME)/$(SITE_NAME):$(SHA) - -dockerpull: - docker pull $(USER_NAME)/$(SITE_NAME):latest - -deploy: dockerbuild safety dockerpush - -quickscan: - cat requirements.txt | docker run -i --rm pyupio/safety safety check --stdin - cat requirements-float.txt | docker run -i --rm pyupio/safety safety check --stdin - -clean: - docker images | grep $(SITE_NAME) | awk {'print $3'} | xargs docker rmi - -.PHONY: dockerbuild dockerpush deploy safety From f9d10044a3d2346bce58fa2c690ee56c7013d9bf Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sun, 14 Mar 2021 10:24:24 -0700 Subject: [PATCH 61/72] Remove no-longer-needed dependencies After moving to GH actions using Cytopia's Docker images for the various linting tools, I no longer need them in this image. See: https://github.com/pzelnip/www.codependentcodr.com/pull/206 https://github.com/pzelnip/www.codependentcodr.com/pull/207 In fact, I think if I can find a Pelican image, I can deprecate this repo entirely. --- requirements.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7114138..5e837ab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,2 @@ -autopep8==1.5.5 -bandit==1.7.0 -black==20.8b1 -flake8==3.8.4 Markdown==3.3.4 pelican==4.5.4 -pydocstyle==5.1.1 -pylint==2.7.2 -safety==1.10.3 From 6cecc561fbc11d3f2639f1e234bec09467e192ff Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sun, 14 Mar 2021 10:28:04 -0700 Subject: [PATCH 62/72] Fix the requirements-float monitoring for pyup I'm an idiot, specified the wrong path. --- .pyup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pyup.yml b/.pyup.yml index 5ff6333..cc56198 100644 --- a/.pyup.yml +++ b/.pyup.yml @@ -10,7 +10,7 @@ assignees: - pzelnip requirements: - - requirements/requirements-float.txt: + - requirements-float.txt: update: False pin: False - requirements.txt: From c5214b4bb9607f7ad16adf1bdba4723fbd5ca249 Mon Sep 17 00:00:00 2001 From: Adam Parkin Date: Sun, 14 Mar 2021 11:14:24 -0700 Subject: [PATCH 63/72] Trim the docker image down --- Dockerfile | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 765c5bb..d9e08e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,24 +10,12 @@ FROM alpine:latest # image for CDC builds RUN apk add --no-cache --update \ - python3 nodejs-current-npm make git curl + python3 make git curl -RUN python3 -m ensurepip -RUN pip3 install --upgrade pip +RUN python3 -m ensurepip && python3 -m pip install --upgrade pip --no-cache-dir -RUN npm install -g markdownlint-cli - -# needed for Pylint 2.0.0 COPY requirements.txt /build/requirements.txt COPY requirements-float.txt /build/requirements-float.txt -# Note that these 3 commands have to be combined to save on built -# image size. If we separate into multiple Docker commands then -# doing the del after the fact has no effect because Docker *layers* -# the filesystem. See: https://github.com/gliderlabs/docker-alpine/issues/45 -# With this all as one command I found I saved over 100MB on the final -# built image. -RUN apk add --no-cache --update python3-dev gcc build-base && \ - pip3 install -r /build/requirements-float.txt && \ - pip3 install -r /build/requirements.txt && \ - apk del python3-dev gcc build-base +RUN python3 -m pip install -r /build/requirements-float.txt --no-cache-dir && \ + python3 -m pip install -r /build/requirements.txt --no-cache-dir From dd57ab6d08c6078d89f325d0bc23585693ef33a4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 23 Mar 2021 07:10:23 -0700 Subject: [PATCH 64/72] Update pelican from 4.5.4 to 4.6.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5e837ab..c17f044 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Markdown==3.3.4 -pelican==4.5.4 +pelican==4.6.0 From d6d6d22a1d8a227c6f81b59ae1896198e480496b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 3 Oct 2021 07:34:03 -0700 Subject: [PATCH 65/72] Update pelican from 4.6.0 to 4.7.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c17f044..11aa84d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Markdown==3.3.4 -pelican==4.6.0 +pelican==4.7.0 From 2ef0ec6cbc1acbcc4fd669bbe2214ae84f0b13b6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 14 Oct 2021 07:34:02 -0700 Subject: [PATCH 66/72] Update pelican from 4.7.0 to 4.7.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 11aa84d..1bce880 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Markdown==3.3.4 -pelican==4.7.0 +pelican==4.7.1 From 3fc6fbb3fbe04fb88d1348b4fcbc8ca31298711c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 17 Nov 2021 06:34:26 -0800 Subject: [PATCH 67/72] Update markdown from 3.3.4 to 3.3.5 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1bce880..4969a85 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -Markdown==3.3.4 +Markdown==3.3.5 pelican==4.7.1 From ff0bf1f8dc591b12e43479ba0c4387317653eac8 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 18 Nov 2021 06:34:03 -0800 Subject: [PATCH 68/72] Update markdown from 3.3.5 to 3.3.6 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4969a85..d7a4f48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -Markdown==3.3.5 +Markdown==3.3.6 pelican==4.7.1 From e9f54ca4a9f8428fac082d243299ff7752e243a8 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 10 Feb 2022 06:40:04 -0800 Subject: [PATCH 69/72] Update pelican from 4.7.1 to 4.7.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d7a4f48..2fc4702 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Markdown==3.3.6 -pelican==4.7.1 +pelican==4.7.2 From 6cfb1960d659975d457739ea7c0aea694717758d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 6 May 2022 07:35:02 -0700 Subject: [PATCH 70/72] Update markdown from 3.3.6 to 3.3.7 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2fc4702..29378c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -Markdown==3.3.6 +Markdown==3.3.7 pelican==4.7.2 From f3ac82c321b1df657f68c4544fda999e0ec368e2 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 12 Jul 2022 07:35:02 -0700 Subject: [PATCH 71/72] Update pelican from 4.7.2 to 4.8.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 29378c9..7fb90d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Markdown==3.3.7 -pelican==4.7.2 +pelican==4.8.0 From 6034c61cbb435bada7c823e069f96b0c2343c6b9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 16 Jul 2022 07:35:03 -0700 Subject: [PATCH 72/72] Update markdown from 3.3.7 to 3.4.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7fb90d6..1c0a1a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -Markdown==3.3.7 +Markdown==3.4.1 pelican==4.8.0