Skip to content
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.

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

Lcra #117

Merged
merged 40 commits into from
Feb 1, 2016
Merged

Lcra #117

merged 40 commits into from
Feb 1, 2016

Conversation

solomon-negusse
Copy link
Member

No description provided.

…with other LCRA site listing and hard code dam head/tail site list
* master:
  add statistic_code parameter and passthrough extra kwargs in get_site_data
  add new kwargs and fix docstrings for hdf.update_site_list
  skip argument checks if input_file provided
  Revert "add new kwargs to hdf.update_site_list and fix tests"
  add new kwargs to hdf.update_site_list and fix tests
  add tests
  make kwargs singular, cleanup docstring and raise exceptions when http response not 200
  Add all major filters and generalize get_sites to pass through any extra kwargs provided
  Added raise exceptions if the correct amount of filters are supplied for the NWIS site
  Added xml files used for testing bounding box and site parameter NWIS filters
  Added testing methods for bounding box and site parameter codes for USGS NWIS get sites
  Added bounded box and site parameter code for USGS NWIS get sites
  bump to next dev version
  update changelog and bump version for release
* master: (114 commits)
  add html5lib and httpretty 0.8.6 to appveyor
  modify his central test to only assert against fields that are unlikely to change with live data since mocking isn't working with suds-jurko
  tests require html5lib
  fix readme formatting
  version bump to 0.8.2-dev
  version bump to 0.8.1
  fix formatting
  add lxml as an explicit dependency in the conda environment files
  Added MANIFEST.in
  bump to version 0.8.1-dev
  tweak readme/changelog
  pytables 3.2 has a hard crash on python 3.4/windows downgrade to 3.1.1, see PyTables/PyTables#492
  add conda env yml files to make setting up conda envs for development easier
  add pep 0440 version string
  mv version to VERSION.txt and remove dependency on execfile in setup.py
  mv version to VERSION.txt
  prep for 0.8 release
  remove mocked test for cdec, unable to get it working on windows
  windows fix for ptrepack
  fix more paths
  ...
* 'lcra' of github.com:ulmo-dev/ulmo:
  consistent str to datetime and df to dicts conversion coerce values to float
  added lcra near real-time wq data reader
@dharhas
Copy link
Contributor

dharhas commented Dec 22, 2015

This is failing some lcra tests on AppVeyor (i.e. windows). I'm rerunning the tests on AppVeyor since one of the failures looks like a network issue. @solomon-negusse can you verify that the tests pass locally on windows in a conda env?

@dharhas dharhas mentioned this pull request Dec 22, 2015
4 tasks
@solomon-negusse
Copy link
Member Author

okay will do.

@solomon-negusse
Copy link
Member Author

@dharhas i hit some issues setting up a windows vagrant box and installing conda and don't have much time to investigate further now but need to use this module for coastal geodatabase project. can we merge this and open an issue for the windows tests?

@dharhas
Copy link
Contributor

dharhas commented Jan 12, 2016

@solomon-negusse You don't really need to use a vagrant box. Just use one of the windows machines you have at TWDB and setup a conda virtual environment and run the tests there. I'm a bit hesitant to merge something in with failing tests because we will never come back to them to fix them.

@dharhas
Copy link
Contributor

dharhas commented Jan 12, 2016

We could also merge it in but make an windows test issue but not make a new ulmo release until we sort out the windows stuff.

@solomon-negusse
Copy link
Member Author

got you. we can hold off on the merging if we won't make a new release. i can work from the branch until i get it the windows issue resolved.

dharhas added a commit that referenced this pull request Feb 1, 2016
@dharhas dharhas merged commit 0e4628c into master Feb 1, 2016
@emiliom emiliom deleted the lcra branch September 2, 2021 04:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants