bring fork up to date#1

Merged

miguelcleon merged 254 commits into

miguelcleon:masterfrom

Dec 19, 2017

This pull request is big! We're only showing the most recent 250 commits

Commits on Mar 8, 2016

add tables from equipment schema
sreeder
committed
clean up queries and add them for lab analyses and Provenance schemas
sreeder
committed

Commits on Mar 10, 2016

update queries and add equipment queries
sreeder
committed

Commits on Mar 15, 2016

remove unneeded functions from readService
Stephanie Reeder
committed

Commits on Mar 16, 2016

rearrange model order
Stephanie Reeder
committed

Commits on Mar 17, 2016

add code for related queries
Stephanie Reeder
committed
Merge branch 'addqueries' into Dev1_0
Stephanie Reeder
committed

Commits on Mar 23, 2016

new create functions
Stephanie Reeder
committed
reformat createservices
Stephanie Reeder
committed
update sample function calls, add inheritance in results, work on get functions with inheritance
Stephanie Reeder
committed
implement polymorphic identity for SF and Results
Stephanie Reeder
committed
create CV parent class
Stephanie Reeder
committed

Commits on Mar 30, 2016

update sample to work with inheritance
Stephanie Reeder
committed

Commits on Apr 4, 2016

fix sample file so that it is not throwing an error when plotting
Stephanie Reeder
committed
fix sample code to work with creating an inherited object
Stephanie Reeder
committed

Commits on Apr 7, 2016

Update models.py
emiliom
committed

Commits on Apr 11, 2016

Merge pull request #39 from ODM2/addinheritance
Stephanie Reeder
committed

Commits on Apr 12, 2016

add lists to all id and code fields
Stephanie Reeder
committed
rename singular code to plural codes
Stephanie Reeder
committed

Commits on Apr 14, 2016

Commits on Apr 15, 2016

Commits on Apr 18, 2016

update tests
Stephanie Reeder
committed
fix typos found by tests
Stephanie Reeder
committed

Commits on Apr 19, 2016

fix typos found by tests, add FeatureGeometryWKT to testscripts
Stephanie Reeder
committed
run pytest
Stephanie Reeder
committed
alter insert into mysql script to account for featuregeometry wkt
Stephanie Reeder
committed
add value to sampling feature type site for FeatureGeometryWKT
Stephanie Reeder
committed

Commits on Apr 22, 2016

Commits on Apr 26, 2016

Commits on May 23, 2016

fi affiliation issue
stephanie
committed
update model tests
stephanie
committed

Commits on Jun 14, 2016

fix issue with spatialreferences
sreeder
committed

Commits on Jun 16, 2016

have create_service return object
stephanie
committed
merge
stephanie
committed
update error in test file
stephanie
committed
update appveyor stuff
stephanie
committed
comment out other databases
stephanie
committed
update travis script paths
stephanie
committed

Commits on Jun 22, 2016

change appveyor file to only load mssql db
stephanie
committed
oops in appveyor file
stephanie
committed
update testing scripts
stephanie
committed
travis update, fix pandas error
stephanie
committed

Commits on Jun 28, 2016

update the create functions
stephanie
committed
update conda channels in appveyor
stephanie
committed
appveyor.yml for mysql and postgres
stephanie
committed
update travis and appveyor files
stephanie
committed
update running of .sh files
stephanie
committed
update postgres script
stephanie
committed
update method query
stephanie
committed

Commits on Jun 29, 2016

update create query
stephanie
committed
update create functions
stephanie
committed
Merge pull request #68 from ODM2/fixqueries
Stephanie Reeder
authored

Commits on Jul 8, 2016

Merge branch 'master' of https://github.com/ODM2/ODM2PythonAPI
valentinedwv
committed

Commits on Aug 16, 2016

fix naming of result objects to be consistant
stephanie
committed

Commits on Aug 19, 2016

update APIDemo.ipynb
stephanie
committed

Commits on Aug 26, 2016

remove any reference to Feature Geometry. remove geoalchemy dependency

Stephanie Reeder
authored and
Stephanie Reeder
committed
remove shapely dependency

Stephanie Reeder
authored and
Stephanie Reeder
committed
update imports so they are static

Stephanie Reeder
authored and
Stephanie Reeder
committed

Commits on Sep 27, 2016

Merge pull request #69 from ODM2/renamevalueobjects
Stephanie Reeder
authored
update version number

Stephanie Reeder
authored and
Stephanie Reeder
committed

Commits on Sep 28, 2016

add createannotations)

Stephanie Reeder
authored and
Stephanie Reeder
committed

Commits on Oct 11, 2016

