dao-scripts 1.3.0.post1__py3-none-any.whl → 1.4.0__py3-none-any.whl

dao_analyzer/cache_scripts/_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_analyzer/cache_scripts/endpoints.json

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

dao_analyzer/cache_scripts/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:

{dao_scripts-1.3.0.post1.dist-info → dao_scripts-1.4.0.dist-info}/METADATA

@@ -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.dist-info → dao_scripts-1.4.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-dao_scripts-1.3.0.post1-py3.12-nspkg.pth,sha256=_0DzrHlnOxaQL5l1mMdHT1BtXZwXuB6MitMF5phpOhk,497
+dao_scripts-1.4.0-py3.12-nspkg.pth,sha256=_0DzrHlnOxaQL5l1mMdHT1BtXZwXuB6MitMF5phpOhk,497
 dao_analyzer/cache_scripts/__init__.py,sha256=Urg-J2hvyzGcgE2Z-ba71XpcHi1YlPZgex86OFSd_0A,116
 dao_analyzer/cache_scripts/__main__.py,sha256=aNVhgUXjB4rzTefrX3d6dKeLOX3G_Ezs82pI8QCpwx0,61
-dao_analyzer/cache_scripts/_version.py,sha256=fEmRqAxGWPRYP3Rhyj3ZTwD-sjgPHsJH8jzhage354k,417
+dao_analyzer/cache_scripts/_version.py,sha256=R8-T9fmURjcuoxYpHTAjyNAhgJPDtI2jogCjqYYkfCU,411
 dao_analyzer/cache_scripts/argparser.py,sha256=uOBVdRxmgR8H0dZMu2AQyvro6WvkZFKUrf7vJ6Mvw48,3574
 dao_analyzer/cache_scripts/config.py,sha256=6Ooh-SpTtNCHcl2sE637-XMCCCNZBmATJRyD_eguWr0,2180
-dao_analyzer/cache_scripts/endpoints.json,sha256=UR8NiR6S0MgYHn3m-SVDY2YIWyPdSkMEK6_4TLk2T2U,1276
+dao_analyzer/cache_scripts/endpoints.json,sha256=JLkXgE7P7ZXpAsorIq0jCVCoPoK4_YeyfTgCmtPdo14,1278
 dao_analyzer/cache_scripts/logging.py,sha256=9sAqZUk_Qnmlf9Ko60C4O__Ve7Tj4xefzQ7cV07aQ70,3196
-dao_analyzer/cache_scripts/main.py,sha256=ao1Zz5nB4_4koXTqSTJMyWmXbCFBp0vpnp0f0M2u9Ms,5665
+dao_analyzer/cache_scripts/main.py,sha256=7N92n6KBQXjnlEGLV_f7_PBHEI7UzR47yPLcUkh2j5w,5751
 dao_analyzer/cache_scripts/metadata.py,sha256=oZ5xLkWClt1YxBAvbsDhciZkyHJ1Vcuic7guFy2ks6w,4211
 dao_analyzer/cache_scripts/aragon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_analyzer/cache_scripts/aragon/dao_names.json,sha256=ASDOJYTsgHELJ7g1z9NccVROYYxsHQaLy9V-vrfr_Ec,7412
@@ -23,10 +23,10 @@ dao_analyzer/cache_scripts/daostack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 dao_analyzer/cache_scripts/daostack/runner.py,sha256=emjzhZzGMTRGHKljll_lX-uMsGwaIsZBSi4jV1Lsh8Y,10144
 dao_analyzer/cache_scripts/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_analyzer/cache_scripts/utils/uploadDataWarehouse.py,sha256=xEzUr-XYcf6DICZkarHEwGSDGLHSz2eXZmRER8Fj1OU,4027
-dao_scripts-1.3.0.post1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-dao_scripts-1.3.0.post1.dist-info/METADATA,sha256=2Z62brcn6FDUuOzhtlEqSCB-fc52XuIi3gS_CqVGUTs,8199
-dao_scripts-1.3.0.post1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dao_scripts-1.3.0.post1.dist-info/entry_points.txt,sha256=dHhgA8pcQ2YbIlMuqPPSh7fiQkfHE8ioFPUcbBvXWDc,207
-dao_scripts-1.3.0.post1.dist-info/namespace_packages.txt,sha256=gbsNupMgtHQXOyBinbeLMo06f278s8My_9N-CrZh3Bk,13
-dao_scripts-1.3.0.post1.dist-info/top_level.txt,sha256=gbsNupMgtHQXOyBinbeLMo06f278s8My_9N-CrZh3Bk,13
-dao_scripts-1.3.0.post1.dist-info/RECORD,,
+dao_scripts-1.4.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+dao_scripts-1.4.0.dist-info/METADATA,sha256=I-VyX0tv4tJQXrhZa-o-rXs643twWXe9FPbah3-2m3k,8193
+dao_scripts-1.4.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dao_scripts-1.4.0.dist-info/entry_points.txt,sha256=dHhgA8pcQ2YbIlMuqPPSh7fiQkfHE8ioFPUcbBvXWDc,207
+dao_scripts-1.4.0.dist-info/namespace_packages.txt,sha256=gbsNupMgtHQXOyBinbeLMo06f278s8My_9N-CrZh3Bk,13
+dao_scripts-1.4.0.dist-info/top_level.txt,sha256=gbsNupMgtHQXOyBinbeLMo06f278s8My_9N-CrZh3Bk,13
+dao_scripts-1.4.0.dist-info/RECORD,,