Make license file compliant, separate dev dependencies (#55)

* Testing update for 3.11

* Testing upgrade scikit-image

* Separate pytest dependency to requirements_dev.txt

* Update license file to compliant MIT

* revert scikit-image update

.github/workflows/python-package.yml

@@ -66,6 +66,7 @@ jobs:
         python -m pip install --upgrade pip
         python -m pip install flake8 pytest
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        if [ -f requirements_dev.txt ]; then pip install -r requirements_dev.txt; fi
 
     - name: Lint with flake8
       run: |

LICENSE.md

@@ -19,27 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-"""
-The below section applies to the original files in audalign
-"""
-
-Copyright (c) 2013 Will Drevo
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

requirements.txt

@@ -29,8 +29,6 @@ pooch==1.6.0
 pycparser==2.21
 pydub==0.25.1
 pyparsing==3.1.1
-pytest==7.2.0
-pytest-xdist==3.1.0
 python-dateutil==2.8.2
 PyWavelets==1.4.1
 requests==2.28.1

requirements_dev.txt

@@ -0,0 +1,2 @@
+pytest==7.2.0
+pytest-xdist==3.1.0

tests_dockerfiles/Dockerfile-3-10

@@ -5,9 +5,13 @@ RUN apt-get update && apt-get install ffmpeg -y
 
 WORKDIR /tests_dir/
 
+RUN pip install --upgrade pip
+
 COPY requirements.txt /tests_dir
+COPY requirements_dev.txt /tests_dir
 
 RUN pip install -r requirements.txt
+RUN pip install -r requirements_dev.txt
 # RUN pip install noisereduce numpy pytest scipy pydub pytest-xdist scikit-image
 
 COPY audalign /tests_dir/audalign

tests_dockerfiles/Dockerfile-3-11

@@ -1,13 +1,17 @@
-# docker build -f tests_dockerfiles/Dockerfile-3-8 .
+# docker build -f tests_dockerfiles/Dockerfile-3-11 .
 FROM python:3.11
 
 RUN apt-get update && apt-get install ffmpeg -y
 
 WORKDIR /tests_dir/
 
+RUN pip install --upgrade pip
+
 COPY requirements.txt /tests_dir
+COPY requirements_dev.txt /tests_dir
 
 RUN pip install -r requirements.txt
+RUN pip install -r requirements_dev.txt
 # RUN pip install noisereduce numpy pytest scipy pydub pytest-xdist scikit-image
 
 COPY audalign /tests_dir/audalign

tests_dockerfiles/Dockerfile-3-12

@@ -0,0 +1,22 @@
+# docker build -f tests_dockerfiles/Dockerfile-3-12 .
+FROM python:3.12
+
+RUN apt-get update && apt-get install ffmpeg -y
+
+WORKDIR /tests_dir/
+
+RUN pip install --upgrade pip
+
+COPY requirements.txt /tests_dir
+COPY requirements_dev.txt /tests_dir
+
+RUN pip install -r requirements.txt
+RUN pip install -r requirements_dev.txt
+# RUN pip install noisereduce numpy pytest scipy pydub pytest-xdist scikit-image
+
+COPY audalign /tests_dir/audalign
+COPY test_audio /tests_dir/test_audio
+COPY tests /tests_dir/tests
+COPY pytest.ini /tests_dir
+
+RUN pytest

tests_dockerfiles/Dockerfile-3-9

@@ -5,9 +5,13 @@ RUN apt-get update && apt-get install ffmpeg -y
 
 WORKDIR /tests_dir/
 
+RUN pip install --upgrade pip
+
 COPY requirements.txt /tests_dir
+COPY requirements_dev.txt /tests_dir
 
 RUN pip install -r requirements.txt
+RUN pip install -r requirements_dev.txt
 # RUN pip install noisereduce numpy pytest scipy pydub pytest-xdist scikit-image
 
 COPY audalign /tests_dir/audalign