From 5349df36e875a28b9c9aca8b06bd4a303fe00b79 Mon Sep 17 00:00:00 2001
From: Alok Saldanha <aloksaldanha@gmail.com>
Date: Tue, 18 Aug 2020 20:02:24 -0400
Subject: [PATCH] prepared for 0.2.1 release

updated docs
made GATEWAY_IP optional
---
 Changelog.md                  | 6 ++++++
 README.md                     | 2 +-
 cellxgene_gateway/__init__.py | 2 +-
 cellxgene_gateway/env.py      | 5 ++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5bbd1c0..bb12ceb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,9 @@
+# 0.2.1
+
+  * Minor fixes to enable cellxgene 0.16.0
+  * Added CELLXGENE_ARGS to enable passing additional arguments to cellxgene
+  * added metadata/ip_address endpoint
+
 # 0.2.0
 
 Incrementing minor version since the changes for 0.15 are breaking, and we may want to release bugfixes from 0.1.0 branch.
diff --git a/README.md b/README.md
index dc5dd26..2e2b12d 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Note: you may need to downgrade h5py with `pip install h5py==2.9.0` due to an [i
 ### Option 2: Install from PyPI
 
 ```bash
-# NOT YET DONE, COMING! STAY TUNED
+pip install cellxgene-gateway
 ```
 
 ## Running cellxgene gateway
diff --git a/cellxgene_gateway/__init__.py b/cellxgene_gateway/__init__.py
index c903020..3005821 100755
--- a/cellxgene_gateway/__init__.py
+++ b/cellxgene_gateway/__init__.py
@@ -7,4 +7,4 @@
 # OR CONDITIONS OF ANY KIND, either express or implied. See the License for
 # the specific language governing permissions and limitations under the License.
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"
diff --git a/cellxgene_gateway/env.py b/cellxgene_gateway/env.py
index c7fe0e3..0666bd0 100644
--- a/cellxgene_gateway/env.py
+++ b/cellxgene_gateway/env.py
@@ -22,7 +22,7 @@ external_host = os.environ.get(
 external_protocol = os.environ.get(
     "EXTERNAL_PROTOCOL", os.environ.get("GATEWAY_PROTOCOL", "http")
 )
-ip = os.environ.get("GATEWAY_IP")
+ip = os.environ.get("GATEWAY_IP", "127.0.0.1")
 extra_scripts = os.environ.get("GATEWAY_EXTRA_SCRIPTS")
 ttl = os.environ.get("GATEWAY_TTL")
 enable_upload = os.environ.get("GATEWAY_ENABLE_UPLOAD", "").lower() in [
@@ -39,12 +39,12 @@ enable_backed_mode = os.environ.get(
 env_vars = {
     "CELLXGENE_LOCATION": cellxgene_location,
     "CELLXGENE_DATA": cellxgene_data,
-    "GATEWAY_IP": ip,
 }
 
 optional_env_vars = {
     "EXTERNAL_HOST": external_host,
     "EXTERNAL_PROTOCOL": external_protocol,
+    "GATEWAY_IP": ip,
     "GATEWAY_PORT": gateway_port,
     "GATEWAY_EXTRA_SCRIPTS": extra_scripts,
     "GATEWAY_TTL": ttl,
@@ -69,7 +69,6 @@ def validate():
 
         export CELLXGENE_LOCATION=~/anaconda/envs/cellxgene-dev/bin/cellxgene
         export CELLXGENE_DATA=../cellxgene_data
-        export GATEWAY_IP=127.0.0.1
     """
         )
     else: