From 34c0dfe77cc77481862bb8800b5b7a2cfd00dbbb Mon Sep 17 00:00:00 2001 From: max-uho Date: Thu, 1 Aug 2024 09:17:08 +0200 Subject: [PATCH 1/7] Compatibility with current Numpy version --- obsidiantools/api.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/obsidiantools/api.py b/obsidiantools/api.py index 9d893e3..0be7db4 100644 --- a/obsidiantools/api.py +++ b/obsidiantools/api.py @@ -702,7 +702,7 @@ def __get_file_dicts_tuple(self, linked_files_list: list[str], *, if short_path in set_files_existent_not_linked} # nonexistent files: nonexistent_files_by_short_path = { - short_path: np.NaN + short_path: np.nan for short_path in shortest_names_nonexistent.keys() if short_path in set_files_nonexistent_linked} @@ -1161,28 +1161,28 @@ def get_note_metadata(self) -> pd.DataFrame: def _create_note_metadata_columns(self, df: pd.DataFrame) -> pd.DataFrame: """pipe func for mutating df""" - df['rel_filepath'] = [self._md_file_index.get(f, np.NaN) + df['rel_filepath'] = [self._md_file_index.get(f, np.nan) for f in df.index.tolist()] df['abs_filepath'] = np.where(df['rel_filepath'].notna(), [self._dirpath / str(f) for f in df['rel_filepath'].tolist()], - np.NaN) + np.nan) df['note_exists'] = np.where(df['rel_filepath'].notna(), True, False) df['n_backlinks'] = [len(self.get_backlinks(f)) for f in df.index] df['n_wikilinks'] = np.where(df['note_exists'], [len(self._wikilinks_index.get(f, [])) for f in df.index.tolist()], - np.NaN) + np.nan) df['n_tags'] = np.where(df['note_exists'], [len(self._tags_index.get(f, [])) for f in df.index.tolist()], - np.NaN) + np.nan) df['n_embedded_files'] = np.where(df['note_exists'], [len(self._embedded_files_index.get( f, [])) for f in df.index.tolist()], - np.NaN) + np.nan) df['modified_time'] = pd.to_datetime( [f.lstat().st_mtime if not pd.isna(f) else pd.NaT @@ -1197,7 +1197,7 @@ def _clean_up_note_metadata_dtypes(self, df['rel_filepath'] = np.where(df['rel_filepath'].notna(), [Path(str(f)) for f in df['rel_filepath']], - np.NaN) + np.nan) df['n_wikilinks'] = df['n_wikilinks'].astype(float) # for consistency return df @@ -1237,12 +1237,12 @@ def get_media_file_metadata(self) -> pd.DataFrame: def _create_media_file_metadata_columns(self, df: pd.DataFrame) -> pd.DataFrame: """pipe func for mutating df""" - df['rel_filepath'] = [self._media_file_index.get(f, np.NaN) + df['rel_filepath'] = [self._media_file_index.get(f, np.nan) for f in df.index.tolist()] df['abs_filepath'] = np.where(df['rel_filepath'].notna(), [self._dirpath / str(f) for f in df['rel_filepath'].tolist()], - np.NaN) + np.nan) df['file_exists'] = pd.Series( np.logical_not(df.index.isin(self._nonexistent_media_files)), index=df.index) @@ -1291,12 +1291,12 @@ def get_canvas_file_metadata(self) -> pd.DataFrame: def _create_canvas_file_metadata_columns(self, df: pd.DataFrame) -> pd.DataFrame: """pipe func for mutating df""" - df['rel_filepath'] = [self._canvas_file_index.get(f, np.NaN) + df['rel_filepath'] = [self._canvas_file_index.get(f, np.nan) for f in df.index.tolist()] df['abs_filepath'] = np.where(df['rel_filepath'].notna(), [self._dirpath / str(f) for f in df['rel_filepath'].tolist()], - np.NaN) + np.nan) df['file_exists'] = pd.Series( np.logical_not(df.index.isin(self._nonexistent_canvas_files)), index=df.index) @@ -1304,7 +1304,7 @@ def _create_canvas_file_metadata_columns(self, df['n_backlinks'] = ( self._get_backlink_counts_for_canvas_files_only()) else: - df['n_backlinks'] = np.NaN + df['n_backlinks'] = np.nan df['modified_time'] = pd.to_datetime( [f.lstat().st_mtime if not pd.isna(f) else pd.NaT From 758da60d857bf3389fa797f35e8be096fd5d7a92 Mon Sep 17 00:00:00 2001 From: mfarragher <33595938+mfarragher@users.noreply.github.com> Date: Wed, 25 Jun 2025 22:25:46 +0100 Subject: [PATCH 2/7] Update np.nan in test scripts --- ...api_vault_stub_connect_attachments_true.py | 102 +++++++++--------- ...test_api_vault_stub_connect_defaults_md.py | 96 ++++++++--------- 2 files changed, 99 insertions(+), 99 deletions(-) diff --git a/tests/test_api_vault_stub_connect_attachments_true.py b/tests/test_api_vault_stub_connect_attachments_true.py index 9d57b72..173fb70 100644 --- a/tests/test_api_vault_stub_connect_attachments_true.py +++ b/tests/test_api_vault_stub_connect_attachments_true.py @@ -28,18 +28,18 @@ def expected_note_metadata_dict(): 'Vulnera ubera': Path('lipsum/Vulnera ubera.md'), 'lipsum/Isolated note': Path('lipsum/Isolated note.md'), 'Causam mihi': Path('lipsum/Causam mihi.md'), - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, # abs_filepath would be here 'note_exists': {'Sussudio': True, 'Isolated note': True, @@ -89,18 +89,18 @@ def expected_note_metadata_dict(): 'Vulnera ubera': 3.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 4.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, 'n_tags': {'Sussudio': 5.0, 'Isolated note': 0.0, 'Brevissimus moenia': 0.0, @@ -109,18 +109,18 @@ def expected_note_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, 'n_embedded_files': {'Isolated note': 0.0, 'Sussudio': 2.0, 'Brevissimus moenia': 0.0, @@ -129,26 +129,26 @@ def expected_note_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN} + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan} } @pytest.fixture def expected_media_file_metadata_dict(): return { - 'rel_filepath': {'1999.flac': np.NaN, - 'Sussudio.mp3': np.NaN}, + 'rel_filepath': {'1999.flac': np.nan, + 'Sussudio.mp3': np.nan}, # abs_filepath would be here 'file_exists': {'1999.flac': False, 'Sussudio.mp3': False}, @@ -288,7 +288,7 @@ def test_get_media_file_dicts_tuple(actual_connected_vault): expected_tuple = ( {}, {}, - {'Sussudio.mp3': np.NaN, '1999.flac': np.NaN}) + {'Sussudio.mp3': np.nan, '1999.flac': np.nan}) assert actual_tuple == expected_tuple diff --git a/tests/test_api_vault_stub_connect_defaults_md.py b/tests/test_api_vault_stub_connect_defaults_md.py index 031910e..22b41d8 100644 --- a/tests/test_api_vault_stub_connect_defaults_md.py +++ b/tests/test_api_vault_stub_connect_defaults_md.py @@ -24,18 +24,18 @@ def expected_metadata_dict(): 'Vulnera ubera': Path('lipsum/Vulnera ubera.md'), 'lipsum/Isolated note': Path('lipsum/Isolated note.md'), 'Causam mihi': Path('lipsum/Causam mihi.md'), - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, # abs_filepath would be here 'note_exists': {'Sussudio': True, 'Isolated note': True, @@ -85,18 +85,18 @@ def expected_metadata_dict(): 'Vulnera ubera': 3.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 4.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, 'n_tags': {'Sussudio': 5.0, 'Isolated note': 0.0, 'Brevissimus moenia': 0.0, @@ -105,18 +105,18 @@ def expected_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, 'n_embedded_files': {'Isolated note': 0.0, 'Sussudio': 2.0, 'Brevissimus moenia': 0.0, @@ -125,18 +125,18 @@ def expected_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN} + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan} } From ae3cd90d1acaa395a739e4b5fa7e1ce9e70fba2e Mon Sep 17 00:00:00 2001 From: mfarragher <33595938+mfarragher@users.noreply.github.com> Date: Wed, 25 Jun 2025 22:35:53 +0100 Subject: [PATCH 3/7] More recent Python versions for CI/CD --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fede2c7..add04ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - python-version: ['3.11', '3.10', '3.9'] + python-version: ['3.13', '3.12', 3.11', '3.10', '3.9'] env: OS: ${{ matrix.os }} steps: From cecdc9390e39933d0531ae1eba5ae6424dcdc4d3 Mon Sep 17 00:00:00 2001 From: mfarragher <33595938+mfarragher@users.noreply.github.com> Date: Wed, 25 Jun 2025 22:36:58 +0100 Subject: [PATCH 4/7] typo --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index add04ed..1c7bf76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - python-version: ['3.13', '3.12', 3.11', '3.10', '3.9'] + python-version: ['3.13', '3.12', '3.11', '3.10', '3.9'] env: OS: ${{ matrix.os }} steps: From cd9a902a8408fa133bdc2a66633df2c146b94d06 Mon Sep 17 00:00:00 2001 From: mfarragher <33595938+mfarragher@users.noreply.github.com> Date: Wed, 25 Jun 2025 22:38:36 +0100 Subject: [PATCH 5/7] 3.12 for now --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c7bf76..dc7f701 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - python-version: ['3.13', '3.12', '3.11', '3.10', '3.9'] + python-version: ['3.12', '3.11', '3.10', '3.9'] env: OS: ${{ matrix.os }} steps: From 700974ff610f8b2297cb9b2a04bacc811ae103e3 Mon Sep 17 00:00:00 2001 From: mfarragher <33595938+mfarragher@users.noreply.github.com> Date: Wed, 25 Jun 2025 22:49:16 +0100 Subject: [PATCH 6/7] Revert (not figured out config for 3.12+) --- ...api_vault_stub_connect_attachments_true.py | 102 +++++++++--------- ...test_api_vault_stub_connect_defaults_md.py | 96 ++++++++--------- 2 files changed, 99 insertions(+), 99 deletions(-) diff --git a/tests/test_api_vault_stub_connect_attachments_true.py b/tests/test_api_vault_stub_connect_attachments_true.py index 173fb70..9d57b72 100644 --- a/tests/test_api_vault_stub_connect_attachments_true.py +++ b/tests/test_api_vault_stub_connect_attachments_true.py @@ -28,18 +28,18 @@ def expected_note_metadata_dict(): 'Vulnera ubera': Path('lipsum/Vulnera ubera.md'), 'lipsum/Isolated note': Path('lipsum/Isolated note.md'), 'Causam mihi': Path('lipsum/Causam mihi.md'), - 'American Psycho (film)': np.nan, - 'Tarpeia': np.nan, - 'Caelum': np.nan, - 'Vita': np.nan, - 'Aras Teucras': np.nan, - 'Manus': np.nan, - 'Bacchus': np.nan, - 'Amor': np.nan, - 'Virtus': np.nan, - 'Tydides': np.nan, - 'Dives': np.nan, - 'Aetna': np.nan}, + 'American Psycho (film)': np.NaN, + 'Tarpeia': np.NaN, + 'Caelum': np.NaN, + 'Vita': np.NaN, + 'Aras Teucras': np.NaN, + 'Manus': np.NaN, + 'Bacchus': np.NaN, + 'Amor': np.NaN, + 'Virtus': np.NaN, + 'Tydides': np.NaN, + 'Dives': np.NaN, + 'Aetna': np.NaN}, # abs_filepath would be here 'note_exists': {'Sussudio': True, 'Isolated note': True, @@ -89,18 +89,18 @@ def expected_note_metadata_dict(): 'Vulnera ubera': 3.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 4.0, - 'American Psycho (film)': np.nan, - 'Tarpeia': np.nan, - 'Caelum': np.nan, - 'Vita': np.nan, - 'Aras Teucras': np.nan, - 'Manus': np.nan, - 'Bacchus': np.nan, - 'Amor': np.nan, - 'Virtus': np.nan, - 'Tydides': np.nan, - 'Dives': np.nan, - 'Aetna': np.nan}, + 'American Psycho (film)': np.NaN, + 'Tarpeia': np.NaN, + 'Caelum': np.NaN, + 'Vita': np.NaN, + 'Aras Teucras': np.NaN, + 'Manus': np.NaN, + 'Bacchus': np.NaN, + 'Amor': np.NaN, + 'Virtus': np.NaN, + 'Tydides': np.NaN, + 'Dives': np.NaN, + 'Aetna': np.NaN}, 'n_tags': {'Sussudio': 5.0, 'Isolated note': 0.0, 'Brevissimus moenia': 0.0, @@ -109,18 +109,18 @@ def expected_note_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.nan, - 'Tarpeia': np.nan, - 'Caelum': np.nan, - 'Vita': np.nan, - 'Aras Teucras': np.nan, - 'Manus': np.nan, - 'Bacchus': np.nan, - 'Amor': np.nan, - 'Virtus': np.nan, - 'Tydides': np.nan, - 'Dives': np.nan, - 'Aetna': np.nan}, + 'American Psycho (film)': np.NaN, + 'Tarpeia': np.NaN, + 'Caelum': np.NaN, + 'Vita': np.NaN, + 'Aras Teucras': np.NaN, + 'Manus': np.NaN, + 'Bacchus': np.NaN, + 'Amor': np.NaN, + 'Virtus': np.NaN, + 'Tydides': np.NaN, + 'Dives': np.NaN, + 'Aetna': np.NaN}, 'n_embedded_files': {'Isolated note': 0.0, 'Sussudio': 2.0, 'Brevissimus moenia': 0.0, @@ -129,26 +129,26 @@ def expected_note_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.nan, - 'Tarpeia': np.nan, - 'Caelum': np.nan, - 'Vita': np.nan, - 'Aras Teucras': np.nan, - 'Manus': np.nan, - 'Bacchus': np.nan, - 'Amor': np.nan, - 'Virtus': np.nan, - 'Tydides': np.nan, - 'Dives': np.nan, - 'Aetna': np.nan} + 'American Psycho (film)': np.NaN, + 'Tarpeia': np.NaN, + 'Caelum': np.NaN, + 'Vita': np.NaN, + 'Aras Teucras': np.NaN, + 'Manus': np.NaN, + 'Bacchus': np.NaN, + 'Amor': np.NaN, + 'Virtus': np.NaN, + 'Tydides': np.NaN, + 'Dives': np.NaN, + 'Aetna': np.NaN} } @pytest.fixture def expected_media_file_metadata_dict(): return { - 'rel_filepath': {'1999.flac': np.nan, - 'Sussudio.mp3': np.nan}, + 'rel_filepath': {'1999.flac': np.NaN, + 'Sussudio.mp3': np.NaN}, # abs_filepath would be here 'file_exists': {'1999.flac': False, 'Sussudio.mp3': False}, @@ -288,7 +288,7 @@ def test_get_media_file_dicts_tuple(actual_connected_vault): expected_tuple = ( {}, {}, - {'Sussudio.mp3': np.nan, '1999.flac': np.nan}) + {'Sussudio.mp3': np.NaN, '1999.flac': np.NaN}) assert actual_tuple == expected_tuple diff --git a/tests/test_api_vault_stub_connect_defaults_md.py b/tests/test_api_vault_stub_connect_defaults_md.py index 22b41d8..031910e 100644 --- a/tests/test_api_vault_stub_connect_defaults_md.py +++ b/tests/test_api_vault_stub_connect_defaults_md.py @@ -24,18 +24,18 @@ def expected_metadata_dict(): 'Vulnera ubera': Path('lipsum/Vulnera ubera.md'), 'lipsum/Isolated note': Path('lipsum/Isolated note.md'), 'Causam mihi': Path('lipsum/Causam mihi.md'), - 'American Psycho (film)': np.nan, - 'Tarpeia': np.nan, - 'Caelum': np.nan, - 'Vita': np.nan, - 'Aras Teucras': np.nan, - 'Manus': np.nan, - 'Bacchus': np.nan, - 'Amor': np.nan, - 'Virtus': np.nan, - 'Tydides': np.nan, - 'Dives': np.nan, - 'Aetna': np.nan}, + 'American Psycho (film)': np.NaN, + 'Tarpeia': np.NaN, + 'Caelum': np.NaN, + 'Vita': np.NaN, + 'Aras Teucras': np.NaN, + 'Manus': np.NaN, + 'Bacchus': np.NaN, + 'Amor': np.NaN, + 'Virtus': np.NaN, + 'Tydides': np.NaN, + 'Dives': np.NaN, + 'Aetna': np.NaN}, # abs_filepath would be here 'note_exists': {'Sussudio': True, 'Isolated note': True, @@ -85,18 +85,18 @@ def expected_metadata_dict(): 'Vulnera ubera': 3.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 4.0, - 'American Psycho (film)': np.nan, - 'Tarpeia': np.nan, - 'Caelum': np.nan, - 'Vita': np.nan, - 'Aras Teucras': np.nan, - 'Manus': np.nan, - 'Bacchus': np.nan, - 'Amor': np.nan, - 'Virtus': np.nan, - 'Tydides': np.nan, - 'Dives': np.nan, - 'Aetna': np.nan}, + 'American Psycho (film)': np.NaN, + 'Tarpeia': np.NaN, + 'Caelum': np.NaN, + 'Vita': np.NaN, + 'Aras Teucras': np.NaN, + 'Manus': np.NaN, + 'Bacchus': np.NaN, + 'Amor': np.NaN, + 'Virtus': np.NaN, + 'Tydides': np.NaN, + 'Dives': np.NaN, + 'Aetna': np.NaN}, 'n_tags': {'Sussudio': 5.0, 'Isolated note': 0.0, 'Brevissimus moenia': 0.0, @@ -105,18 +105,18 @@ def expected_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.nan, - 'Tarpeia': np.nan, - 'Caelum': np.nan, - 'Vita': np.nan, - 'Aras Teucras': np.nan, - 'Manus': np.nan, - 'Bacchus': np.nan, - 'Amor': np.nan, - 'Virtus': np.nan, - 'Tydides': np.nan, - 'Dives': np.nan, - 'Aetna': np.nan}, + 'American Psycho (film)': np.NaN, + 'Tarpeia': np.NaN, + 'Caelum': np.NaN, + 'Vita': np.NaN, + 'Aras Teucras': np.NaN, + 'Manus': np.NaN, + 'Bacchus': np.NaN, + 'Amor': np.NaN, + 'Virtus': np.NaN, + 'Tydides': np.NaN, + 'Dives': np.NaN, + 'Aetna': np.NaN}, 'n_embedded_files': {'Isolated note': 0.0, 'Sussudio': 2.0, 'Brevissimus moenia': 0.0, @@ -125,18 +125,18 @@ def expected_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.nan, - 'Tarpeia': np.nan, - 'Caelum': np.nan, - 'Vita': np.nan, - 'Aras Teucras': np.nan, - 'Manus': np.nan, - 'Bacchus': np.nan, - 'Amor': np.nan, - 'Virtus': np.nan, - 'Tydides': np.nan, - 'Dives': np.nan, - 'Aetna': np.nan} + 'American Psycho (film)': np.NaN, + 'Tarpeia': np.NaN, + 'Caelum': np.NaN, + 'Vita': np.NaN, + 'Aras Teucras': np.NaN, + 'Manus': np.NaN, + 'Bacchus': np.NaN, + 'Amor': np.NaN, + 'Virtus': np.NaN, + 'Tydides': np.NaN, + 'Dives': np.NaN, + 'Aetna': np.NaN} } From ecfe77f843959586bc5b491c741f39ebdb9f4297 Mon Sep 17 00:00:00 2001 From: mfarragher <33595938+mfarragher@users.noreply.github.com> Date: Wed, 25 Jun 2025 22:53:11 +0100 Subject: [PATCH 7/7] Revert properly (been a long night) --- .github/workflows/ci.yml | 2 +- ...api_vault_stub_connect_attachments_true.py | 102 +++++++++--------- ...test_api_vault_stub_connect_defaults_md.py | 96 ++++++++--------- 3 files changed, 100 insertions(+), 100 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc7f701..fede2c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - python-version: ['3.12', '3.11', '3.10', '3.9'] + python-version: ['3.11', '3.10', '3.9'] env: OS: ${{ matrix.os }} steps: diff --git a/tests/test_api_vault_stub_connect_attachments_true.py b/tests/test_api_vault_stub_connect_attachments_true.py index 9d57b72..173fb70 100644 --- a/tests/test_api_vault_stub_connect_attachments_true.py +++ b/tests/test_api_vault_stub_connect_attachments_true.py @@ -28,18 +28,18 @@ def expected_note_metadata_dict(): 'Vulnera ubera': Path('lipsum/Vulnera ubera.md'), 'lipsum/Isolated note': Path('lipsum/Isolated note.md'), 'Causam mihi': Path('lipsum/Causam mihi.md'), - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, # abs_filepath would be here 'note_exists': {'Sussudio': True, 'Isolated note': True, @@ -89,18 +89,18 @@ def expected_note_metadata_dict(): 'Vulnera ubera': 3.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 4.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, 'n_tags': {'Sussudio': 5.0, 'Isolated note': 0.0, 'Brevissimus moenia': 0.0, @@ -109,18 +109,18 @@ def expected_note_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, 'n_embedded_files': {'Isolated note': 0.0, 'Sussudio': 2.0, 'Brevissimus moenia': 0.0, @@ -129,26 +129,26 @@ def expected_note_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN} + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan} } @pytest.fixture def expected_media_file_metadata_dict(): return { - 'rel_filepath': {'1999.flac': np.NaN, - 'Sussudio.mp3': np.NaN}, + 'rel_filepath': {'1999.flac': np.nan, + 'Sussudio.mp3': np.nan}, # abs_filepath would be here 'file_exists': {'1999.flac': False, 'Sussudio.mp3': False}, @@ -288,7 +288,7 @@ def test_get_media_file_dicts_tuple(actual_connected_vault): expected_tuple = ( {}, {}, - {'Sussudio.mp3': np.NaN, '1999.flac': np.NaN}) + {'Sussudio.mp3': np.nan, '1999.flac': np.nan}) assert actual_tuple == expected_tuple diff --git a/tests/test_api_vault_stub_connect_defaults_md.py b/tests/test_api_vault_stub_connect_defaults_md.py index 031910e..22b41d8 100644 --- a/tests/test_api_vault_stub_connect_defaults_md.py +++ b/tests/test_api_vault_stub_connect_defaults_md.py @@ -24,18 +24,18 @@ def expected_metadata_dict(): 'Vulnera ubera': Path('lipsum/Vulnera ubera.md'), 'lipsum/Isolated note': Path('lipsum/Isolated note.md'), 'Causam mihi': Path('lipsum/Causam mihi.md'), - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, # abs_filepath would be here 'note_exists': {'Sussudio': True, 'Isolated note': True, @@ -85,18 +85,18 @@ def expected_metadata_dict(): 'Vulnera ubera': 3.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 4.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, 'n_tags': {'Sussudio': 5.0, 'Isolated note': 0.0, 'Brevissimus moenia': 0.0, @@ -105,18 +105,18 @@ def expected_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN}, + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan}, 'n_embedded_files': {'Isolated note': 0.0, 'Sussudio': 2.0, 'Brevissimus moenia': 0.0, @@ -125,18 +125,18 @@ def expected_metadata_dict(): 'Vulnera ubera': 0.0, 'lipsum/Isolated note': 0.0, 'Causam mihi': 0.0, - 'American Psycho (film)': np.NaN, - 'Tarpeia': np.NaN, - 'Caelum': np.NaN, - 'Vita': np.NaN, - 'Aras Teucras': np.NaN, - 'Manus': np.NaN, - 'Bacchus': np.NaN, - 'Amor': np.NaN, - 'Virtus': np.NaN, - 'Tydides': np.NaN, - 'Dives': np.NaN, - 'Aetna': np.NaN} + 'American Psycho (film)': np.nan, + 'Tarpeia': np.nan, + 'Caelum': np.nan, + 'Vita': np.nan, + 'Aras Teucras': np.nan, + 'Manus': np.nan, + 'Bacchus': np.nan, + 'Amor': np.nan, + 'Virtus': np.nan, + 'Tydides': np.nan, + 'Dives': np.nan, + 'Aetna': np.nan} }