From b3ad0c16598b51a2f3a29acf0d4b02101e042a4a Mon Sep 17 00:00:00 2001
From: Aurelien Lourot <aurelien.lourot@canonical.com>
Date: Fri, 5 Mar 2021 10:51:00 +0100
Subject: [PATCH] Fix boilerplate
With charm-tools>=2.8 the build output folder layout
has changed.
Also the linter will fail if the actions/ folder doesn't
exist.
Also put the right flake8 in the right *requirements.txt
file.
Change-Id: Iad6603ef9cecefddbe88766580112191c0472a35
---
actions/.gitkeep | 0
requirements.txt | 3 +--
test-requirements.txt | 2 +-
tox.ini | 3 ++-
4 files changed, 4 insertions(+), 4 deletions(-)
create mode 100644 actions/.gitkeep
diff --git a/actions/.gitkeep b/actions/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/requirements.txt b/requirements.txt
index 0bfc41d..9ba9c99 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
# Requirements to build the layer
-charm-tools
+charm-tools==2.8.3
simplejson
-flake8
diff --git a/test-requirements.txt b/test-requirements.txt
index 095ec9c..db5ef38 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1,2 @@
-flake8>=2.2.4,<=2.4.1
+flake8>=2.2.4
os-testr>=0.4.1
diff --git a/tox.ini b/tox.ini
index d1bb45a..a23a3bb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ basepython = python3
commands =
/bin/echo 'WARNING: *build* target is for testing only.'
/bin/mkdir -p {envdir}/tmp
- charm-build --log-level DEBUG -o {envdir}/tmp/build .
+ charm-build --log-level DEBUG -o {envdir}/tmp/build/builds .
/bin/ln -s {envdir}/tmp/build/builds {envdir}/tmp/build/trusty
/bin/ln -s {envdir}/tmp/build {toxinidir}/build
@@ -62,4 +62,5 @@ commands = /bin/true
[testenv:pep8]
basepython = python3
+deps = -r{toxinidir}/test-requirements.txt
commands = flake8 --ignore=E402 actions/ reactive/