From f1682005f9e8306c9286e30abca42a2671fc7532 Mon Sep 17 00:00:00 2001
From: Mike Fedosin <mfedosin@mirantis.com>
Date: Sun, 21 Aug 2016 13:19:02 +0300
Subject: [PATCH] Clean requirements and update README

---
 README.md                 |  2 --
 README.rst                | 11 +++++++++++
 glare/common/store_api.py |  2 --
 requirements.txt          | 12 ------------
 4 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index 8b9c26b..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# glare
-Glare (from GLance Artifact REpository) is a service that provides access to a unified catalog of structured meta-information as well as related binary data (these structures are also called 'artifacts').
diff --git a/README.rst b/README.rst
index e69de29..d7b28f7 100644
--- a/README.rst
+++ b/README.rst
@@ -0,0 +1,11 @@
+Glare
+=====
+
+Glare (from GLare Artifact REpository) is a service that provides access to a
+unified catalog of structured meta-information as well as related binary data
+(these structures are also called 'artifacts').
+
+License
+-------
+
+Apache License Version 2.0 http://www.apache.org/licenses/LICENSE-2.0
diff --git a/glare/common/store_api.py b/glare/common/store_api.py
index c58753c..1fe11cd 100644
--- a/glare/common/store_api.py
+++ b/glare/common/store_api.py
@@ -37,8 +37,6 @@ error_map = [{'catch': store_exc.NotFound,
               'raise': exception.BadRequest},
              {'catch': store_exc.Duplicate,
               'raise': exception.Conflict},
-             {'catch': store_exc.Conflict,
-              'raise': exception.Conflict},
              {'catch': store_exc.StorageFull,
               'raise': exception.Forbidden},
              {'catch': store_exc.StorageWriteDenied,
diff --git a/requirements.txt b/requirements.txt
index f27e5d7..58ff10f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,6 @@
 
 pbr>=1.6 # Apache-2.0
 
-# < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
 SQLAlchemy<1.1.0,>=1.0.10 # MIT
 alembic>=0.8.4  # MIT
 eventlet!=0.18.3,>=0.18.2 # MIT
@@ -12,28 +11,22 @@ PasteDeploy>=1.5.0 # MIT
 Routes!=2.0,!=2.1,!=2.3.0,>=1.12.3;python_version=='2.7' # MIT
 Routes!=2.0,!=2.3.0,>=1.12.3;python_version!='2.7' # MIT
 WebOb>=1.2.3 # MIT
-sqlalchemy-migrate>=0.9.6 # Apache-2.0
 httplib2>=0.7.5 # MIT
-pycrypto>=2.6 # Public Domain
 oslo.config>=3.10.0 # Apache-2.0
 oslo.concurrency>=3.8.0 # Apache-2.0
 oslo.context>=2.4.0 # Apache-2.0
 oslo.service>=1.10.0 # Apache-2.0
 oslo.utils>=3.14.0 # Apache-2.0
-stevedore>=1.10.0 # Apache-2.0
 futurist>=0.11.0 # Apache-2.0
-taskflow>=1.26.0 # Apache-2.0
 keystoneauth1>=2.7.0 # Apache-2.0
 keystonemiddleware!=4.1.0,!=4.5.0,>=4.0.0 # Apache-2.0
 WSME>=0.8 # MIT
-PrettyTable<0.8,>=0.7 # BSD
 
 # For paste.util.template used in keystone.common.template
 Paste # MIT
 
 jsonpatch>=1.1 # BSD
 jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
-python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
 pyOpenSSL>=0.14 # Apache-2.0
 # Required by openstack.common libraries
 six>=1.9.0 # MIT
@@ -53,15 +46,10 @@ osprofiler>=1.3.0 # Apache-2.0
 # Glance Store
 glance-store>=0.13.0 # Apache-2.0
 
-
 # Artifact repository
 microversion-parse>=0.1.2 # Apache-2.0
 semantic-version>=2.3.1 # BSD
 
-castellan>=0.4.0 # Apache-2.0
-cryptography!=1.3.0,>=1.0 # BSD/Apache-2.0
-debtcollector>=1.2.0 # Apache-2.0
-
 # timeutils
 iso8601>=0.1.11 # MIT
 monotonic>=0.6 # Apache-2.0