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

Pushing the fix for the R-CMD-check.yaml to the master branch #69

Merged
merged 27 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
99a0f11
Update action_BODC_table_generator.yml
cyrilrader Nov 5, 2024
4c30825
Update BODC_tables_generator.py
cyrilrader Nov 5, 2024
665a87e
Update action_BODC_table_generator.yml
cyrilrader Nov 5, 2024
62aaab8
Update action_BODC_table_generator.yml
cyrilrader Nov 5, 2024
2c12146
Automated commit by GitHub Action
github-actions[bot] Nov 5, 2024
fd26bf8
Update action_BODC_table_generator.yml
cyrilrader Nov 5, 2024
ebc3e72
Delete files/nvsSPARQL-main directory
cyrilrader Nov 6, 2024
4f6eead
Create nsv-listing.sparql
cyrilrader Nov 6, 2024
3055bd8
Rename files/nsv-listing.sparql to files/templated-queries/nsv-listin…
cyrilrader Nov 6, 2024
ac3cbe0
Update BODC_tables_generator.py
cyrilrader Nov 6, 2024
f698c92
Update action_BODC_table_generator.yml
cyrilrader Nov 6, 2024
f3fd708
Automated commit by GitHub Action
github-actions[bot] Nov 6, 2024
3534a83
Update action_BODC_table_generator.yml
cyrilrader Nov 6, 2024
969f8c1
Merge pull request #67 from EMODnet/master
rubenpp7 Nov 6, 2024
caf31f4
Merge branch 'EMODnet:master' into master
cyrilrader Nov 6, 2024
ffb49f6
Update BODC_tables_generator.py
cyrilrader Nov 6, 2024
2686395
Update action_BODC_table_generator.yml
cyrilrader Nov 6, 2024
ac4cb63
Delete files/BODCparameters_20241106.csv
cyrilrader Nov 6, 2024
5ba539f
Delete files/BODCunits_20241106.csv
cyrilrader Nov 6, 2024
10456c8
Delete files/BODCvalues_20241106.csv
cyrilrader Nov 6, 2024
f81dade
Update R-CMD-check.yaml
cyrilrader Nov 6, 2024
e3ed66b
Automated commit by GitHub Action
github-actions[bot] Nov 6, 2024
3784111
Update action_BODC_table_generator.yml
cyrilrader Nov 6, 2024
4449519
Update R-CMD-check.yaml
cyrilrader Nov 6, 2024
1dcd091
Merge pull request #68 from cyrilrader/master
rubenpp7 Nov 6, 2024
cbc9575
Update R-CMD-check.yaml
cyrilrader Nov 6, 2024
3640997
Update R-CMD-check.yaml
cyrilrader Nov 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/action_BODC_table_generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
# Step 3: Install required dependencies
- name: Install dependencies
run: |
pip install pandas pysema requests numpy
pip install pandas pysema requests numpy unidecode

# Step 4: Run the Python script that generates the table
- name: Run table generator script
Expand Down
Binary file modified data/BODCparameters.rda
Binary file not shown.
Binary file modified data/BODCunits.rda
Binary file not shown.
Binary file modified data/BODCvalues.rda
Binary file not shown.
8 changes: 8 additions & 0 deletions files/BODC_tables_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import numpy as np
import ast
import datetime
from unidecode import unidecode

# Get the parent directory of the current script
current_dir = pathlib.Path(__file__).parent.resolve()
Expand All @@ -27,6 +28,10 @@ def execute_to_df(name: str, **vars) -> pd.DataFrame:
result: kg.QueryResult = NSV.query(sparql=sparql)
return result.to_dataframe()

def convert_to_ascii(df):
# Apply the function to each element in the DataFrame
return df.map(lambda x: unidecode(str(x)))

valuesCollectionList = ['L22', 'L05', 'F02', 'C17', 'S13', 'S11', 'S10', 'S09', 'M20', 'M21', 'M24', 'L06']
parametersCollectionList = ['Q01', 'P01', 'P02', 'P35']

Expand All @@ -42,6 +47,7 @@ def execute_to_df(name: str, **vars) -> pd.DataFrame:
BODCunits = execute_to_df("nsv-listing.sparql", cc="P06")
BODCunits = BODCunits[['id', 'pref_lang', 'alt', 'depr', 'member']]
BODCunits.columns = ['identifier', 'preflabel', 'altLabel', 'deprecated', 'uri']
BODCunits=convert_to_ascii(BODCunits)
BODCunits.to_csv(bodc_units_file, index=False)

# Clean up old files, keep latest 3
Expand Down Expand Up @@ -88,6 +94,7 @@ def execute_to_df(name: str, **vars) -> pd.DataFrame:
BODCvalues=pd.concat([BODCvalues,pd.DataFrame.from_dict([newRow])])
BODCvalues=BODCvalues.reset_index()
BODCvalues=BODCvalues.drop(columns='index')
BODCvalues=convert_to_ascii(BODCvalues)
BODCvalues.to_csv(bodc_values_file,index=False)
# Clean up old files, keep latest 3
filesList = sorted([f for f in checkpoint_path.iterdir() if 'BODCvalues' in f.name], reverse=True)
Expand Down Expand Up @@ -135,6 +142,7 @@ def execute_to_df(name: str, **vars) -> pd.DataFrame:
BODCparameters.loc[rowNumber,'uri']="http://dd.eionet.europa.eu/vocabulary/biodiversity/eunishabitats/"

# Final save
BODCparameters=convert_to_ascii(BODCparameters)
BODCparameters.to_csv(bodc_parameters_file, index=False)
# Clean up old files, keep latest 3
filesList = sorted([f for f in checkpoint_path.iterdir() if 'BODCparameters' in f.name], reverse=True)
Expand Down
1,437 changes: 757 additions & 680 deletions files/BODCparameters_20240920.csv → files/BODCparameters_20241105.csv

Large diffs are not rendered by default.

2,485 changes: 1,283 additions & 1,202 deletions files/BODCparameters_20240918.csv → files/BODCparameters_20241106.csv

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
493 changes: 326 additions & 167 deletions files/BODCvalues_20240920.csv → files/BODCvalues_20241105.csv

Large diffs are not rendered by default.

1,753 changes: 957 additions & 796 deletions files/BODCvalues_20240918.csv → files/BODCvalues_20241106.csv

Large diffs are not rendered by default.

Loading