From b3250d29742514bc693a2b8a02139dc0fbe35481 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Tue, 18 Jun 2019 13:40:20 +0200
Subject: [PATCH] Remove dependency on swh-core.
This is a fix to workaround pip's inability to correctly solve
extra requirements (swh-model depends on swh-core[], but if other
packages depend on swh-model and swh-core[http], the 'http' extra
does not always get installed).
---
requirements-swh.txt | 1 -
swh/model/cli.py | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
delete mode 100644 requirements-swh.txt
diff --git a/requirements-swh.txt b/requirements-swh.txt
deleted file mode 100644
index 32aa75ec..00000000
--- a/requirements-swh.txt
+++ /dev/null
@@ -1 +0,0 @@
-swh.core >= 0.0.60
diff --git a/swh/model/cli.py b/swh/model/cli.py
index de04bb17..83556295 100644
--- a/swh/model/cli.py
+++ b/swh/model/cli.py
@@ -9,13 +9,14 @@ import sys
from functools import partial
-from swh.core.cli import CONTEXT_SETTINGS
-
from swh.model import identifiers as pids
from swh.model.exceptions import ValidationError
from swh.model.from_disk import Content, Directory
+CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
+
+
class PidParamType(click.ParamType):
name = 'persistent identifier'
--
GitLab