diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a29b325..1b1cb294 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,10 +10,10 @@ jobs: working-directory: dao_analyzer_components steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 - - uses: actions/setup-python@v4 + - uses: actions/setup-node@v4 + - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' cache: 'pip' - name: Install dash and other deps run: pip install -r requirements.txt @@ -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: | @@ -44,11 +44,11 @@ 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 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: dao_analyzer_components path: ./dao_analyzer_components/dao_analyzer_components/ @@ -61,13 +61,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@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,21 +83,21 @@ 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.10' + 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/ @@ -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/ 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. 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 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/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 diff --git a/setup.cfg b/setup.cfg index 6626c885..34ad99ab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,10 +19,10 @@ 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 + Programming Language :: Python :: 3.12 Topic :: Scientific/Engineering :: Visualization Topic :: Sociology Typing :: Typed @@ -30,11 +30,12 @@ classifiers = [options] # packages and package_dir in setup.py -python_requires = >= 3.8 +python_requires = >= 3.9 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 +120,7 @@ max-complexity = 10 max-line-length = 100 [tox:tox] -envlist = py{38,39,310,311} +envlist = py{39,310,311,312} [testenv] deps = .[dev] @@ -136,7 +137,7 @@ commands = [gh-actions] python = - 3.8: py38 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312