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.

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

Various catalog fixes #165

Merged
merged 6 commits into from Nov 2, 2017
Merged

Various catalog fixes #165

merged 6 commits into from Nov 2, 2017

Conversation

dopplershift
Copy link
Member

  • Handle RAMADDA TDS catalogs by allowing for no name attribute on catalog refs (just use title)
  • Fix generating access URLs for RAMADDA (which uses a full URL for services) by properly using urljoin
  • Fix catalog reference URL generation on TDS 5 by making sure we use the url from the response as the actual catalog URL (handles forwards)

@dopplershift
ENH: Handle parsing catalog refs from RAMADDA (Fixes Unidata#161)
872e2b9 
Just fall back to title if name is missing.
@dopplershift dopplershift added this to the 0.6.1 milestone Nov 1, 2017
@dopplershift dopplershift mentioned this pull request Nov 1, 2017
Closed
jrleeman
jrleeman previously approved these changes Nov 1, 2017
View reviewed changes
Copy link
Contributor

@jrleeman jrleeman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM pending changes to make 2.7 happy.

@dopplershift
BUG: Use urljoin to create access urls for datasets
95a56b7 
The base for services can be a full url with hostname, so use urljoin to
handle joining, which is more robust than bare concatenation anyway.
This fixes creating access urls for RAMADDA.
@dopplershift
BUG: Fix following catalog refs on TDS 5
dfe4faa 
TDS 5 forwards from /thredds/catalog.xml to
/thredds/catalog/catalog.xml, but we were assuming the catalog given to
the class was the actual URL. Fix that by using the url included in the
response as the actual catalog URL.
@dopplershift
MNT: Fix how we handle warnings in test
91a6099 
Use pytest filtering; before we were accidentally filtering all of the
warnings in the test suite. Also add explicit test of warning in the
catalog html forward test.
@dopplershift
MNT: Silence some pandas warnings
39029b0 
Pandas 0.21 started warning about getting the behavior we exactly
expect, so filter out those warnings.
@dopplershift
MNT: Fix unicode issues on Python 2.7
fd60234 
Pass the raw response content, rather than decoded text, to the element
tree parser. This allows the parser to detect the encoding using the
standard xml tags.
jrleeman
jrleeman approved these changes Nov 2, 2017
View reviewed changes
Copy link
Contributor

@jrleeman jrleeman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good - heck of a maintenance set of changes!

@jrleeman jrleeman merged commit 5f7a89d into Unidata:master Nov 2, 2017
@dopplershift dopplershift deleted the catalog-fixes branch November 2, 2017 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrleeman jrleeman jrleeman approved these changes

@lesserwhirls lesserwhirls Awaiting requested review from lesserwhirls lesserwhirls is a code owner

Assignees
No one assigned
Labels
Area: Catalog Type: Enhancement Type: Maintenance
Projects
None yet
Milestone
0.6.1
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dopplershift @jrleeman