add updated query code to services

Stephanie Reeder
authored and
Stephanie Reeder
committed
update 1.1 connectivity

Stephanie Reeder
authored and
Stephanie Reeder
committed

Commits on Oct 17, 2016

update detailed result value
stephanie
committed

Commits on Nov 1, 2016

update result to filter by type
sreeder
committed
fix typo
sreeder
committed

Commits on Nov 8, 2016

add delete values
sreeder
committed

Commits on Nov 22, 2016

update detailed result to contain begin and end date
sreeder
committed
fix casing error
stephanie
committed
update random connection
stephanie
committed

Commits on Nov 28, 2016

update annotations
stephanie
committed

Commits on Dec 7, 2016

update detailed result obj
stephanie
committed
add result object to detailed result
stephanie
committed
fix typo
stephanie
committed
add ids to get annotations
stephanie
committed
add updates for result and action
stephanie
committed
update result creation
stephanie
committed
saving
stephanie
committed

Commits on Jan 19, 2017

updateService line 30 - added type checking for dateTime
kwuz
committed

Commits on Jan 21, 2017

update upateaction
stephanie
committed
Merge branch 'odmtools' of http://github.com/ODM2/ODM2PythonAPI into odmtools
stephanie
committed

Commits on Feb 7, 2017

updating for odmtools
stephanie
committed

Commits on Feb 8, 2017

Fix detail result id query
Francisco Arrieta
committed

Commits on Mar 13, 2017

update setSchema function do not set schema to empty string
sreeder
committed

Commits on Apr 13, 2017

Merge pull request #73 from ocefpaf/badge
emiliom
authored

Commits on Apr 17, 2017

adjust db connection add update and delete functions
sreeder
committed
update conn_string to prevent timeout
sreeder
committed

Commits on Apr 18, 2017

move higher level into basic get functions
sreeder
committed

Commits on Apr 26, 2017

fix getprocessinglevels to use id filter
lsetiawan
committed

Commits on May 1, 2017

add sampling feature and variables filter in the getresults function
sreeder
committed
fix order of filtering objects
sreeder
committed

Commits on May 2, 2017

Merge branch 'odmtools' of http://github.com/ODM2/ODM2PythonAPI into odmtools
stephanie
committed
update the getrelatedfeatures, getresults, and getresultvalues
stephanie
committed
fix related features
stephanie
committed

Commits on May 3, 2017

update the siteid filter
stephanie
committed
update base and models
sreeder
committed
'merge
sreeder
committed
fix schema error
stephanie
committed

Commits on May 5, 2017

Commits on May 6, 2017

Merge pull request #78 from ODM2/renameObject
sreeder
authored

Commits on May 9, 2017

cleanup result tests
stephanie
committed
cleanup result tests
stephanie
committed
delete odm1 files
stephanie
committed

Commits on May 11, 2017

Commits on May 12, 2017

remove odm1 reference
sreeder
committed

Commits on May 15, 2017

fix function where I generate a list of ids to check if an id list already exists and return the intersection of the lists
sreeder
committed

Commits on May 19, 2017

Merge pull request #81 from ODM2/cleanup
horsburgh
authored

Commits on May 25, 2017

Commits on May 26, 2017

Commits on Jun 8, 2017

use versioneer
ocefpaf
committed

Commits on Jun 13, 2017

Merge pull request #84 from ocefpaf/versioneer
emiliom
authored

Commits on Jun 19, 2017

Commits on Jul 4, 2017

Commits on Jul 5, 2017

converter -> model
ocefpaf
committed

Commits on Jul 6, 2017

Commits on Aug 9, 2017

Commits on Aug 10, 2017

remove ODM1_1_1 related tests
ocefpaf
committed

Commits on Aug 16, 2017

Commits on Sep 26, 2017

Commits on Sep 27, 2017

Commits on Sep 28, 2017

Commits on Sep 29, 2017

Commits on Oct 5, 2017

Python 3 compat and flake8
ocefpaf
committed

Commits on Oct 9, 2017

Commits on Oct 11, 2017

Merge branch 'master' into py3k
ocefpaf
authored

Commits on Oct 18, 2017

Merge pull request #111 from ocefpaf/py3k
emiliom
authored

Commits on Oct 28, 2017

Commits on Nov 1, 2017

merge changes to the base function
sreeder
committed
fix merge issues
sreeder
committed

Commits on Nov 16, 2017

Update README.md
horsburgh
authored

Commits on Dec 19, 2017

Merge branch 'master' into master
Miguel Leon
authored
Merge branch 'master' into master
Miguel Leon
authored