Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernise and fix most notebooks #61

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
14 changes: 14 additions & 0 deletions .github/workflows/action_integration_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Action Integration Test

on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.11'
- name: install & run nbmake
run: make test
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,5 @@ coverage.xml
# Sphinx documentation
docs/_build/

venv/
.idea/
21 changes: 21 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM python:3.11-bookworm as base

RUN apt-get update && \
apt-get dist-upgrade -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip

RUN mkdir -p /code
WORKDIR /code
ADD requirements.txt Makefile .
RUN make venv/
ADD * .

FROM base as test
RUN make test

FROM base as run
RUN make install

21 changes: 21 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

.PHONY: run install


run: venv/bin/jupyter-lab
venv/bin/jupyter-lab index.ipynb

install: venv/bin/jupyter-lab

test: venv/bin/jupyter-lab
venv/bin/pytest --nbmake -n=auto *.ipynb

venv/:
python3 -m venv venv
venv/bin/pip install --upgrade pip

venv/bin/jupyter-lab: venv/
venv/bin/pip install -r requirements.txt
touch venv/bin/jupyter-lab


202 changes: 101 additions & 101 deletions about.ipynb
Original file line number Diff line number Diff line change
@@ -1,103 +1,103 @@
{
"cells": [
{
"cell_type": "markdown",
"metadata": {
"id": "NmNSNOGbObRZ"
},
"source": [
"[musicinformationretrieval.com](https://musicinformationretrieval.com)"
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "jxcTLBADObRd"
},
"source": [
"# About This Site"
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "emPsZmWEObRd"
},
"source": [
"**musicinformationretrieval.com** is a collection of instructional materials for music information retrieval (MIR). These materials contain a mix of casual conversation, technical discussion, and Python code. \n",
"\n",
"These pages, including the one you're reading, are authored using [Colab notebooks](https://research.google.com/colaboratory/). The GitHub repository is found here: [stevetjoa/musicinformationretrieval.com](https://github.com/stevetjoa/musicinformationretrieval.com).\n",
"\n",
"This site is maintained by [Steve Tjoa](https://stevetjoa.com). For questions, please email [steve@musicinformationretrieval.com](mailto:steve@musicinformationretrieval.com). Do you have any feedback? Did you find errors or typos? Are you a teacher or researcher and would like to collaborate? Please let me know."
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "nTzzG1jJObRe"
},
"source": [
"## People who use this site"
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "7NwGi8esObRe"
},
"source": [
"- Florida State University, Jonathan Adams, director, [School of Information Machine Learning Lab](https://mllab.cci.fsu.edu/)\n",
"- CSU Monterey Bay, [Jeffrey Treviño](https://csumb.edu/directory/people/jeffrey-trevino)\n",
"- International Audio Laboratories Erlangen, [Meinard Müller](https://www.audiolabs-erlangen.de/fau/professor/mueller) (author, [Fundamentals of Music Processing](http://www.music-processing.de), Springer, 2015)\n",
"- San Jose State University, CS185C - Topics on Music Information Retrieval, Vidya Rangasayee\n",
"- Stanford University, [Music 364: Data-Driven Research in Music Cognition](https://ccrma.stanford.edu/courses/364/), [Blair Kaneshiro](https://ccrma.stanford.edu/~blairbo/)\n",
"- MIT, [21M.359: Fundamentals of Music Processing](http://musictech.mit.edu/fmp), [Eran Egozy](http://mta.mit.edu/person/eran-egozy)\n",
"- Harvard University, Freshman Seminar 24e: The Physics and Applied Physics Freshman Research Laboratory\n",
"- Haverford College"
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "A_uJF1S8ObRf"
},
"source": [
"## Contributors to this GitHub repo"
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "jnj5jtWdObRg"
},
"source": [
"See [contributors on GitHub](https://github.com/stevetjoa/musicinformationretrieval.com/graphs/contributors)."
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.4"
},
"colab": {
"name": "about.ipynb",
"provenance": []
}
"cells": [
{
"cell_type": "markdown",
"metadata": {
"id": "NmNSNOGbObRZ"
},
"source": [
"[musicinformationretrieval.com](https://musicinformationretrieval.com)"
]
},
"nbformat": 4,
"nbformat_minor": 0
}
{
"cell_type": "markdown",
"metadata": {
"id": "jxcTLBADObRd"
},
"source": [
"# About This Site"
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "emPsZmWEObRd"
},
"source": [
"**musicinformationretrieval.com** is a collection of instructional materials for music information retrieval (MIR). These materials contain a mix of casual conversation, technical discussion, and Python code. \n",
"\n",
"These pages, including the one you're reading, are authored using [Colab notebooks](https://research.google.com/colaboratory/). The GitHub repository is found here: [stevetjoa/musicinformationretrieval.com](https://github.com/stevetjoa/musicinformationretrieval.com).\n",
"\n",
"This site is maintained by [Steve Tjoa](https://stevetjoa.com). For questions, please email [steve@musicinformationretrieval.com](mailto:steve@musicinformationretrieval.com). Do you have any feedback? Did you find errors or typos? Are you a teacher or researcher and would like to collaborate? Please let me know."
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "nTzzG1jJObRe"
},
"source": [
"## People who use this site"
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "7NwGi8esObRe"
},
"source": [
"- Florida State University, Jonathan Adams, director, [School of Information Machine Learning Lab](https://mllab.cci.fsu.edu/)\n",
"- CSU Monterey Bay, [Jeffrey Treviño](https://csumb.edu/directory/people/jeffrey-trevino)\n",
"- International Audio Laboratories Erlangen, [Meinard Müller](https://www.audiolabs-erlangen.de/fau/professor/mueller) (author, [Fundamentals of Music Processing](http://www.music-processing.de), Springer, 2015)\n",
"- San Jose State University, CS185C - Topics on Music Information Retrieval, Vidya Rangasayee\n",
"- Stanford University, [Music 364: Data-Driven Research in Music Cognition](https://ccrma.stanford.edu/courses/364/), [Blair Kaneshiro](https://ccrma.stanford.edu/~blairbo/)\n",
"- MIT, [21M.359: Fundamentals of Music Processing](http://musictech.mit.edu/fmp), [Eran Egozy](http://mta.mit.edu/person/eran-egozy)\n",
"- Harvard University, Freshman Seminar 24e: The Physics and Applied Physics Freshman Research Laboratory\n",
"- Haverford College"
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "A_uJF1S8ObRf"
},
"source": [
"## Contributors to this GitHub repo"
]
},
{
"cell_type": "markdown",
"metadata": {
"id": "jnj5jtWdObRg"
},
"source": [
"See [contributors on GitHub](https://github.com/stevetjoa/musicinformationretrieval.com/graphs/contributors)."
]
}
],
"metadata": {
"colab": {
"name": "about.ipynb",
"provenance": []
},
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.6"
}
},
"nbformat": 4,
"nbformat_minor": 4
}