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

Git pulled the latest changes and updated poetry and testing. #77

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
47 changes: 0 additions & 47 deletions .github/workflows/interval-test.yml

This file was deleted.

74 changes: 74 additions & 0 deletions .github/workflows/interval_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: interval-test

on: [ push ]

jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: write

strategy:
matrix:
python-version: [ '3.10', '3.11' ]

steps:
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: '20.x'
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest pytest-cov
pip install -r requirements.txt
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
python -m pytest --cov visualizations --doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report term-missing --cov-report=html
python -m pytest --cov main_objs --doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report term-missing --cov-report=html
- name: Install poetry and "patch" the build
run: |
pip install poetry
poetry self add poetry-bumpversion
poetry version patch
- name: Publish to Pypi
if: github.ref == 'refs/heads/main' # This ensures publishing only happens on main branch
run: |
poetry config pypi-token.pypi "${{ secrets.PYPI_TOKEN }}"
poetry publish --build

- name: Update Markdown with New Version
if: github.ref == 'refs/heads/main' # Same condition to ensure it runs only on main branch
run: |
VERSION=$(poetry version -s)
sed -i "s/Current Version: .*/Current Version: $VERSION/" README.md
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git commit -am "Update README.md with new version $VERSION [skip ci]" # Add [skip ci] to prevent re-triggering
git push

- uses: actions/checkout@v4
- uses: stefanzweifel/git-auto-commit-action@v4




# - name: Build and publish to PyPI
# env:
# TWINE_USERNAME: __token__ # Replace with your PyPI username or token
# TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} # Add this token as a GitHub repository secret
# run: |
# poetry build
# twine upload ./crim_intervals
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
./sandbox.py
crim-intervals/data/cadences/groundTruth.csv
.DS_Store
40 changes: 0 additions & 40 deletions Hours.txt

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CRIM Intervals: Python Tools for the Analysis of Encoded Music Scores

### Current Version: 2.0.3
### Current Version: 2.0.13

[CRIM Intervals on github](https://github.com/HCDigitalScholarship/intervals/tree/main)

Expand Down Expand Up @@ -119,4 +119,4 @@ All CRIM intervals tools are available via a **Creative Commons** license (Attri
* [15_Network_Graphs](https://github.com/HCDigitalScholarship/intervals/blob/main/tutorial/15_Network_Graphs.md)
* [16_Python_Basics](https://github.com/HCDigitalScholarship/intervals/blob/main/tutorial/16_Python_Basics.md)
* [17_Pandas_Basics](https://github.com/HCDigitalScholarship/intervals/blob/main/tutorial/17_Pandas_Basics.md)
* [18_Music21_Basics](https://github.com/HCDigitalScholarship/intervals/blob/main/tutorial/18_Music21_Basics.md)
* [18_Music21_Basics](https://github.com/HCDigitalScholarship/intervals/blob/main/tutorial/18_Music21_Basics.md)
2 changes: 1 addition & 1 deletion crim_intervals/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# from .classify import *
#from .main_objs import *
from .visualizations import *
__version__ = "2.0.8"
__version__ = "2.0.13"
Binary file modified crim_intervals/__pycache__/__init__.cpython-39.pyc
Binary file not shown.
Binary file modified crim_intervals/__pycache__/main.cpython-39.pyc
Binary file not shown.
Binary file modified crim_intervals/__pycache__/main_objs.cpython-39.pyc
Binary file not shown.
Binary file modified crim_intervals/__pycache__/visualizations.cpython-39.pyc
Binary file not shown.
2 changes: 1 addition & 1 deletion crim_intervals/data/cadences/cadenceLabels.csv
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Key,CadType,LeadingTones
^C(2|4)PT-1z?$,Phrygian,1
^BC(1|3)x?z?$,Authentic,1
^BC(2|4)x?z?$,Authentic,0
^C1u-(3|4)$,Evaded Authentic,1
^C1(t1|t2)?u-(1|2|3|4)$,Evaded Authentic,1
^C2u-(3|4)$,Evaded Authentic,0
^C1T-2u-3$,Clausula Vera,1
^C1T-2u-3x$,Evaded Authentic,1
Expand Down
Loading