Commit ba157ea3 authored by Willi Rath's avatar Willi Rath

Merge branch 'develop' into '66-add-cera-downloads'

# Conflicts:
#   tests/test_full_yaml_file_and_cli.py
parents ffc7ca0b 6a328f2f
......@@ -184,7 +184,7 @@ class CurlSingleFile(Renderer):
"""
template = "curl -o \"{prefix}/{file_name}\" \"{url}\"\n"
template = "curl -L -o \"{prefix}/{file_name}\" \"{url}\"\n"
class WgetRecursive(Renderer):
......@@ -421,22 +421,29 @@ class ReadmeRenderer(Renderer):
"""\
# {{repo_name}}
{{repo_description}}
**Note:** *This dataset is just a mirror of an external source.
Please make sure to properly credit the original creators of the data
set just as you would do if you'd obtained the data directly from
them.*
To learn more about how to use and access the data, check the central
documentation: <https://git.geomar.de/data/docs/>
-----
{{repo_description}}
{{maybe_acknowledgements}}
{{maybe_citations}}
## People who might now
## People who might know
To learn more, you can ask the following people:
{{people}}
## Known problems
## Known issues
- Open and closed issues are here:
<{{http_path_remote}}/issues?scope=all&state=all>
......@@ -444,6 +451,7 @@ class ReadmeRenderer(Renderer):
- Found a problem? Report it here:
<{{http_path_remote}}/issues/new>
{{known_issues}}
## History
......@@ -470,7 +478,8 @@ class ReadmeRenderer(Renderer):
[meta.yaml](meta.yaml).
*Rendered with
[data_repo_renderer](https://git.geomar.de/data/data_repo_renderer/)
[data_repo_renderer](
https://git.geomar.de/data/tools/data_repo_renderer/)
{version}*
""".format(version=__version__))
......
......@@ -25,6 +25,18 @@ repo_description: |
asdf asdf asdf asdf asdf asdf asdf asdf asdf asdf asdf asdf asdf asdf asdf
asdf asdf asdf asdf asdf asdf
known_issues: |
A sample breakdown of known problems and issues.
## May contain full Markdown
- like
- lists
```
and code
```
acknowledgements: |
The TEST_REPO data was provided by EXAMPLE.COM.
......@@ -135,11 +147,11 @@ git pull
git lfs pull
git lfs track "data/**" "suppl_data/**" "extra_data/**"
curl -o "data/nao_station_monthly.txt" \
curl -L -o "data/nao_station_monthly.txt" \
"https://www.example.com/files/nao_station_monthly.txt"
curl -o "data/nao_station_djfm.txt" \
curl -L -o "data/nao_station_djfm.txt" \
"https://www.example.com/files/nao_station_djfm.txt"
curl -o "data/nao_station_annual.txt" \
curl -L -o "data/nao_station_annual.txt" \
"https://www.example.com/files/nao_station_annual.txt"
wget -nv -r -c -np -nH --cut-dirs=2 --accept "*.nc,*.cdf,*.nc.gz" -P "data" \
"https://www.example.com/"
......@@ -167,9 +179,9 @@ java -cp "${{jblob_jar}}":"${{commons_jar}}" \\
rm -rf "${{jblob_tmp_dir}}"
# == Get data from CERA ==
curl -o "doc/doc_01.html" \
curl -L -o "doc/doc_01.html" \
"https://www.example.com/doc_01.html"
curl -o "doc/doc_02.html" \
curl -L -o "doc/doc_02.html" \
"https://www.example.com/doc_02.html"
gunzip data/*.gz
......
......@@ -11,7 +11,7 @@ def test_base_class_generates_empty_string():
def test_curl_single_file_rendering():
yaml_dict = {"prefix": "pref", "file_name": "fn", "url": "http://url"}
target_string = "curl -o \"pref/fn\" \"http://url\"\n"
target_string = "curl -L -o \"pref/fn\" \"http://url\"\n"
renderer = data_repo_renderer.CurlSingleFile(yaml_dict=yaml_dict)
assert renderer.__str__ == target_string
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment