Skip to content

Preparing for release 0.7, merging development to master #142

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
emiliom merged 73 commits into from
Jan 19, 2018
Merged

Preparing for release 0.7, merging development to master #142

Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
0783a07
initial commit for sampling feature dataset query
Nov 6, 2017
959ba64
remove extra info
Nov 6, 2017
d91ddc7
cleanup models comments
Nov 6, 2017
9419af8
update inline documentation
Nov 6, 2017
01b1933
cleanup documentation url
Nov 6, 2017
e4de3e4
bold required element in documentation
Nov 6, 2017
60ebf3f
rename type to dstype
Nov 6, 2017
53e9631
fix bold documentations
Nov 6, 2017
4df7799
all ready for merging
Nov 6, 2017
4f11a28
Merge pull request #121 from ODM2/sfdataset
sreeder Nov 6, 2017
2a22676
update getDatasets and create getDatasetsResults functions
Nov 9, 2017
1ce6c37
add condition to getDatasetREsults function
Nov 9, 2017
4ea9395
fix typo in get from ids
Nov 13, 2017
11b0c36
update Sample.py
Nov 13, 2017
8a8ffe7
update tests, update DateTime data type to be compatible with sqlite,…
Nov 13, 2017
120008d
fix sample.py file
Nov 13, 2017
a88c8ae
accidentally duplicated code
Nov 13, 2017
9624cc5
remvoe unused imports in models.py
Nov 13, 2017
a4febb4
fix issue with getSamplingFeatureDatasets
Nov 13, 2017
9401656
fix issue with sf in datasets
Nov 13, 2017
91ee0c3
undo changes made to test sql query
Nov 13, 2017
f33c2cb
add datasetsvalues docstrings
Nov 13, 2017
644cb6f
update doc strings
Nov 13, 2017
00834dd
add sfids, sfcodes and sfuuids to getResults
Nov 13, 2017
69656fa
test sfresult function
Nov 13, 2017
1559213
add todo comment
Nov 13, 2017
5ec7eb6
update warning message
Nov 13, 2017
ab50ca8
Merge pull request #122 from ODM2/dsresults
sreeder Nov 14, 2017
be1a758
add restype to result function
Nov 14, 2017
817a78e
Merge branch 'development' into sfresults
sreeder Nov 14, 2017
2d3e4ab
Merge pull request #123 from ODM2/sfresults
sreeder Nov 15, 2017
7e7a34c
update get samplingfeatureds to have new sf structur
Nov 17, 2017
3ff16c1
update assign datasets
Nov 17, 2017
d84c252
update sfdataset test
Nov 17, 2017
dd1ec35
Merge pull request #125 from ODM2/sfdataset
sreeder Nov 17, 2017
89a7b95
Fix Processing Levels code and docstring
lsetiawan Nov 22, 2017
5bf911c
Merge pull request #129 from lsetiawan/proc_lvl
lsetiawan Nov 22, 2017
2b08624
Fixed getSamplingFeatureDatasets issue #130
Elijahwalkerwest Dec 8, 2017
9592471
Fix getSamplingFeatureDataset
lsetiawan Dec 13, 2017
4acdf62
Merge pull request #131 from ODM2/samplingfeaturedataset_dev
lsetiawan Dec 13, 2017
fcef187
fix issue #132 by Miguel C Leon
lsetiawan Dec 20, 2017
ae0bdfd
Merge pull request #134 from lsetiawan/update_dl
lsetiawan Dec 20, 2017
baee8b5
Fix dataframe column names
lsetiawan Jan 5, 2018
32519f6
Update docstrings
lsetiawan Jan 5, 2018
3c132a3
fix builtins in annotations and results
lsetiawan Jan 5, 2018
b87dab2
change ResultType to ResultValues
lsetiawan Jan 5, 2018
cb30fbe
Merge pull request #136 from lsetiawan/fix_getresultvalues
emiliom Jan 5, 2018
edb02fa
Fix the rest of the builtins, added warnings
lsetiawan Jan 5, 2018
c493d61
Fix mistype
lsetiawan Jan 5, 2018
2d92edd
fix builtins in annotations and results
lsetiawan Jan 5, 2018
b822481
Fix the rest of the builtins, added warnings
lsetiawan Jan 5, 2018
005f423
Fix mistype
lsetiawan Jan 5, 2018
3352541
Add kwargs checking, show warnings for unexpected
lsetiawan Jan 5, 2018
acd3ffa
Rebased
lsetiawan Jan 5, 2018
65da961
Merge pull request #137 from lsetiawan/fix_builtins
emiliom Jan 5, 2018
9ca7459
Missed builtin, should be last one
lsetiawan Jan 5, 2018
b572e29
Merge pull request #138 from lsetiawan/fix_getcv
emiliom Jan 5, 2018
fcc9286
Allow sfid to be None to work with older code
lsetiawan Jan 8, 2018
fba24a5
Cleanup readServices and base
lsetiawan Jan 8, 2018
292dc84
Merge pull request #139 from lsetiawan/fix_gr
emiliom Jan 9, 2018
42d9840
Make lowercase columns default, add option to make them same as model
lsetiawan Jan 10, 2018
007550f
Clean up updateService
lsetiawan Jan 10, 2018
26099a0
Cleanup model
lsetiawan Jan 10, 2018
b751673
Update Travis to exclude python code in forms, since this was auto cr…
lsetiawan Jan 10, 2018
7b59e77
Clean up tests
lsetiawan Jan 10, 2018
27cf30b
Ingore Sample.py
lsetiawan Jan 10, 2018
ccb9cd1
Merge pull request #141 from lsetiawan/flake8
emiliom Jan 11, 2018
4b48b3e
Merge branch 'development' into fix_grv
lsetiawan Jan 11, 2018
dbca706
Merge branch 'development' into fix_grv
lsetiawan Jan 11, 2018
badb498
Add warning message for lowercols parameter
lsetiawan Jan 16, 2018
5164ebe
Merge branch 'fix_grv' of https://github.com/lsetiawan/ODM2PythonAPI …
lsetiawan Jan 16, 2018
58a3616
Add warning doc in getDataSetsValues
lsetiawan Jan 16, 2018
f634574
Merge pull request #140 from lsetiawan/fix_grv
lsetiawan Jan 17, 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
Update Travis to exclude python code in forms, since this was auto cr… 
…eated.
  • Loading branch information
@lsetiawan
lsetiawan committed Jan 10, 2018
commit b751673c5fb3772efc6a0338e00b2f18a90e99cd
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ script:
fi

- if [[ $TEST_TARGET == 'coding_standards' ]]; then
find . -type f -name "*.py" ! -name 'conf.py' ! -name '_version.py' ! -name 'versioneer.py' | xargs flake8 --max-line-length=110 ;
find . -type f -name "*.py" ! -name 'conf.py' ! -name '_version.py' ! -name 'versioneer.py' ! -name '*DBConfig.py' | xargs flake8 --max-line-length=110 ;
fi

- if [[ $TEST_TARGET == 'docs' ]]; then
Expand Down