dao-scripts 1.1.14.post2__tar.gz → 1.2.1__tar.gz

{dao-scripts-1.1.14.post2 → dao-scripts-1.2.1}/.envrc

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

{dao-scripts-1.1.14.post2 → dao-scripts-1.2.1}/.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
   pypi:
     runs-on: ubuntu-latest
     needs: [package]
-    if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/' )
+    if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/' )
     # Specifying a GitHub environment is optional, but strongly encouraged
     permissions:
       # IMPORTANT: this permission is mandatory for trusted publishing

{dao-scripts-1.1.14.post2 → dao-scripts-1.2.1}/.github/workflows/update-datasets.yml

@@ -40,7 +40,7 @@ jobs:
       with:
         python-version: '3.11'
     - name: Install dao-scripts
-      run: pip install dao-scripts[upload]
+      run: pip install 'dao-scripts[upload]>=1.1.14'
     - name: Upload dataset
       run: dao-utils-upload-dw
       env:

{dao-scripts-1.1.14.post2 → dao-scripts-1.2.1}/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.2.1 - 2023-12-12
+- Fixed error that made impossible getting DAOhaus proposals
+
+## 1.2.0 - 2023-12-12
+- Getting textual information from DAOhaus proposals
+- Getting textual information from Aragon proposals
+
 ## 1.1.14 - 2023-10-24
 - Updated uploadDataWarehouse.py to report Zenodo API errors
 - Skipped 1.1.13 to trigger CI

{dao-scripts-1.1.14.post2 → dao-scripts-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.1.14.post2
+Version: 1.2.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.1.14.post2 → dao-scripts-1.2.1}/dao_scripts.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dao-scripts
-Version: 1.1.14.post2
+Version: 1.2.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.1.14.post2 → dao-scripts-1.2.1}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.14.post2'
-__version_tuple__ = version_tuple = (1, 1, 14)
+__version__ = version = '1.2.1'
+__version_tuple__ = version_tuple = (1, 2, 1)

{dao-scripts-1.1.14.post2 → dao-scripts-1.2.1}/src/aragon/runner.py

@@ -209,7 +209,9 @@ class VotesCollector(GraphQLCollector):
             ds.Vote.yea,
             ds.Vote.nay,
             ds.Vote.voteNum,
-            ds.Vote.votingPower
+            ds.Vote.votingPower,
+            # Textual information
+            ds.Vote.metadata,
         )
 
 class AragonRunner(GraphQLRunner):

{dao-scripts-1.1.14.post2 → dao-scripts-1.2.1}/src/daohaus/runner.py

@@ -118,7 +118,9 @@ class ProposalsCollector(GraphQLCollector):
             ds.Proposal.processedAt,
             ds.Proposal.didPass,
             ds.Proposal.yesShares,
-            ds.Proposal.noShares
+            ds.Proposal.noShares,
+            # Textual information
+            ds.Proposal.details,
         )
     
 class RageQuitCollector(GraphQLCollector):

{dao-scripts-1.1.14.post2 → dao-scripts-1.2.1}/src/utils/uploadDataWarehouse.py

@@ -54,8 +54,13 @@ def uploadToZenodo(paths):
     try:
         z.update(ZENODO_DEPOSITION_ID, paths)
     except requests.exceptions.HTTPError as e:
-        if 'errors' in e.response:
-            print(e.response['errors'], file=sys.stderr)
+        r = e.response.json()
+
+        if 'errors' in r:
+            for error in r['errors']:
+                print(f'Error using Zenodo API ({error["field"]}):', file=sys.stderr)
+                for msg in error['messages']:
+                    print('  ', msg, file=sys.stderr)
         raise e
 
 def archiveToZenodo(tmpdir, max_retries: int, sleep_seconds: int = 60):