Skip to content

Release/0.7.1 #154

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

Merged
lsetiawan merged 21 commits into from
Mar 2, 2018
Merged

Release/0.7.1 #154

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8a0deb4
Implemented Eager Loading for samplingfeaturedataset query.
Elijahwalkerwest Jan 18, 2018
16b6794
Removed commented old code.
Elijahwalkerwest Jan 19, 2018
93c2427
Had a stray character, removed it as well as some useless imports
Elijahwalkerwest Jan 19, 2018
0613a39
Merge branch 'development' into samplingfeaturedataset_dev
Elijahwalkerwest Jan 19, 2018
441890e
Remove allow flake8 failure for python 2.7
lsetiawan Jan 19, 2018
9c1a7dc
Cleaup code to meet PEP8
lsetiawan Jan 22, 2018
f5498a6
Merge pull request #143 from ODM2/samplingfeaturedataset_dev
lsetiawan Jan 23, 2018
08b8c07
Refactor ODM2
lsetiawan Feb 16, 2018
67f208c
Make new ODM2 to use the refractored ODM2
lsetiawan Feb 16, 2018
23891b2
Fix import flake8 error
lsetiawan Feb 16, 2018
d4e4425
Merge branch 'master' of https://github.com/ODM2/ODM2PythonAPI into d…
lsetiawan Feb 26, 2018
42679df
Merge pull request #150 from lsetiawan/update_dev
lsetiawan Feb 26, 2018
74d2028
Update README DOCS
lsetiawan Feb 26, 2018
abca232
Remove flake-print
lsetiawan Feb 27, 2018
8501ad8
Update README.md
lsetiawan Feb 27, 2018
50d0db4
Update README change number.
lsetiawan Feb 27, 2018
981f4c6
Merge pull request #147 from lsetiawan/deprecate_odm2
lsetiawan Feb 27, 2018
59115f5
Update installing.rst
lsetiawan Feb 27, 2018
88bc642
Merge pull request #151 from lsetiawan/update_readme
lsetiawan Feb 27, 2018
56e25ec
Update sphinx docs about models, modules, and odm2models
lsetiawan Feb 28, 2018
ce39ac4
Merge pull request #153 from lsetiawan/update_sphinx
lsetiawan Feb 28, 2018
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
Prev Previous commit
Next Next commit
Had a stray character, removed it as well as some useless imports
  • Loading branch information
@Elijahwalkerwest
Elijahwalkerwest committed Jan 19, 2018
commit 93c2427bf50567b1b3e5560a51e8d560b19905b2
4 changes: 2 additions & 2 deletions odm2api/ODM2/services/readService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import pandas as pd

from sqlalchemy import distinct, exists
from sqlalchemy.orm import lazyload, joinedload, contains_eager, eagerload, defer, deferred, subqueryload
from sqlalchemy.orm import joinedload, contains_eager, eagerload, defer, deferred, subqueryload

__author__ = 'sreeder'

Expand Down Expand Up @@ -946,7 +946,7 @@ def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=No
sf_query = sf_query.filter(SamplingFeatures.SamplingFeatureCode.in_(codes))
if uuids:
sf_query = sf_query.filter(SamplingFeatures.SamplingFeatureUUID.in_(uuids))
w

sf_list = []
for sf in sf_query.all():
sf_list.append(sf)
Expand Down