diff --git a/.github/workflows/change_log.yml b/.github/workflows/change_log.yml new file mode 100644 index 00000000..1700c9f2 --- /dev/null +++ b/.github/workflows/change_log.yml @@ -0,0 +1,43 @@ +name: Changelog Entry +on: [pull_request] + +permissions: + contents: read + +jobs: + check_file: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Check Chanelog Exists + run: | + if [[ $(ls ./changes/${{ github.event.number }}.*) ]]; then + echo -e "\n" + echo -e "\033[0;36mINFO: changelog for PR ${{ github.event.number }} exists.\033[0;0m" + echo -e "\n" + exit 0 + else + echo -e "\n" + echo -e "\033[0;31mERROR: changelog for PR ${{ github.event.number }} does not exist.\033[0;0m" + echo -e "\n" + exit 1 + fi + + - name: Check Changelog Extension + run: | + fullfile=$(ls ./changes/${{ github.event.number }}.*) + filename=$(basename -- "$fullfile") + extension="${filename##*.}" + allowed_types='[ "fix", "bugfix", "hotfix", "feature", "misc", "changes", "migration", "removal" ]' + if [[ $allowed_types =~ "\"$extension\"" ]]; then + echo -e "\n" + echo -e "\033[0;36mINFO: extension ${extension} accepted.\033[0;0m" + echo -e "\n" + exit 0 + else + echo -e "\n" + echo -e "\033[0;31mERROR: changelog file ending in ${extension} not supported.\033[0;0m" + echo -e "\n" + exit 1 + fi diff --git a/changes/27.backport.feature b/changes/27.backport.feature new file mode 100644 index 00000000..e77b2ac2 --- /dev/null +++ b/changes/27.backport.feature @@ -0,0 +1 @@ +Ignore empty rows when loading into the DataStore. diff --git a/ckanext/xloader/loader.py b/ckanext/xloader/loader.py index b7a38472..9c7a91b8 100644 --- a/ckanext/xloader/loader.py +++ b/ckanext/xloader/loader.py @@ -194,6 +194,7 @@ def load_csv(csv_filepath, resource_id, mimetype='text/csv', dialect=None, encod # Get the list of rows to skip. The rows in the tabulator stream are # numbered starting with 1. skip_rows = list(range(1, header_offset + 1)) + skip_rows.append({'type': 'preset', 'value': 'blank'}) # Get the delimiter used in the file delimiter = stream.dialect.get('delimiter') @@ -426,8 +427,10 @@ def load_table(table_filepath, resource_id, mimetype='text/csv', dialect=None, e try: file_format = os.path.splitext(table_filepath)[1].strip('.') with UnknownEncodingStream(table_filepath, file_format, decoding_result, - post_parse=[TypeConverter().convert_types], dialect=dialect, + dialect=dialect, force_encoding=bool(encoding), + skip_rows=[{'type': 'preset', 'value': 'blank'}], + post_parse=[TypeConverter().convert_types], logger=(logger if not has_logged_dialect else None)) as stream: header_offset, headers = headers_guess(stream.sample) has_logged_dialect = True @@ -435,8 +438,10 @@ def load_table(table_filepath, resource_id, mimetype='text/csv', dialect=None, e try: file_format = mimetype.lower().split('/')[-1] with UnknownEncodingStream(table_filepath, file_format, decoding_result, - post_parse=[TypeConverter().convert_types], dialect=dialect, + dialect=dialect, force_encoding=bool(encoding), + skip_rows=[{'type': 'preset', 'value': 'blank'}], + post_parse=[TypeConverter().convert_types], logger=(logger if not has_logged_dialect else None)) as stream: header_offset, headers = headers_guess(stream.sample) has_logged_dialect = True @@ -459,6 +464,7 @@ def load_table(table_filepath, resource_id, mimetype='text/csv', dialect=None, e # Get the list of rows to skip. The rows in the tabulator stream are # numbered starting with 1. We also want to skip the header row. skip_rows = list(range(1, header_offset + 2)) + skip_rows.append({'type': 'preset', 'value': 'blank'}) TYPES, TYPE_MAPPING = get_types() # (canada fork only): add config option for strict guessing diff --git a/ckanext/xloader/tests/samples/sample_with_empty_lines.csv b/ckanext/xloader/tests/samples/sample_with_empty_lines.csv new file mode 100644 index 00000000..abc8a0dc --- /dev/null +++ b/ckanext/xloader/tests/samples/sample_with_empty_lines.csv @@ -0,0 +1,10 @@ +date,temperature,place +2011-01-01,1,Galway +2011-01-02,-1,Galway +2011-01-03,0,Galway +2011-01-01,6,Berkeley + +,,Berkeley +2011-01-03,5, + + diff --git a/ckanext/xloader/tests/test_loader.py b/ckanext/xloader/tests/test_loader.py index e024b315..2bc686cb 100644 --- a/ckanext/xloader/tests/test_loader.py +++ b/ckanext/xloader/tests/test_loader.py @@ -632,6 +632,18 @@ def test_with_blanks(self, Session): ) assert len(self._get_records(Session, resource_id)) == 3 + def test_with_empty_lines(self, Session): + csv_filepath = get_sample_filepath("sample_with_empty_lines.csv") + resource = factories.Resource() + resource_id = resource['id'] + loader.load_csv( + csv_filepath, + resource_id=resource_id, + mimetype="text/csv", + logger=logger, + ) + assert len(self._get_records(Session, resource_id)) == 6 + def test_with_quoted_commas(self, Session): csv_filepath = get_sample_filepath("sample_with_quoted_commas.csv") resource = factories.Resource()