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

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

@@ -1,7 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 1.3.0 - 2024-04-24
+## 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.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.3.0.post1
+Version: 1.3.1
 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.3.1}/dao_scripts.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.3.0.post1
+Version: 1.3.1
 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.3.1}/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.3.1'
+__version_tuple__ = version_tuple = (1, 3, 1)

{dao_scripts-1.3.0.post1 → dao_scripts-1.3.1}/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
 ):
@@ -101,12 +101,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 +119,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,