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

{dao-scripts-1.2.2 → dao_scripts-1.3.0.post1}/.envrc

@@ -1,4 +1,3 @@
 export DOCKER_BUILDKIT=1
 layout python3
-source_up
 dotenv

{dao-scripts-1.2.2 → dao_scripts-1.3.0.post1}/.github/workflows/ci.yml

@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8","3.9","3.10", "3.11"]
+        python-version: ["3.9","3.10", "3.11", "3.12"]
     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.2.2 → dao_scripts-1.3.0.post1}/.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,32 +22,37 @@ 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/
   upload_dw:
     runs-on: ubuntu-latest
     environment: daviddavo
+    strategy:
+      fail-fast: false
+      matrix:
+        repo: ["zenodo","kaggle"]
     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)
       run: |
         FILE="$(python -c "from zenodo_client import api; print(api.__file__)")"
         echo "Modyfing file $FILE"
-        sed -i 's/_prepare_new_version(new_deposition_data\["metadata"\]\["version"\])/_prepare_new_version(new_deposition_data["metadata"].get("version", ""))/g' $FILE
+        sed -i 's/_prepare_new_version(new_deposition_data\["metadata"\]\["version"\])/_prepare_new_version(new_deposition_data["metadata"].get("version", ""))/g' "$FILE"
+        sed -i 's/json=new_deposition_data/json={"metadata": new_deposition_data\["metadata"\]}/g' "$FILE"
     - name: Upload dataset
-      run: dao-utils-upload-dw
+      run: dao-utils-upload-dw ${{matrix.repo}}
       env:
         KAGGLE_USERNAME: ${{ secrets.KAGGLE_USERNAME }}
         KAGGLE_KEY: ${{ secrets.KAGGLE_KEY }}

{dao-scripts-1.2.2 → dao_scripts-1.3.0.post1}/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.3.0 - 2024-04-24
+- Improved and standarized logging #10
+- The Graph Hosted Service sunsetting
+  - Added DAOA_THE_GRAPH_API_KEY variable (now needed)
+
 ## 1.2.2 - 2023-12-13
 - Changed daohaus names cache folder