v3.0 updates (#12)

Xilinx · Jan 31, 2022 · bda9b20 · bda9b20
1 parent e3e7ee7
commit bda9b20
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -19,13 +19,22 @@ To install this repo separately, follow the instructions below.
 
 ### Overlay installation
 We supply a pre-built wheel containing the bitstream for that tagged release. This can be installed directly with Pip using the Terminal built in to JupyterLab.
-```sh
-# PYNQ v2.4.1 v2.5
-pip3 install https://github.com/Xilinx/DSP-PYNQ/releases/download/v1.0_$BOARD/dsp_pynq-1.0-py3-none-any.whl
+
+```bash
+# PYNQ v2.7
+wget https://github.com/Xilinx/DSP-PYNQ/releases/download/v3.0/$BOARD.dsp_pynq-3.0-py3-none-any.whl -O dsp_pynq-3.0-py3-none-any.whl
+python -m pip install dsp_pynq-3.0-py3-none-any.whl --no-deps --no-build-isolation
+rm dsp_pynq-3.0-py3-none-any.whl
 
 # PYNQ v2.6
 pip3 install https://github.com/Xilinx/DSP-PYNQ/releases/download/v2.0_$BOARD/dsp_pynq-2.0-py3-none-any.whl
 
+# PYNQ v2.4.1 v2.5
+pip3 install https://github.com/Xilinx/DSP-PYNQ/releases/download/v1.0_$BOARD/dsp_pynq-1.0-py3-none-any.whl
+```
+
+```bash
+# Install Notebooks
 python3 -c 'import dsp_pynq; dsp_pynq.install_notebooks()'
 ```
 The notebooks should then be available from the Jupyter file browser inside the `dsp_pynq` directory.

diff --git a/dsp_pynq/notebooks/01_dsp_and_python.ipynb b/dsp_pynq/notebooks/01_dsp_and_python.ipynb
@@ -199,7 +199,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import plotly_express as px\n",
+    "import plotly.express as px\n",
     "\n",
     "# Let's take a small subset of the recording\n",
     "aud_clip = to_time_dataframe(aud_in, fs).query('0.3 < time < 0.718')\n",
@@ -483,9 +483,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.5"
+   "version": "3.8.2"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/dsp_pynq/notebooks/02_dsp_and_pynq.ipynb b/dsp_pynq/notebooks/02_dsp_and_pynq.ipynb
@@ -25,7 +25,7 @@
     "\n",
     "fs, aud_in = wavfile.read(\"assets/birds.wav\")\n",
     "\n",
-    "import plotly_express as px\n",
+    "import plotly.express as px\n",
     "import pandas as pd\n",
     "\n",
     "# Derive a custom plotting template from `plotly_dark`\n",
@@ -521,7 +521,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.5"
+   "version": "3.8.2"
   }
  },
  "nbformat": 4,

diff --git a/setup.py b/setup.py
@@ -69,17 +69,15 @@ def make_file_list():
 
 setup(
     name="dsp_pynq",
-    version='2.0',
+    version='3.0',
     install_requires=[
-        'pynq>=2.4',
+        'pynq>=2.7',
         'plotly>=3.8.1',
         'plotly-express>=0.1.7',
         'scipy>=1.2.0',
     ],
     url='https://github.com/Xilinx/DSP-PYNQ',
     license='BSD 3-Clause License',
-    author="Craig Ramsay, Josh Goldsmith",
-    author_email="[email protected], [email protected]",
     packages=find_packages(),
     package_data={'': make_file_list()},
     description="Tutorial on using Python and PYNQ for DSP applications")