From 9ee1225dc312cddc4eaab32ca5746e95bc6d4fe2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 16:57:06 +0000 Subject: [PATCH 1/7] Bump actions/setup-node from 3 to 4 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a29b325..842e8d25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: working-directory: dao_analyzer_components steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 - uses: actions/setup-python@v4 with: python-version: '3.10' @@ -44,7 +44,7 @@ jobs: working-directory: dao_analyzer_components steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: registry-url: 'https://registry.npmjs.org' - name: Download artifact From 1e221a2bf946860c217d2ae355512bb8295e635e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Dav=C3=B3?= Date: Tue, 14 May 2024 10:54:31 +0200 Subject: [PATCH 2/7] Update README.md --- README.md | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 99fdf197..8c618a22 100644 --- a/README.md +++ b/README.md @@ -188,7 +188,26 @@ The data is updated daily and published in [Kaggle](https://www.kaggle.com/datas ## Acknowledgements -DAO-Analyzer is created under the umbrella of two research projects: Chain Community, funded by the Spanish Ministry of Science and Innovation (RTI2018‐096820‐A‐I00) and led by Javier Arroyo and Samer Hassan; and P2P Models, funded by the European Research Council (ERC-2017-STG 625 grant no.: 75920), led by Samer Hassan. +
+Logo Ministerio de Ciencia e Innovación. Gobierno de EspañaLogotipo European Research CouncilLogo GRASIA UCMLogo Universidad Complutense de Madrid +
+ +DAO-Analyzer is created under the umbrella of multiple research projects: +- Chain Community, funded by the Spanish Ministry of Science and Innovation ([RTI2018‐096820‐A‐I00](https://produccioncientifica.ucm.es/proyectos/48103/detalle)) and led by Javier Arroyo and Samer Hassan +- P2P Models, funded by the European Research Council (ERC-2017-STG 625 grant no.: 75920), led by Samer Hassan. +- DAOapplications, funded by the Spanish Ministry of Science and Innovation ([PID2021-127956OB-I00](https://produccioncientifica.ucm.es/proyectos/551171/detalle)) and led by Javier Arroyo, Samer Hassan and maria Cruz Valiente ## Cite as From b32574f235b1001559b5136f4c9c69670fc43d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Dav=C3=B3?= Date: Mon, 27 May 2024 09:53:12 +0200 Subject: [PATCH 3/7] Update deps --- setup.cfg | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 6626c885..f0d21257 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,6 +23,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Scientific/Engineering :: Visualization Topic :: Sociology Typing :: Typed @@ -32,9 +33,10 @@ classifiers = # packages and package_dir in setup.py python_requires = >= 3.8 install_requires = - dao-scripts == 1.1.9 + dao-scripts == 1.3.0 # Waiting for plotly/dash#2251 to be fixed - dash >= 2.5.0, <2.6.0 + # dash >= 2.5.0, <2.6.0 + dash >= 2.17.0 dash-bootstrap-components >= 1.1.0 Werkzeug < 2.1.0 # Waiting for upstream fix on dash part flask >= 2.0.2 @@ -119,7 +121,7 @@ max-complexity = 10 max-line-length = 100 [tox:tox] -envlist = py{38,39,310,311} +envlist = py{38,39,310,311,312} [testenv] deps = .[dev] @@ -140,3 +142,4 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 From 4fa96eef9ec23f92d6b2eef5fb040776d6e9ffe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Dav=C3=B3?= Date: Mon, 27 May 2024 09:55:40 +0200 Subject: [PATCH 4/7] Updated ABOUT.md --- ABOUT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ABOUT.md b/ABOUT.md index da2ace2e..f35ce351 100644 --- a/ABOUT.md +++ b/ABOUT.md @@ -29,7 +29,7 @@ allocation of cryptofunds. The DAOs that we monitor are running on public blockchains. Mainly, in the Ethereum *mainnet*, that is, the primary public Ethereum blockchain network. However, in recent times, DAO platforms make it possible to -deploy and operate a DAO in other chains, such as *xDai* or *Polygon*, +deploy and operate a DAO in other chains, such as *Gnosis* (formerly xdai) or *Polygon*, that are designed to address Ethereum *mainnet* issues like slow transactions, high fees and throughput problems. DAO-Analyzer also monitors the DAOs in such networks. @@ -38,7 +38,7 @@ monitors the DAOs in such networks. DAO-Analyzer retrieves the data from the different blockchains using [The Graph](https://thegraph.com), an indexing protocol for -querying decentralized networks such as Ethereum, xDai, Polygon, etc. +querying decentralized networks such as Ethereum, Gnosis, Polygon, etc. Using this protocol, **we get the public data stored on the blockchain** about each DAO. From b9fde5e344331b717fee366a644b9db04947bd91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Dav=C3=B3?= Date: Mon, 27 May 2024 09:57:31 +0200 Subject: [PATCH 5/7] Updated Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d22d5dc7..cc947094 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog All notable changes to this project will be documented in this file. +# 1.3.0 - 2024-05-27 +- Updated dao-scripts to 1.3.0, now The Graph API key is needed to download data +- Updated dependencies +- Added Python 3.12 support + # 1.2.7 - 2023-09-05 - Moved cache-scripts to its own package ([dao-scripts](https://pypi.org/project/dao-scripts/)) - Updated dependencies From b3e47ea97eaaf74fe67fdb4e038bdd761487cb10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Dav=C3=B3?= Date: Mon, 27 May 2024 10:00:25 +0200 Subject: [PATCH 6/7] Dropped Python 3.8 support --- .github/workflows/ci.yml | 6 +++--- Dockerfile | 2 +- setup.cfg | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 842e8d25..a4e2e636 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-node@v4 - uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.12' cache: 'pip' - name: Install dash and other deps run: pip install -r requirements.txt @@ -61,7 +61,7 @@ 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: @@ -90,7 +90,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.12' cache: 'pip' - name: Install build deps run: python -m pip install --upgrade pip build wheel diff --git a/Dockerfile b/Dockerfile index 0e028003..084a86a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10 +FROM python:3.12 ARG POPULATE_CACHE=0 ARG PYTHON_PKG=dao-analyzer ARG DAOA_VERSION diff --git a/setup.cfg b/setup.cfg index f0d21257..34ad99ab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,7 +19,6 @@ classifiers = Intended Audience :: Science/Research License :: OSI Approved :: GNU General Public License v3 (GPLv3) Programming Language :: Python :: 3 - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 @@ -31,7 +30,7 @@ classifiers = [options] # packages and package_dir in setup.py -python_requires = >= 3.8 +python_requires = >= 3.9 install_requires = dao-scripts == 1.3.0 # Waiting for plotly/dash#2251 to be fixed @@ -121,7 +120,7 @@ max-complexity = 10 max-line-length = 100 [tox:tox] -envlist = py{38,39,310,311,312} +envlist = py{39,310,311,312} [testenv] deps = .[dev] @@ -138,7 +137,6 @@ commands = [gh-actions] python = - 3.8: py38 3.9: py39 3.10: py310 3.11: py311 From c4f5025db5209b2b17adb90fa696e91d945607bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Dav=C3=B3?= Date: Mon, 27 May 2024 10:06:07 +0200 Subject: [PATCH 7/7] Updated CI deps --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4e2e636..1b1cb294 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.12' cache: 'pip' @@ -28,7 +28,7 @@ jobs: - name: Validate init run: npm run validate-init - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dao_analyzer_components path: | @@ -48,7 +48,7 @@ jobs: with: registry-url: 'https://registry.npmjs.org' - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: dao_analyzer_components path: ./dao_analyzer_components/dao_analyzer_components/ @@ -67,7 +67,7 @@ jobs: steps: - 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 @@ -83,12 +83,12 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 # Downloading tags to gen version name - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: dao_analyzer_components path: ./dao_analyzer_components/dao_analyzer_components/ - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.12' cache: 'pip' @@ -97,7 +97,7 @@ jobs: - 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/ @@ -107,7 +107,7 @@ jobs: if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master' steps: - name: Download built package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: dist path: ./dist/ @@ -126,7 +126,7 @@ jobs: steps: - uses: actions/checkout@master - name: Getting built package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: dist path: ./dist/