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

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

@@ -11,9 +11,9 @@ jobs:
     env:
       DEBUG: TRUE
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -26,20 +26,20 @@ jobs:
     runs-on: ubuntu-latest
     needs: [testing_python]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0 # Downloading tags to gen version name
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: '3.12'
         cache: 'pip'
     - name: Install build deps
       run: python -m pip install --upgrade pip build wheel
     - name: Build package
       run: python -m build
     - name: Archive built package
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: dist
         path: ./dist/
@@ -53,7 +53,7 @@ jobs:
       id-token: write
     steps:
     - name: Download built package
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: dist
         path: ./dist/

{dao_scripts-1.3.0 → dao_scripts-1.3.1}/.github/workflows/update-datasets.yml

@@ -7,13 +7,13 @@ jobs:
   update_dw:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: '3.12'
     - name: Install dao-scripts
       run: pip install dao-scripts
     - name: Get cached datawarehouse
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v3
       with:
         workflow: update-datasets.yml
         name: datawarehouse
@@ -22,7 +22,7 @@ jobs:
     - name: Obtain datawarehouse
       run: dao-scripts --skip-token-balances
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: datawarehouse
         path: ./datawarehouse/
@@ -36,13 +36,13 @@ jobs:
     needs: [update_dw]
     steps:
     - name: Download artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: datawarehouse
         path: ./datawarehouse/
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: '3.12'
     - name: Install dao-scripts
       run: pip install 'dao-scripts[upload]>=1.1.14'
     - name: Patch Zenodo client (provisional)

{dao_scripts-1.3.0 → 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 → dao_scripts-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.3.0
+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ó
@@ -36,7 +36,7 @@ Requires-Dist: tenacity>=8.0.0
 Requires-Dist: tqdm>=4.62.3
 Provides-Extra: upload
 Requires-Dist: kaggle>=1.5.12; extra == "upload"
-Requires-Dist: zenodo-client>=0.3.0; extra == "upload"
+Requires-Dist: zenodo-client>=0.3.4; extra == "upload"
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{dao_scripts-1.3.0 → 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
+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ó
@@ -36,7 +36,7 @@ Requires-Dist: tenacity>=8.0.0
 Requires-Dist: tqdm>=4.62.3
 Provides-Extra: upload
 Requires-Dist: kaggle>=1.5.12; extra == "upload"
-Requires-Dist: zenodo-client>=0.3.0; extra == "upload"
+Requires-Dist: zenodo-client>=0.3.4; extra == "upload"
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{dao_scripts-1.3.0 → dao_scripts-1.3.1}/dao_scripts.egg-info/requires.txt

@@ -20,4 +20,4 @@ twine
 
 [upload]
 kaggle>=1.5.12
-zenodo-client>=0.3.0
+zenodo-client>=0.3.4

{dao_scripts-1.3.0 → dao_scripts-1.3.1}/setup.cfg

@@ -53,7 +53,7 @@ console_scripts =
 [options.extras_require]
 upload = 
 	kaggle >= 1.5.12
-	zenodo-client >= 0.3.0
+	zenodo-client >= 0.3.4
 dev = 
 	build
 	pytest

{dao_scripts-1.3.0 → 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'
-__version_tuple__ = version_tuple = (1, 3, 0)
+__version__ = version = '1.3.1'
+__version_tuple__ = version_tuple = (1, 3, 1)

{dao_scripts-1.3.0 → 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,