From 44c28b303389545255d69dd014c50942478faef2 Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 26 Mar 2021 06:32:13 -0400 Subject: [PATCH] Removing Charmcraft Removing the Python dependency on charmcraft, requiring the person who builds charms to have charmcraft installed instead. Partial revert of 52424a2 Change-Id: Ia5acfcd43c035071bd5e989828b3909fd5d13f41 Signed-off-by: beierlm --- requirements.txt | 7 +++---- setup.py | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index ee434ca..f3cb782 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,12 +16,11 @@ Click prettytable<=1.0.1 -PyYAML==5.3.1 +PyYAML pycurl python-magic -jinja2==2.11.2 +jinja2 verboselogs packaging -requests==2.24.0 -charmcraft +requests git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im diff --git a/setup.py b/setup.py index e9b09bd..ae4850c 100644 --- a/setup.py +++ b/setup.py @@ -32,15 +32,14 @@ setup( install_requires=[ "Click", "prettytable", - "pyyaml==5.3.1", + "pyyaml", "pycurl", "python-magic", - "jinja2==2.11.2", + "jinja2", "osm-im", "verboselogs", "packaging", - "requests==2.24.0", - "charmcraft", + "requests", ], setup_requires=["setuptools-version-command"], test_suite="nose.collector", -- 2.25.1