Merge pull request #82 from SEL-Columbia/conn_devs

constraint error
SEL-Columbia · Sep 5, 2018 · 7208a86 · 7208a86
2 parents 9b0f615 + 9d5e2e9
commit 7208a86
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/minigrid/models.py b/minigrid/models.py
@@ -342,9 +342,7 @@ class Customer(Base):
 
     __table_args__ = (
         sa.UniqueConstraint('customer_minigrid_id', 'customer_user_id'),
-        sa.UniqueConstraint('customer_minigrid_id', 'customer_name'),
-        sa.UniqueConstraint('customer_minigrid_id', 'customer_current_limit'),
-        sa.UniqueConstraint('customer_minigrid_id', 'customer_energy_limit'))
+        sa.UniqueConstraint('customer_minigrid_id', 'customer_name'))
 
 
 class MaintenanceCard(Base):

diff --git a/prod/docker-compose.yml b/prod/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   minigrid:
-    image: selcolumbia/minigrid-server:0.2.7
+    image: selcolumbia/minigrid-server:0.2.8
     command: ./prod/run.sh --db_host=db --redis_url=redis://redis:6379/0 --minigrid-website-url=https://www.example.com
     depends_on:
       - redis

diff --git a/prod/install.sh b/prod/install.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-# Minigrid Server installer for version 0.2.7
+# Minigrid Server installer for version 0.2.8
 set -e
 
 # Do you have docker installed?
@@ -108,8 +108,8 @@ $SUDO openssl dhparam -out /etc/letsencrypt/live/$LETSENCRYPT_DIR/dhparam.pem 20
 printf "========================================\n"
 printf " Generating configuration               \n"
 printf "========================================\n"
-$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.2.7/prod/docker-compose.yml > docker-compose.yml
-$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.2.7/prod/nginx.conf > nginx.conf
+$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.2.8/prod/docker-compose.yml > docker-compose.yml
+$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.2.8/prod/nginx.conf > nginx.conf
 
 sed -i s/www.example.com/$LETSENCRYPT_DIR/g docker-compose.yml
 sed -i s/www.example.com/$LETSENCRYPT_DIR/g nginx.conf

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 asyncio-portier==0.1.0.post1
 cryptography==2.3.1
 psycopg2-binary>=2.7.5
-PyJWT==1.4.2
+PyJWT==1.6.4
 redis==2.10.6
 sockjs-tornado==1.0.5
 sqlalchemy==1.2.11