Skip to content

Commit

Permalink
Merge branch 'master' into volume_simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
mscuthbert committed Jan 3, 2024
2 parents 27e5c4c + 815821a commit 8d4af39
Show file tree
Hide file tree
Showing 269 changed files with 17,427 additions and 7,693 deletions.
44 changes: 30 additions & 14 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,19 +1,35 @@
[flake8]
ignore=
E127, # over indented
E128, # under indented
E301, # 0 blank lines -- good test but something going wrong in new algorithm
E302, # blank lines
E303, # blank lines
E501, # let pylint check line length
E722, # let pylint check bare except
E731, # do not assign a lambda
F401, # let pylint check for imported but unused (wildcards and exports trigger)
F405, # __all__ is okay to get from wildcard.
F821, # let pylint check for undefined (del at end of module makes undefined)
F841, # let pylint check for unused
W391, # extra blank lines at end of file
W503, # line break BEFORE binary operator
# over indented
E127,
# under indented
E128,
# space around | -- nice to omit in int|str
E227,
# 0 blank lines -- good test but something going wrong in new algorithm
E301,
# blank lines
E302,
# blank lines
E303,
# let pylint check line length
E501,
# let pylint check bare except
E722,
# do not assign a lambda
E731,
# let pylint check for imported but unused (wildcards and exports trigger)
F401,
# __all__ is okay to get from wildcard.
F405,
# let pylint check for undefined (del at end of module makes undefined)
F821,
# let pylint check for unused
F841,
# extra blank lines at end of file
W391,
# line break BEFORE binary operator
W503,

exclude=
.git,
Expand Down
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ labels: ''
assignees: ''

---
<!-- Please note that Michael Cuthbert, creator of music21, is taking a sabbatical from
the project (after 17 years of continuous development, until at least January 2024.
The issues you raise here are unlikely to be addressed until then (unless you choose
paid support options). Please see the music21list Google group for mure information
and assistance options.-->

<!-- Version of music21: print(music21.__version__) -->
**music21 version**

Expand Down
9 changes: 8 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ labels: 'enhancement'
assignees: ''

---
<!-- Please note that Michael Cuthbert, creator of music21, is taking a sabbatical from
the project (after 17 years of continuous development, until at least January 2024.
The issues you raise here are unlikely to be addressed until then (unless you choose
paid support options). Please see the music21list Google group for mure information
and assistance options.-->


**Motivation**
<!-- E.g. does this fill a gap? build on music21's strengths? improve usability? -->

Expand All @@ -24,4 +31,4 @@ Optionally, describe the implementation or the interface, in code or pseudocode.

[ ] I plan on implementing this myself.
[ ] I am willing to pay to have this feature added.
[ ] I am starting a discussion with the hope that community members will volunteer their time to create this. I understand that individuals work on features of interest to them and that this feature may never be implemented.
[ ] I am starting a discussion with the hope that community members will volunteer their time to create this. I understand that individuals work on features of interest to them and that this feature may never be implemented.
1 change: 1 addition & 0 deletions .github/scripts/install_ubuntu_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ sudo apt-get install -y libpng-dev
wget -q https://lilypond.org/download/binaries/linux-64/lilypond-2.22.1-1.linux-64.sh
sh lilypond-2.22.1-1.linux-64.sh --batch
export PATH=/home/runner/bin:$PATH
pip3 install wheel
pip3 install -r requirements_dev.txt
python3 -m compileall music21
66 changes: 63 additions & 3 deletions .github/workflows/maincheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# "3.11.0-rc.2" waiting for scipy.
python-version: ["3.10.6", "3.10"] # "3.10" must be in quotes to not have it eval to 3.1
python-version: ["3.10", "3.11", "3.12"] # "3.10" must be in quotes to not have it eval to 3.1
steps:
- uses: actions/setup-python@v4
with:
Expand All @@ -28,8 +27,69 @@ jobs:
- name: Run Main Test script
run: python -c 'from music21.test.testSingleCoreAll import ciMain as ci; ci()'
- name: Coveralls
if: ${{ matrix.python-version == '3.10.6' }}
if: ${{ matrix.python-version == '3.11' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_SERVICE_NAME: github
run: coveralls

lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
cache: 'pip'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install wheel
pip install -r requirements.txt
pip install -r requirements_dev.txt
- name: Install music21 in editable mode
run: |
python -m pip install -e .
- name: Lint with pylint
run: |
pylint -j0 music21
pylint -j0 documentation
flake:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
cache: 'pip'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install wheel
pip install -r requirements.txt
pip install -r requirements_dev.txt
- name: PEP8 with flake8
run: |
flake8 music21
flake8 documentation
mypy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
cache: 'pip'
- name: Install dependencies
run: |
pip install wheel
python -m pip install -r requirements.txt
python -m pip install -r requirements_dev.txt
- name: Type-check all modules with mypy
run: |
mypy music21
73 changes: 0 additions & 73 deletions .github/workflows/pythonpylint.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -378,4 +378,4 @@ int-import-graph=

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
# overgeneral-exceptions=Exception
27 changes: 27 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Read the Docs configuration file for music21
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.11"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
configuration: documentation/source/conf.py

# Optionally build your docs in additional formats such as PDF and ePub
# formats:
# - pdf
# - epub

# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
# python:
# install:
# - requirements: docs/requirements.txt
Loading

0 comments on commit 8d4af39

Please sign in to comment.