Skip to content

Commit

Permalink
Merge branch 'Zulko:master' into use-audio-codec-for-existing-audiofile
Browse files Browse the repository at this point in the history
  • Loading branch information
zalgo3 committed Apr 4, 2023
2 parents f007f34 + 86fd511 commit e7cbfd3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 23 deletions.
18 changes: 3 additions & 15 deletions .github/workflows/test_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,12 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
python-version: [3.7]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v3
- uses: s-weigand/setup-conda@v1
with:
activate-conda: true
# TODO: fix adding the different versions
# Pick the installation of Python Framework build from conda, because they do not support versioning
# https://anaconda.org/anaconda/python.app/files
#- name: Install conda python version 3.6
# if: matrix.python-version == '3.6'
# run: conda install http://repo.continuum.io/pkgs/main/osx-64/python.app-2-py36_10.tar.bz2
#- name: Install conda python version 3.7
# if: matrix.python-version == '3.7'
# run: conda install http://repo.continuum.io/pkgs/main/osx-64/python.app-2-py37_10.tar.bz2
#- name: Install conda python version 3.8
# if: matrix.python-version == '3.8'
# run: conda install http://repo.continuum.io/pkgs/main/osx-64/python.app-2-py38_10.tar.bz2
- name: Install pythonw
run: conda install python.app
- name: Python Version Info
Expand Down Expand Up @@ -65,7 +53,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -130,7 +118,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand Down
13 changes: 5 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#!/usr/bin/env python
"""MoviePy setup script."""

import os
import sys
from codecs import open
from pathlib import Path


try:
Expand Down Expand Up @@ -66,9 +65,7 @@ def run_tests(self):

cmdclass["build_docs"] = BuildDoc

__version__ = None
with open(os.path.join("moviepy", "version.py"), "r", "utf-8") as f:
__version__ = f.read().split(" ")[2].strip("\n").strip('"')
__version__ = Path("moviepy/version.py").read_text().strip().split('"')[1][:-1]


# Define the requirements for specific execution needs.
Expand Down Expand Up @@ -122,8 +119,7 @@ def run_tests(self):
}

# Load the README.
with open("README.rst", "r", "utf-8") as file:
readme = file.read()
readme = Path("README.rst").read_text()

setup(
name="moviepy",
Expand All @@ -143,10 +139,11 @@ def run_tests(self):
"License :: OSI Approved :: MIT License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Multimedia",
"Topic :: Multimedia :: Sound/Audio",
"Topic :: Multimedia :: Sound/Audio :: Analysis",
Expand Down

0 comments on commit e7cbfd3

Please sign in to comment.