Skip to content

bring fork up to date #1

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

Jump to bottom
Merged
miguelcleon merged 254 commits into from
Dec 19, 2017
Merged

bring fork up to date #1

miguelcleon merged 254 commits into from
Dec 19, 2017

Conversation

@miguelcleon
Copy link
Owner

@miguelcleon miguelcleon commented Dec 19, 2017

No description provided.

sreeder and others added 30 commits March 8, 2016 15:56
add tables from equipment schema
fac6abb
clean up queries and add them for lab analyses and Provenance schemas
6047f1b
update queries and add equipment queries
ba911ff
remove unneeded functions from readService
2bf515b
rearrange model order
ed82918
add code for related queries
911537a
Merge branch 'addqueries' into Dev1_0
e636f7b
new create functions
dd233c0
reformat createservices
0c73b81
update sample function calls, add inheritance in results, work on ge…
dfcb7e3 
…t functions with inheritance
implement polymorphic identity for SF and Results
d14b3cf
create CV parent class
d01a8f0
update sample to work with inheritance
3eb9b86
fix sample file so that it is not throwing an error when plotting
13b664b
fix sample code to work with creating an inherited object
e304133
@emiliom
Update models.py
8179e10 
SamplingFeatures.FeatureGeometry won't be used by default; FeatureGeometryWKT will be used instead. So, the __repr__ method should return FeatureGeometryWKT, not FeatureGeometry
Merge pull request #39 from ODM2/addinheritance
b1cc22b 
Addinheritance
add lists to all id and code fields
ee6b859
rename singular code to plural codes
d476fe8
@valentinedwv
Updated models. RelatedModels to use RelatedId, and Not RelationID. R…
fb0f61c 
…elationship was reversed. getRelatedModelsByCode returned Parent models and not child models.
@valentinedwv
Merge branch 'master' of https://github.com/ODM2/ODM2PythonAPI into f…
9963167 
…ixRelated
@valentinedwv
change to RelatedModels.RelatedId as per ODM2 spec.
8c94c79 
Fix ODM2 to properly use the :memory: sq db
@valentinedwv
Turn off test for CreateService Session closes on failed create #52
6716bef 
Messages different on Mac. Single word for searching, and lower case compares
@valentinedwv
Turn off test for CreateService Session closes on failed create #52
561d7e9 
Messages different on Mac. Single word for searching, and lower case compares
@valentinedwv
removing echo to make the logs shorter
01c149d
@valentinedwv
adding cleanup function. tests randomly failing in travis
2a0aa31
@valentinedwv
adding cleanup function. tests randomly failing in travis
1a3e61e
@valentinedwv
Tests randomly failing in travis. Adding a session.flush and session.…
a653edd 
…invalidated
Merge branch 'master' into Dev1_0
40d407d 
merge master to aqcuire tests in the develop branch
@valentinedwv
Added skipif to test_createservice.py methods
b5c6303
lsetiawan and others added 29 commits September 29, 2017 14:18
@lsetiawan
Add ReadService to Docs
2eddae0
@emiliom
Merge pull request #107 from lsetiawan/expose_read
f6e5859 
Add ReadService to Docs
@lsetiawan
Expose other module services
384fde4
@lsetiawan
Fix reST syntax
8f0df4f
@lsetiawan
Rearrange docs, expose models
fd64a8a
@emiliom
Merge pull request #108 from lsetiawan/expose_services
bc75796 
Expose services
@ocefpaf
Use latest Travis-CI image.
ffb66d6
@lsetiawan
Merge pull request #109 from ocefpaf/travis-ci_image
7d3027e 
Use latest Travis-CI image.
@ocefpaf
test @lsetiawan suggestion
64b4315
@lsetiawan
Merge pull request #110 from ocefpaf/pin_mysql
b40e76a 
test @lsetiawan suggestion
@ocefpaf
Python 3 compat and flake8
d449d47
@lsetiawan
Add ODM2 Models Core Index
62d985c
@emiliom
Merge pull request #112 from lsetiawan/core_index
e3f5db6 
Add ODM2 Models Core Index
@lsetiawan
Add documentation about how to contribute
fef970e
@emiliom
Merge pull request #113 from lsetiawan/contrib
96249ec 
> Add documentation about how to contribute

Looks good. I'm merging.
@lsetiawan
Fix reST syntax.
e243c26
@lsetiawan
Merge pull request #114 from lsetiawan/contrib
599d055 
Fix reST syntax.
@lsetiawan
Add doc to samplingfeatures
682b1c9
@lsetiawan
Add google style doc
1111158
@emiliom
Merge pull request #116 from lsetiawan/sf_edit
1010c1e 
Sf edit
@ocefpaf
Merge branch 'master' into py3k
19f5f2f
@emiliom
Merge pull request #111 from ocefpaf/py3k
1cdf2e2 
Python 3 compatibility and flake8
@ocefpaf
new badge
dd72ecc
@emiliom
Merge pull request #119 from ocefpaf/new_badge
9c28915 
new badge
merge changes to the base function
fae1c64
fix merge issues
73e0a46
@horsburgh
Update README.md
2f82702
Merge branch 'master' into master
e60776f
Merge branch 'master' into master
c2254d4
@miguelcleon miguelcleon merged commit a48e275 into miguelcleon:master Dec 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@miguelcleon @valentinedwv @emiliom @kwuz @ocefpaf @sreeder @lsetiawan @horsburgh