dao-scripts 1.3.0.post1__tar.gz → 1.4.0__tar.gz

{dao_scripts-1.3.0.post1 → dao_scripts-1.4.0}/.github/workflows/ci.yml

@@ -52,6 +52,10 @@ jobs:
       # IMPORTANT: this permission is mandatory for trusted publishing
       id-token: write
     steps:
+    - name: Skip Duplicate Actions
+      uses: fkirc/skip-duplicate-actions@v5
+      with:
+        concurrent_skipping: same_content_newer
     - name: Download built package
       uses: actions/download-artifact@v4
       with:

{dao_scripts-1.3.0.post1 → dao_scripts-1.4.0}/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.3.0 - 2024-04-24
+## 1.4.0 - 2024-06-03
+- Fixed bug when process was killed
+- Updated endpoint network names
+
+## 1.3.1 - 2024-05-27
+- Fixed bug with `--delete-force`
+
+## 1.3.0 - 2024-05-24
 - Improved and standarized logging #10
 - The Graph Hosted Service sunsetting
   - Added DAOA_THE_GRAPH_API_KEY variable (now needed)

{dao_scripts-1.3.0.post1 → dao_scripts-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.3.0.post1
+Version: 1.4.0
 Summary: "A tool to download data to monitor DAO activity"
 Home-page: https://github.com/Grasia/dao-scripts
 Author: David Davó

{dao_scripts-1.3.0.post1 → dao_scripts-1.4.0}/dao_scripts.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.3.0.post1
+Version: 1.4.0
 Summary: "A tool to download data to monitor DAO activity"
 Home-page: https://github.com/Grasia/dao-scripts
 Author: David Davó

{dao_scripts-1.3.0.post1 → dao_scripts-1.4.0}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.0.post1'
-__version_tuple__ = version_tuple = (1, 3, 0)
+__version__ = version = '1.4.0'
+__version_tuple__ = version_tuple = (1, 4, 0)

{dao_scripts-1.3.0.post1 → dao_scripts-1.4.0}/src/endpoints.json

@@ -15,11 +15,11 @@
         "daostack": "Bnqq6ARphxg2rnAvjBrQGxCPNtDGiygv235GbRzZqwfb",
         "daohaus": "2GJY9uxsLQUCvgqSfy6QCLAJgM9P9kdxBUpwNcGs7nPR"
     },
-    "polygon": {
+    "matic": {
         "_blocks": "4mJTujCUWKLd4SPBYE1YXbamfNSNRMyphk8tHzczYWf9",
         "daohaus": "AkzZk4BsvfNRkRDtzz7Bc8TgktTJN4uv9tgfCehhE6fB"
     },
-    "arbitrum": {
+    "arbitrum-one": {
         "_blocks": "AyY1GDtmAyavGWsdoHQ4vNoBCVWSqfDwHa6jPu5KdHgP",
         "daohaus": "2c41cggebRCMzFiDqoqDwShZtz4xYucsFKbQnEiXUTzY"
     },

{dao_scripts-1.3.0.post1 → dao_scripts-1.4.0}/src/main.py

@@ -44,7 +44,7 @@ def _is_good_version(datawarehouse: Path) -> bool:
         return vf.readline().strip() == __version__
 
 def run_all(
-    datawarehouse: Path, delete_force: bool, 
+    datawarehouse: Path,
     platforms: list[str], networks: list[str], collectors: list[str], 
     block_datetime: datetime, force: bool
 ):
@@ -83,12 +83,17 @@ def lock_and_run(args: Namespace):
         with pl.Lock(cs_lock, 'w', timeout=1) as lock, \
              tempfile.TemporaryDirectory(prefix="datawarehouse_") as tmp_dw_str:
 
+            running_link = datawarehouse / '.running'
+            if running_link.exists():
+                print("Program was killed, removing aux files")
+                running_link.unlink()
+
             # Writing pid and dir name to lock (debugging)
             tmp_dw = Path(tmp_dw_str)
             print(os.getpid(), file=lock)
             print(tmp_dw, file=lock)
             lock.flush()
-            (datawarehouse / '.running').symlink_to(tmp_dw)
+            running_link.symlink_to(tmp_dw)
 
             # Used to tell the loggers to use errors.log or the main logs
             copied_dw = False
@@ -101,12 +106,12 @@ def lock_and_run(args: Namespace):
                 with pl.Lock(p_lock, 'r', timeout=1, flags=pl.LOCK_SH | pl.LOCK_NB):
                     shutil.copytree(datawarehouse, tmp_dw, dirs_exist_ok=True, ignore=ignore)
 
-                if args.delete_force or not _is_good_version(datawarehouse):
+                if args.delete_force or not _is_good_version(tmp_dw):
                     if not args.delete_force:
                         print(f"datawarehouse version is not version {__version__}, upgrading")
 
-                    # We skip the dotfiles like .lock
-                    for p in datawarehouse.glob('[!.]*'):
+                    # We skip the dotfiles like .lock or .cache
+                    for p in tmp_dw.glob('[!.]*'):
                         if p.is_dir():
                             shutil.rmtree(p)
                         else:
@@ -119,7 +124,6 @@ def lock_and_run(args: Namespace):
                 # Execute the scripts in the aux datawarehouse
                 run_all(
                     datawarehouse=tmp_dw,
-                    delete_force=args.delete_force,
                     platforms=args.platforms,
                     networks=args.networks,
                     collectors=args.collectors,
@@ -136,7 +140,7 @@ def lock_and_run(args: Namespace):
             finally:
                 # Removing pid from lock
                 lock.truncate(0)
-                (datawarehouse / '.running').unlink()
+                running_link.unlink()
                 finish_logging(errors=not copied_dw)
     except pl.LockException:
         with open(cs_lock, 'r') as f: