Skip to content
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
44 changes: 25 additions & 19 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,31 @@ version: '{build}'
image: "Visual Studio 2019"
clone_depth: 5
environment:
matrix:
- PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python38-x64"
PYTHON_VERSION: "3.8"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python39-x64"
PYTHON_VERSION: "3.9"
PYTHON_ARCH: "64"
matrix:
- PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python38-x64"
PYTHON_VERSION: "3.8"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python39-x64"
PYTHON_VERSION: "3.9"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python310-x64"
PYTHON_VERSION: "3.10"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python311-x64"
PYTHON_VERSION: "3.11"
PYTHON_ARCH: "64"

cache:
- build -> appveyor.yml
- build -> appveyor.yml

install:
- choco install ffmpeg
Expand All @@ -34,8 +40,8 @@ before_test:
- curl -SsL "http://techslides.com/demos/sample-videos/small.mp4" > test.mp4

test_script:
- "%PYTHON%\\python.exe -m ffpb -i static/test.mp3 -acodec copy test.mka"
- "%PYTHON%\\python.exe -m ffpb -i test.mp4 -vcodec copy test.mkv"
- "%PYTHON%\\python.exe -m ffpb -i static/test.mp3 -c:a copy test.mka"
- "%PYTHON%\\python.exe -m ffpb -i test.mp4 -c:v copy test.mkv"

before_deploy:
- "%PYTHON%\\python.exe -m pip install -U twine"
Expand Down
10 changes: 5 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2
updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ var/
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

Expand Down
29 changes: 7 additions & 22 deletions CHANGELOG.md → ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,70 +5,55 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com) and
this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).


## [Unreleased]
[Unreleased]: https://github.com/althonos/ffpb/compare/v0.4.1...HEAD
[Unreleased]: https://github.com/althonos/ffpb/compare/v0.4.2...HEAD

## [v0.4.2] - 2023-01-07
[v0.4.2]: https://github.com/althonos/ffpb/compare/v0.4.1...v0.4.2
### Added
- Support for finding FFmpeg executable in Windows `PATH` variable ([#30](https://github.com/althonos/ffpb/pull/30)).

## [v0.4.1] - 2021-02-13
[v0.4.1]: https://github.com/althonos/ffpb/compare/v0.4.0...v0.4.1

### Fixed
- Unneeded decoding in main loop causing codec issues ([#22](https://github.com/althonos/ffpb/issues/22)).


## [v0.4.0] - 2021-01-13
[v0.4.0]: https://github.com/althonos/ffpb/compare/v0.3.0...v0.4.0

### Added
- Support for Windows platform ([#21](https://github.com/althonos/ffpb/pull/21)).

- Support for Windows platform ([#21](https://github.com/althonos/ffpb/pull/21)).
### Removed
- [sh](https://pypi.org/project/sh) dependency.


## [v0.3.0] - 2020-08-15
[v0.3.0]: https://github.com/althonos/ffpb/compare/v0.2.0...v0.3.0

### Added
- Option to change progress bar class in `ffpb.main`.

- Option to change progress bar class in `ffpb.main`.
### Fixed
- Decoding error caused by missing encoding in `ffpb.main` ([#17](https://github.com/althonos/ffpb/issues/17)).


## [v0.2.0] - 2019-04-29
[v0.2.0]: https://github.com/althonos/ffpb/compare/v0.1.3...v0.2.0

### Added
- Python 3.7 as an explicitly supported version.

### Fixed
- Incorrect decoding of filenames caused by [`chardet`](https://pypi.org/project/chardet/).


## [v0.1.3] - 2019-04-06
[v0.1.3]: https://github.com/althonos/ffpb/compare/v0.1.2...v0.1.3

### Fixed
- `ffpb.main` not using given `argv` argument ([#12](https://github.com/althonos/ffpb/pull/12)).


## [v0.1.2] - 2018-09-12
[v0.1.2]: https://github.com/althonos/ffpb/compare/v0.1.1...v0.1.2

### Fixed
- `ffpb` crashing on non-video input/output ([#8](https://github.com/althonos/ffpb/issues/8)).


## [v0.1.1] - 2018-09-11
[v0.1.1]: https://github.com/althonos/ffpb/compare/v0.1.0...v0.1.1

### Fixed
- `README.rst` not rendering properly on [PyPI](https://pypi.org/project/ffpb).


## [v0.1.0] - 2018-09-11
[v0.1.0]: https://github.com/althonos/ffpb/compare/dacd42a...v0.1.0

Initial release.
2 changes: 1 addition & 1 deletion COPYING → License.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017-2021 Martin Larralde <[email protected]>
Copyright (c) 2017-2023 Martin Larralde <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion README.rst → ReadMe.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Using as a library

.. code:: python

ffpb.main(argv=None, stream=sys.stderr, encoding=None, tqdm=tqdm):
ffpb.main(argv = None, stream = sys.stderr, encoding = None, tqdm= tqdm):


argv
Expand Down
12 changes: 6 additions & 6 deletions ci/appveyor/deploy.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
If ($env:PYTHON_VERSION -eq "3.9") {
If ($env:APPVEYOR_REPO_TAG -eq "true") {
Invoke-Expression "$env:PYTHON\\python.exe -m twine upload --skip-existing dist\\*"
} Else {
write-output "Not on a tag on master, won't deploy to PyPI"
}
If ($env:PYTHON_VERSION -eq "3.11") {
If ($env:APPVEYOR_REPO_TAG -eq "true") {
Invoke-Expression "$env:PYTHON\\python.exe -m twine upload --skip-existing dist\\*"
} Else {
write-output "Not on a tag on master, won't deploy to PyPI"
}
}
Loading