Merge branch 'master' into fix-syntax-warnings

Author: DarkFenX

.appveyor.yml

@@ -17,7 +17,7 @@ for:
     # init:
     #   - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
     install:
-      - sh: sudo DEBIAN_FRONTEND=noninteractive apt-get -y update
+      - sh: sudo DEBIAN_FRONTEND=noninteractive apt-get -y update --allow-releaseinfo-change
       # AppImage dependencies
       - sh: sudo DEBIAN_FRONTEND=noninteractive apt-get -y install libfuse2
       # Preparation script dependencies

eos/db/migrations/upgrade48.py

@@ -0,0 +1,15 @@
+"""
+Migration 48
+
+- added pilot security column (CONCORD ships)
+"""
+
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT pilotSecurity FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN pilotSecurity FLOAT")

eos/db/migrations/upgrade49.py

@@ -0,0 +1,15 @@
+"""
+Migration 49
+
+- added hp column to targetResists table
+"""
+
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+        try:
+            saveddata_engine.execute("SELECT hp FROM targetResists LIMIT 1;")
+        except sqlalchemy.exc.DatabaseError:
+            saveddata_engine.execute("ALTER TABLE targetResists ADD COLUMN hp FLOAT;")

eos/db/saveddata/fit.py

@@ -63,7 +63,8 @@
                    Column("ignoreRestrictions", Boolean, default=0),
                    Column("created", DateTime, nullable=True, default=datetime.datetime.now),
                    Column("modified", DateTime, nullable=True, default=datetime.datetime.now, onupdate=datetime.datetime.now),
-                   Column("systemSecurity", Integer, nullable=True)
+                   Column("systemSecurity", Integer, nullable=True),
+                   Column("pilotSecurity", Float, nullable=True),
                    )
 
 projectedFits_table = Table("projectedFits", saveddata_meta,

eos/db/saveddata/targetProfile.py

@@ -37,6 +37,7 @@
     Column('maxVelocity', Float, nullable=True),
     Column('signatureRadius', Float, nullable=True),
     Column('radius', Float, nullable=True),
+    Column('hp', Float, nullable=True),
     Column('ownerID', ForeignKey('users.ID'), nullable=True),
     Column('created', DateTime, nullable=True, default=datetime.datetime.now),
     Column('modified', DateTime, nullable=True, onupdate=datetime.datetime.now))
@@ -48,4 +49,5 @@
         'rawName': targetProfiles_table.c.name,
         '_maxVelocity': targetProfiles_table.c.maxVelocity,
         '_signatureRadius': targetProfiles_table.c.signatureRadius,
-        '_radius': targetProfiles_table.c.radius})
+        '_radius': targetProfiles_table.c.radius,
+        '_hp': targetProfiles_table.c.hp})