From f99d28f989bf0b1b708e065040e692c838474702 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex.kavanagh@canonical.com>
Date: Wed, 17 Feb 2021 12:06:05 +0000
Subject: [PATCH] Updates to pin charm-tools to 2.8.3

* Update requirements.txt to pin charm-tools to 2.8.3
* Update tox.ini to change the build parameters.
* This upgrades from <2.7 which adds reproducible charms
* Bug was fixed that controlled the default output directory
  doesn't get 'builds' appended.  The tox change puts it
  back so that stable & master both build to the same
  directory.  This may be reviewed in the future.

Change-Id: I315a2996d598487071cd998ee789bb409f8f1fcc
---
 requirements.txt | 2 +-
 tox.ini          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 1b0df5e..46b4e99 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 # Build requirements
-charm-tools>=2.4.4,<2.8
+charm-tools==2.8.3
 
 # Workaround until https://github.com/juju/charm-tools/pull/589 gets
 # published
diff --git a/tox.ini b/tox.ini
index c91922e..ce79fa1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ deps =
 [testenv:build]
 basepython = python3
 commands =
-    charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
+    charm-build --log-level DEBUG -o {toxinidir}/build/builds src {posargs}
 
 [testenv:py3]
 basepython = python3