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

Make license file compliant, separate dev dependencies #55

Merged
merged 6 commits into from
Jan 8, 2024
Merged
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
1 change: 1 addition & 0 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
24 changes: 0 additions & 24 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 0 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pytest==7.2.0
pytest-xdist==3.1.0
4 changes: 4 additions & 0 deletions tests_dockerfiles/Dockerfile-3-10
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion tests_dockerfiles/Dockerfile-3-11
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 22 additions & 0 deletions tests_dockerfiles/Dockerfile-3-12
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions tests_dockerfiles/Dockerfile-3-9
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading