Skip to content

Error in DataLoggerFiles and DataLoggerFileColumns #132 #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
miguelcleon wants to merge 6 commits into from
Closed

Error in DataLoggerFiles and DataLoggerFileColumns #132 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1dbc07c
Add Python 3x versions to travis.
Apr 21, 2016
e60776f
Merge branch 'master' into master
Dec 19, 2017
c2254d4
Merge branch 'master' into master
Dec 19, 2017
a48e275
Merge pull request #1 from ODM2/master
Dec 19, 2017
37a0cc6
fix issue #132
Dec 19, 2017
c63d84b
found another problem
Dec 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@ language: python

sudo: required

# if the https://travis-ci.org/ODM2/ODM2PythonAPI/requests ever says: missing config
Copy link
Member

@lsetiawan lsetiawan Dec 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@miguelcleon Any reason why these were added? It seems like your changes may have broken Travis CI.

Copy link
Member

@lsetiawan lsetiawan Dec 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any changes to Travis should go through a PR so it doesn't just break without anyone knowing why. Thanks. I am going to roll back your changes to fix Travis.

Copy link
Member

@lsetiawan lsetiawan Dec 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your changes are now in PR, please remove any change in .travis.yml

Copy link
Member Author

@miguelcleon miguelcleon Dec 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes this looks like a change I didn't mean to include.

# validate at: http://lint.travis-ci.org/
python:
# - "2.6"
- "2.7"
- "3.2"
- "3.3"
- "3.4"
- "3.5"
# - "3.5-dev" # 3.5 development branch
# - "nightly" # currently points to 3.6-dev
# command to install dependencies
cache:
directories:
- $HOME/miniconda
Expand Down
8 changes: 4 additions & 4 deletions odm2api/ODM2/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,10 +455,10 @@ 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))
DataLoggerOutputFileDescription = Column('dataloggerfiledescription', String(500))
DataLoggerOutputFileLink = Column('dataloggerfilelink', String(255))

ProgramObj = relationship(DataLoggerProgramFiles)

Expand Down Expand Up @@ -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))
Expand Down