From 872ac4c86f59aa989f02456be4237c75cfbb915f Mon Sep 17 00:00:00 2001 From: Bert Droesbeke <44875756+bedroesb@users.noreply.github.com> Date: Thu, 16 Nov 2023 13:35:05 +0100 Subject: [PATCH] Move to new version of ETT (#1412) * silva does not exist * new version * countries yaml not needed anymore --- .github/workflows/tool_list_conversion.yml | 4 - _config.yml | 2 +- _data/countries.yml | 250 --------------------- pages/national_resources/de_resources.md | 1 - var/country_list.py | 50 ----- 5 files changed, 1 insertion(+), 306 deletions(-) delete mode 100644 _data/countries.yml delete mode 100644 var/country_list.py diff --git a/.github/workflows/tool_list_conversion.yml b/.github/workflows/tool_list_conversion.yml index 13821ac02..8213ccc9f 100644 --- a/.github/workflows/tool_list_conversion.yml +++ b/.github/workflows/tool_list_conversion.yml @@ -55,10 +55,6 @@ jobs: run: | python var/tools_validator.py --reg --username ${{ secrets.FAIRSHARING_USERNAME }} --password "${{ secrets.FAIRSHARING_PASSWORD }}" - - name: Fetch country names with corresponding iso - run: | - python var/country_list.py - - name: Update markdown pages with DSW links run: | python var/dsw_integration.py diff --git a/_config.yml b/_config.yml index 087de2148..5f9e29800 100644 --- a/_config.yml +++ b/_config.yml @@ -4,7 +4,7 @@ title: RDMkit description: "Best practices and guidelines you can use for FAIR management of your research data." # Metadata description of the website -remote_theme: ELIXIR-Belgium/elixir-toolkit-theme@2.2.2 +remote_theme: ELIXIR-Belgium/elixir-toolkit-theme@2.4.0 sass: style: compressed diff --git a/_data/countries.yml b/_data/countries.yml deleted file mode 100644 index 66a54e128..000000000 --- a/_data/countries.yml +++ /dev/null @@ -1,250 +0,0 @@ -AD: Andorra -AE: United Arab Emirates -AF: Afghanistan -AG: Antigua and Barbuda -AI: Anguilla -AL: Albania -AM: Armenia -AO: Angola -AQ: Antarctica -AR: Argentina -AS: American Samoa -AT: Austria -AU: Australia -AW: Aruba -AX: "\xC5land Islands" -AZ: Azerbaijan -BA: Bosnia and Herzegovina -BB: Barbados -BD: Bangladesh -BE: Belgium -BF: Burkina Faso -BG: Bulgaria -BH: Bahrain -BI: Burundi -BJ: Benin -BL: "Saint Barth\xE9lemy" -BM: Bermuda -BN: Brunei Darussalam -BO: Bolivia (Plurinational State of) -BQ: Bonaire, Sint Eustatius and Saba -BR: Brazil -BS: Bahamas -BT: Bhutan -BV: Bouvet Island -BW: Botswana -BY: Belarus -BZ: Belize -CA: Canada -CC: Cocos (Keeling) Islands -CD: Congo (Democratic Republic of the) -CF: Central African Republic -CG: Congo -CH: Switzerland -CI: Ivory Coast -CK: Cook Islands -CL: Chile -CM: Cameroon -CN: China -CO: Colombia -CR: Costa Rica -CU: Cuba -CV: Cabo Verde -CW: "Cura\xE7ao" -CX: Christmas Island -CY: Cyprus -CZ: Czech Republic -DE: Germany -DJ: Djibouti -DK: Denmark -DM: Dominica -DO: Dominican Republic -DZ: Algeria -EC: Ecuador -EE: Estonia -EG: Egypt -EH: Western Sahara -ER: Eritrea -ES: Spain -ET: Ethiopia -FI: Finland -FJ: Fiji -FK: Falkland Islands (Malvinas) -FM: Micronesia (Federated States of) -FO: Faroe Islands -FR: France -GA: Gabon -GB: United Kingdom of Great Britain and Northern Ireland -GD: Grenada -GE: Georgia -GF: French Guiana -GG: Guernsey -GH: Ghana -GI: Gibraltar -GL: Greenland -GM: Gambia -GN: Guinea -GP: Guadeloupe -GQ: Equatorial Guinea -GR: Greece -GS: South Georgia and the South Sandwich Islands -GT: Guatemala -GU: Guam -GW: Guinea-Bissau -GY: Guyana -HK: Hong Kong -HM: Heard Island and McDonald Islands -HN: Honduras -HR: Croatia -HT: Haiti -HU: Hungary -ID: Indonesia -IE: Ireland -IL: Israel -IM: Isle of Man -IN: India -IO: British Indian Ocean Territory -IQ: Iraq -IR: Iran (Islamic Republic of) -IS: Iceland -IT: Italy -JE: Jersey -JM: Jamaica -JO: Jordan -JP: Japan -KE: Kenya -KG: Kyrgyzstan -KH: Cambodia -KI: Kiribati -KM: Comoros -KN: Saint Kitts and Nevis -KP: Korea (Democratic People's Republic of) -KR: Korea (Republic of) -KW: Kuwait -KY: Cayman Islands -KZ: Kazakhstan -LA: Lao People's Democratic Republic -LB: Lebanon -LC: Saint Lucia -LI: Liechtenstein -LK: Sri Lanka -LR: Liberia -LS: Lesotho -LT: Lithuania -LU: Luxembourg -LV: Latvia -LY: Libya -MA: Morocco -MC: Monaco -MD: Moldova (Republic of) -ME: Montenegro -MF: Saint Martin (French part) -MG: Madagascar -MH: Marshall Islands -MK: North Macedonia -ML: Mali -MM: Myanmar -MN: Mongolia -MO: Macao -MP: Northern Mariana Islands -MQ: Martinique -MR: Mauritania -MS: Montserrat -MT: Malta -MU: Mauritius -MV: Maldives -MW: Malawi -MX: Mexico -MY: Malaysia -MZ: Mozambique -NA: Namibia -NC: New Caledonia -NE: Niger -NF: Norfolk Island -NG: Nigeria -NI: Nicaragua -NL: Netherlands -'NO': Norway -NP: Nepal -NR: Nauru -NU: Niue -NZ: New Zealand -OM: Oman -PA: Panama -PE: Peru -PF: French Polynesia -PG: Papua New Guinea -PH: Philippines -PK: Pakistan -PL: Poland -PM: Saint Pierre and Miquelon -PN: Pitcairn -PR: Puerto Rico -PS: Palestine, State of -PT: Portugal -PW: Palau -PY: Paraguay -QA: Qatar -RE: "R\xE9union" -RO: Romania -RS: Serbia -RU: Russian Federation -RW: Rwanda -SA: Saudi Arabia -SB: Solomon Islands -SC: Seychelles -SD: Sudan -SE: Sweden -SG: Singapore -SH: Saint Helena, Ascension and Tristan da Cunha -SI: Slovenia -SJ: Svalbard and Jan Mayen -SK: Slovakia -SL: Sierra Leone -SM: San Marino -SN: Senegal -SO: Somalia -SR: Suriname -SS: South Sudan -ST: Sao Tome and Principe -SV: El Salvador -SX: Sint Maarten (Dutch part) -SY: Syrian Arab Republic -SZ: Swaziland -TC: Turks and Caicos Islands -TD: Chad -TF: French Southern Territories -TG: Togo -TH: Thailand -TJ: Tajikistan -TK: Tokelau -TL: Timor-Leste -TM: Turkmenistan -TN: Tunisia -TO: Tonga -TR: Turkey -TT: Trinidad and Tobago -TV: Tuvalu -TW: Taiwan -TZ: Tanzania, United Republic of -UA: Ukraine -UG: Uganda -UM: United States Minor Outlying Islands -US: United States of America -UY: Uruguay -UZ: Uzbekistan -VA: Vatican City -VC: Saint Vincent and the Grenadines -VE: Venezuela (Bolivarian Republic of) -VG: Virgin Islands (British) -VI: Virgin Islands (U.S.) -VN: Vietnam -VU: Vanuatu -WF: Wallis and Futuna -WS: Samoa -XK: Republic of Kosovo -YE: Yemen -YT: Mayotte -ZA: South Africa -ZM: Zambia -ZW: Zimbabwe diff --git a/pages/national_resources/de_resources.md b/pages/national_resources/de_resources.md index 4fad99df0..4735538d3 100644 --- a/pages/national_resources/de_resources.md +++ b/pages/national_resources/de_resources.md @@ -58,7 +58,6 @@ ref_to_main_resources: - e-dal-pgp - fairdom-seek - pangaea - - silva - dataplan --- diff --git a/var/country_list.py b/var/country_list.py deleted file mode 100644 index 1fb6698b1..000000000 --- a/var/country_list.py +++ /dev/null @@ -1,50 +0,0 @@ -import yaml -import requests -from requests.adapters import HTTPAdapter -from urllib3.util.retry import Retry - -def client(url): - """API object fetcher""" - session = requests.Session() - retry = Retry(connect=3, backoff_factor=15) - adapter = HTTPAdapter(max_retries=retry) - session.mount('http://', adapter) - session.mount('https://', adapter) - try: - r = session.get(url) - except: - print("Could not connect") - if r.status_code == requests.codes.ok: - return r.json() - -def fetch_country_list(): - json_output = client( - f"https://restcountries.com/v2/all") - if json_output: - return json_output - else: - print("Country lookup is skipped") - exit() - - -# --------- Variables --------- - -output_path = "_data/countries.yml" - -# --------- Reading out page_ids from pages --------- - -print(f"----> Fetching list of countries") -country_list = fetch_country_list() - -print(f"----> Fetching country name based on country ID") -countries = {} - -for country in country_list: - if country['name'] and country['alpha2Code']: - countries[country['alpha2Code']] = country['name'] - - -with open(output_path, 'w') as yaml_file: - documents = yaml.dump(countries, yaml_file) - -print("----> YAML is dumped successfully")