Skip to content

Commit

Permalink
Merge pull request #181 from nikola-rados/add-csv-to-thredds
Browse files Browse the repository at this point in the history
Thredds: Add csv to allowed file types

## Overview

We have some `csv` files we want to make available on `THREDDS`. 

## Changes

**Non-breaking changes**
- Adds extra file type to `catalog.xml` filter

**Breaking changes**
- None

## Related Issue / Discussion

- None (although I could make one then edit this)

## Additional Information

This is a very small change, and I wasn't sure it was worth it to create (and maintain) a fork just for this. Furthermore, I couldn't really find a good way to make this more dynamic without adding a bunch of unnecessary complexity.
  • Loading branch information
tlvu authored Jul 13, 2021
2 parents ead98c4 + 3cc8737 commit dd34a40
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.13.11
current_version = 1.13.12
commit = True
tag = False
tag_name = {new_version}
Expand Down
39 changes: 24 additions & 15 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)

[1.13.12](https://github.com/bird-house/birdhouse-deploy/tree/1.13.12) (2021-07-13)
------------------------------------------------------------------------------------------------------------------

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)

### Changes

- Add `csv` files to Thredds filter

[1.13.11](https://github.com/bird-house/birdhouse-deploy/tree/1.13.11) (2021-07-06)
------------------------------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -370,21 +379,21 @@
2. scp `magpie_persist.prod.tgz` to `medus`
3. login to `medus`
4. `cd /path/to/birdhouse-deploy/birdhouse`
3. `./pavics-compose.sh down`
4. `git checkout master`
5. `cd /data`
2. `rm -rf magpie_persist`
3. `tar xzf magpie_persist.prod.tgz` # restore Magpie DB with prod version
4. `cd /path/to/birdhouse-deploy/birdhouse`
5. `./pavics-compose.sh up -d`
3. Update `env.local` `MAGPIE_ADMIN_PASSWORD` with prod passwd for Twitcher to be able to access Magpie since we juste restore the Magpie DB from prod
4. `./pavics-compose.sh restart twitcher` # for Twitcher to get new Magpie admin passwd
4. Baseline working state: trigger Jenkins test suite, ensure all pass except `pavics_thredds.ipynb` that requires new Magpie
5. Baseline working state: view existing services permissions on group Anonymous (https://medus.ouranos.ca/magpie/ui/groups/anonymous/default)
6. `git checkout restore-previous-broken-magpie-upgrade-so-we-can-work-on-a-fix` # This current branch
7. `./pavics-compose.sh up -d` # upgrade to new Magpie
8. `docker logs magpie`: check no DB migration error
9. Trigger Jenkins test suite again
5. `./pavics-compose.sh down`
6. `git checkout master`
7. `cd /data`
8. `rm -rf magpie_persist`
9. `tar xzf magpie_persist.prod.tgz` # restore Magpie DB with prod version
10. `cd /path/to/birdhouse-deploy/birdhouse`
11. `./pavics-compose.sh up -d`
12. Update `env.local` `MAGPIE_ADMIN_PASSWORD` with prod passwd for Twitcher to be able to access Magpie since we juste restore the Magpie DB from prod
13. `./pavics-compose.sh restart twitcher` # for Twitcher to get new Magpie admin passwd
14. Baseline working state: trigger Jenkins test suite, ensure all pass except `pavics_thredds.ipynb` that requires new Magpie
15. Baseline working state: view existing services permissions on group Anonymous (https://medus.ouranos.ca/magpie/ui/groups/anonymous/default)
16. `git checkout restore-previous-broken-magpie-upgrade-so-we-can-work-on-a-fix` # This current branch
17. `./pavics-compose.sh up -d` # upgrade to new Magpie
18. `docker logs magpie`: check no DB migration error
19. Trigger Jenkins test suite again

[1.11.29](https://github.com/bird-house/birdhouse-deploy/tree/1.11.29) (2021-04-16)
------------------------------------------------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ for a full-fledged production platform.
* - releases
- | |latest-version| |commits-since|

.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.13.11.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.13.12.svg
:alt: Commits since latest release
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.13.11...master
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.13.12...master

.. |latest-version| image:: https://img.shields.io/badge/tag-1.13.11-blue.svg?style=flat
.. |latest-version| image:: https://img.shields.io/badge/tag-1.13.12-blue.svg?style=flat
:alt: Latest Tag
:target: https://github.com/bird-house/birdhouse-deploy/tree/1.13.11
:target: https://github.com/bird-house/birdhouse-deploy/tree/1.13.12

.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
:alt: ReadTheDocs Build Status (latest version)
Expand Down
2 changes: 2 additions & 0 deletions birdhouse/config/thredds/catalog.xml.template
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<include wildcard="*.txt" />
<include wildcard="*.md" />
<include wildcard="*.rst" />
<include wildcard="*.csv" />
</filter>

</datasetScan>
Expand All @@ -41,6 +42,7 @@
<include wildcard="*.txt" />
<include wildcard="*.md" />
<include wildcard="*.rst" />
<include wildcard="*.csv" />
</filter>

</datasetScan>
Expand Down

0 comments on commit dd34a40

Please sign in to comment.