From 1dbc07cea0ab03b908491cd0039cebec6df96204 Mon Sep 17 00:00:00 2001 From: Miguel Leon Date: Thu, 21 Apr 2016 12:50:19 -0400 Subject: [PATCH 1/3] Add Python 3x versions to travis. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1cde9c2..abd6ac2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ python: - "3.2" - "3.3" - "3.4" -# - "3.5" + - "3.5" # - "3.5-dev" # 3.5 development branch # - "nightly" # currently points to 3.6-dev # command to install dependencies From 37a0cc664f19142ed2839e63a293008d803d5792 Mon Sep 17 00:00:00 2001 From: Miguel Leon Date: Tue, 19 Dec 2017 13:31:04 -0500 Subject: [PATCH 2/3] fix issue #132 --- odm2api/ODM2/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/odm2api/ODM2/models.py b/odm2api/ODM2/models.py index 7b6d5b2..4f7eb50 100644 --- a/odm2api/ODM2/models.py +++ b/odm2api/ODM2/models.py @@ -455,7 +455,7 @@ class DataLoggerProgramFiles(Base): class DataLoggerFiles(Base): DataLoggerFileID = Column('dataloggerfileid', Integer, primary_key=True, nullable=False) - ProgramID = Column('actionid', Integer, ForeignKey(DataLoggerProgramFiles.ProgramID), nullable=False) + ProgramID = Column('programid', Integer, ForeignKey(DataLoggerProgramFiles.ProgramID), nullable=False) DataLoggerFileName = Column('dataloggerfilename', String(255), nullable=False) DataLoggerOutputFileDescription = Column('dataloggeroutputfiledescription', String(500)) DataLoggerOutputFileLink = Column('dataloggeroutputfilelink', String(255)) @@ -511,7 +511,7 @@ class DataLoggerFileColumns(Base): nullable=False) ColumnLabel = Column('columnlabel', String(50), nullable=False) ColumnDescription = Column('columndescription', String(500)) - MeasurementEquation = Column('measurmentequation', String(255)) + MeasurementEquation = Column('measurementequation', String(255)) ScanInterval = Column('scaninterval', Float(50)) ScanIntervalUnitsID = Column('scanintervalunitsid', Integer, ForeignKey(Units.UnitsID)) RecordingInterval = Column('recordinginterval', Float(50)) From c63d84bafc0cf785d20412f5fc27910e767ff01b Mon Sep 17 00:00:00 2001 From: Miguel Leon Date: Tue, 19 Dec 2017 14:03:59 -0500 Subject: [PATCH 3/3] found another problem --- odm2api/ODM2/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/odm2api/ODM2/models.py b/odm2api/ODM2/models.py index 4f7eb50..1ad1d05 100644 --- a/odm2api/ODM2/models.py +++ b/odm2api/ODM2/models.py @@ -457,8 +457,8 @@ class DataLoggerFiles(Base): DataLoggerFileID = Column('dataloggerfileid', Integer, primary_key=True, nullable=False) ProgramID = Column('programid', Integer, ForeignKey(DataLoggerProgramFiles.ProgramID), nullable=False) DataLoggerFileName = Column('dataloggerfilename', String(255), nullable=False) - DataLoggerOutputFileDescription = Column('dataloggeroutputfiledescription', String(500)) - DataLoggerOutputFileLink = Column('dataloggeroutputfilelink', String(255)) + DataLoggerOutputFileDescription = Column('dataloggerfiledescription', String(500)) + DataLoggerOutputFileLink = Column('dataloggerfilelink', String(255)) ProgramObj = relationship(DataLoggerProgramFiles)