Pre-release v0.7.6 (#85)

* Replace pkg_resources deprecated package with importlib.pkg_resources
* Update ALL tab button label (PR #84 by @mathdugre)

ppmi_downloader/ppmi_downloader.py

@@ -1,4 +1,5 @@
 import getpass
+import importlib.resources
 import json
 import os
 import os.path as op
@@ -12,7 +13,6 @@
 from typing import List, Optional
 
 import pandas as pd
-import pkg_resources
 import tqdm
 from bs4 import BeautifulSoup
 from packaging import version
@@ -256,13 +256,15 @@ def _get_real_name(self) -> None:
         Initialize the attribute mapping guessed names from
         crawling PPMI to actual downloaded files.
         """
-        cache_file = pkg_resources.resource_filename(
-            "ppmi_downloader", "guessed_to_real.json"
+
+        cache_file = (
+            importlib.resources.files("ppmi_downloader") / "guessed_to_real.json"
         )
 
-        with open(cache_file, "r", encoding="utf-8") as fi:
-            self.guessed_to_real = json.load(fi)
-            self.real_to_guessed = {v: k for k, v in self.guessed_to_real.items()}
+        with importlib.resources.as_file(cache_file) as cache_file:
+            with open(cache_file, "r", encoding="utf-8") as fi:
+                self.guessed_to_real = json.load(fi)
+                self.real_to_guessed = {v: k for k, v in self.guessed_to_real.items()}
 
     def init_and_log(self) -> None:
         """
@@ -371,7 +373,6 @@ def download_imaging_data(
             (str(row["PATNO"]), str(row["EVENT_ID"]), str(row["Description"]))
             for _, row in cohort.iterrows()
         }
-        print(cohort_metadata)
         prev_rows = None
         attempts = 0
         while attempts < 3:

ppmi_downloader/ppmi_navigator.py

@@ -669,6 +669,7 @@ def Download_StudyData_ALL(self) -> None:
             # Need to click on ALL tab first to be able to see all checkboxes
             # See screenshots_errors/Screenshot_error_ALL_06-12-2023.jpg
 
+
             self.click_button(
                 '//*[@id="categoryMenuTree"]//*[@class="ida-studyData-category"][text()="ALL"]',
                 debug_name="ALL tab",

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ppmi_downloader"
-version = "0.7.5"
+version = "0.7.6"
 description = "A downloader of PPMI files."
 authors = [{ name = "Tristan Glatard", email = "[email protected]" }]
 readme = "README.md"