Ben/notebook patch (#129)

* Fix circular dependency

* Update version

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.7] - 2021-09-09
+### Changed
+- Fixed circular dependency in notebooks causing tests to fail
+
 ## [1.1.6] - 2021-09-06
 ### Added
 - The Graph Subgraph for validator adoption

README.md

@@ -4,7 +4,7 @@
 
 A modular dynamical-systems model of Ethereum's validator economics, based on the open-source Python library [radCAD](https://github.com/CADLabs/radCAD), an extension to [cadCAD](https://cadcad.org).
 
-* Latest model release version: [Subgraph / v1.1.6](https://github.com/CADLabs/ethereum-economic-model/releases/tag/v1.1.6)
+* Latest model release version: [Subgraph / v1.1.7](https://github.com/CADLabs/ethereum-economic-model/releases/tag/v1.1.7)
 * Implements the official Ethereum [Altair](https://github.com/ethereum/eth2.0-specs#altair) spec updates in the [Blue Loop / v1.1.0-alpha.7](https://github.com/ethereum/eth2.0-specs/releases/tag/v1.1.0-alpha.7) release
 
 ## Table of Contents
@@ -97,12 +97,12 @@ The [Differential Model Specification](https://hackmd.io/@CADLabs/HyENPQ36u) dep
 ## Environment Setup
 
 1. Clone or download the Git repository: `git clone https://github.com/CADLabs/ethereum-model` or using GitHub Desktop
-2. If completing the cadCAD Edu Masterclass MOOC, find and check out the latest ["Masterclass 🎓" release version](https://github.com/CADLabs/ethereum-economic-model/releases): e.g. `git checkout v.1.1.6`
+2. If completing the cadCAD Edu Masterclass MOOC, find and check out the latest ["Masterclass 🎓" release version](https://github.com/CADLabs/ethereum-economic-model/releases): e.g. `git checkout v.1.1.7`
 3. Set up your development environment using one of the following three options:
 
 ### Option 1: Anaconda Development Environment
 
-This option guides you through setting up a cross-platform, beginner-friendly (yet more than capable enough for the advanced user) development environment using Anaconda to install Python 3 and Jupyter. There is also a video that accompanies this option and walks through all the steps: [Model Quick-Start Guide](TODO)
+This option guides you through setting up a cross-platform, beginner-friendly (yet more than capable enough for the advanced user) development environment using Anaconda to install Python 3 and Jupyter. There is also a video that accompanies this option and walks through all the steps: [Model Quick-Start Guide](https://www.cadcad.education/course/masterclass-ethereum)
 
 1. Download [Anaconda](https://www.anaconda.com/products/individual)
 2. Use Anaconda to install Python 3
@@ -294,6 +294,6 @@ If you'd like to cite this code and/or research, we suggest the following format
   publisher = {GitHub},
   journal = {GitHub repository},
   howpublished = {\url{https://github.com/CADLabs/ethereum-economic-model}},
-  version = {v1.1.6}
+  version = {v1.1.7}
 }
 ```

data/api/subgraph.py

@@ -38,7 +38,7 @@ def get_6_month_validator_deposit_data():
             logging.error(err)
             return {}
     else:
-        logging.error("SUBGRAPH_API_KEY not defined")
+        logging.warn("SUBGRAPH_API_KEY not defined")
         return {}
 
 

experiments/notebooks/2_validator_revenue_and_profit_yields.ipynb

@@ -72,9 +72,7 @@
     "import numpy as np\n",
     "import pandas as pd\n",
     "\n",
-    "from data.api import subgraph\n",
-    "import experiments.notebooks.visualizations as visualizations\n",
-    "import model.constants as constants\n",
+    "from experiments.notebooks import visualizations\n",
     "from experiments.run import run\n",
     "from experiments.utils import display_code\n",
     "from model.types import Stage\n",
@@ -158,7 +156,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "simulation_1a = copy.deepcopy(simulation_1)\n",
     "normal_adoption = simulation_1a.model.params['validator_process'][0](_run=None, _timestep=None)\n",
     "simulation_1a.model.params.update({\n",
     "    'validator_process': [\n",
@@ -481,7 +478,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.8.11"
   }
  },
  "nbformat": 4,

experiments/notebooks/3_network_issuance_and_inflation_rate.ipynb

@@ -69,8 +69,7 @@
     "import pandas as pd\n",
     "from datetime import datetime\n",
     "\n",
-    "from data.api import subgraph\n",
-    "import experiments.notebooks.visualizations as visualizations\n",
+    "from experiments.notebooks import visualizations\n",
     "from experiments.notebooks.visualizations.eth_supply_simulator import run_eth_supply_simulator\n",
     "from experiments.run import run\n",
     "from model.types import Stage\n",

model/__init__.py

@@ -1,7 +1,7 @@
 """
 CADLabs Ethereum Economic Model
 """
-__version__ = "1.1.6"
+__version__ = "1.1.7"
 
 from radcad import Model