From 6ffd6282e0e673399cd79e78fb251e39fd900ffd Mon Sep 17 00:00:00 2001 From: k4yt3x Date: Sat, 12 Feb 2022 09:08:05 +0000 Subject: [PATCH] removed tqdm files from project --- Dockerfile | 6 ++--- NOTICE | 5 ---- README.md | 40 ++++++++++++++++---------------- licenses/LICENSE-tqdm | 49 ---------------------------------------- setup.cfg | 3 +-- video2x/requirements.txt | 13 ----------- 6 files changed, 24 insertions(+), 92 deletions(-) delete mode 100644 licenses/LICENSE-tqdm delete mode 100644 video2x/requirements.txt diff --git a/Dockerfile b/Dockerfile index e729d84..33fc98f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Name: Video2X Dockerfile (CUDA) # Creator: K4YT3X # Date Created: February 3, 2022 -# Last Modified: February 4, 2022 +# Last Modified: February 12, 2022 # stage 1: build the python components into wheels FROM docker.io/nvidia/cuda:11.6.0-runtime-ubuntu20.04 AS builder @@ -11,7 +11,7 @@ COPY . /video2x WORKDIR /video2x RUN apt-get update \ && apt-get install -y --no-install-recommends \ - python3-pip python3-opencv python3-pil python3-tqdm \ + python3-pip python3-opencv python3-pil \ python3-dev libvulkan-dev glslang-dev glslang-tools \ build-essential swig git \ && git config --global http.postBuffer 1048576000 \ @@ -33,7 +33,7 @@ COPY . /video2x WORKDIR /video2x RUN apt-get install -y --no-install-recommends \ python3-pip python3-dev \ - python3-opencv python3-pil python3-tqdm \ + python3-opencv python3-pil \ mesa-vulkan-drivers ffmpeg \ && pip install --no-cache-dir --no-index -f /wheels . \ && apt-get clean \ diff --git a/NOTICE b/NOTICE index 311dc51..c089022 100644 --- a/NOTICE +++ b/NOTICE @@ -41,8 +41,3 @@ https://github.com/python-pillow/Pillow. This product depends on Rich, which is available under the MIT License. The source code can be found at https://github.com/Textualize/rich. - -This product depends on tqdm, which is available under -the Mozilla Public License Version 2.0 and the MIT License. -The source code can be found at -https://github.com/tqdm/tqdm. diff --git a/README.md b/README.md index e4a58fb..e9f7d52 100644 --- a/README.md +++ b/README.md @@ -82,29 +82,29 @@ Copyright (c) 2018-2022 K4YT3X and contributors. This project includes or depends on these following projects: -| Project | License | -| ------------------------------------------------------------------- | -------------------- | -| [FFmpeg](https://www.ffmpeg.org/) | LGPLv2.1, GPLv2 | -| [waifu2x-ncnn-vulkan](https://github.com/nihui/waifu2x-ncnn-vulkan) | MIT License | -| [srmd-ncnn-vulkan](https://github.com/nihui/srmd-ncnn-vulkan) | MIT License | -| [realsr-ncnn-vulkan](https://github.com/nihui/realsr-ncnn-vulkan) | MIT License | -| [rife-ncnn-vulkan](https://github.com/nihui/rife-ncnn-vulkan) | MIT License | -| [ffmpeg-python](https://github.com/kkroening/ffmpeg-python) | Apache-2.0 | -| [Loguru](https://github.com/Delgan/loguru) | MIT License | -| [opencv-python](https://github.com/opencv/opencv-python) | MIT License | -| [Pillow](https://github.com/python-pillow/Pillow) | HPND License | -| [Rich](https://github.com/Textualize/rich) | MIT License | -| [tqdm](https://github.com/tqdm/tqdm) | MPLv2.0, MIT License | +| Project | License | +| ------------------------------------------------------------------- | --------------- | +| [FFmpeg](https://www.ffmpeg.org/) | LGPLv2.1, GPLv2 | +| [waifu2x-ncnn-vulkan](https://github.com/nihui/waifu2x-ncnn-vulkan) | MIT License | +| [srmd-ncnn-vulkan](https://github.com/nihui/srmd-ncnn-vulkan) | MIT License | +| [realsr-ncnn-vulkan](https://github.com/nihui/realsr-ncnn-vulkan) | MIT License | +| [rife-ncnn-vulkan](https://github.com/nihui/rife-ncnn-vulkan) | MIT License | +| [ffmpeg-python](https://github.com/kkroening/ffmpeg-python) | Apache-2.0 | +| [Loguru](https://github.com/Delgan/loguru) | MIT License | +| [opencv-python](https://github.com/opencv/opencv-python) | MIT License | +| [Pillow](https://github.com/python-pillow/Pillow) | HPND License | +| [Rich](https://github.com/Textualize/rich) | MIT License | Legacy versions of this project includes or depends on these following projects: -| Project | License | -| --------------------------------------------------------------------------- | ----------- | -| [waifu2x-caffe](https://github.com/lltcggie/waifu2x-caffe) | MIT License | -| [waifu2x-converter-cpp](https://github.com/DeadSix27/waifu2x-converter-cpp) | MIT License | -| [Anime4K](https://github.com/bloc97/Anime4K) | MIT License | -| [Anime4KCPP](https://github.com/TianZerL/Anime4KCPP) | MIT License | -| [Gifski](https://github.com/ImageOptim/gifski) | AGPLv3 | +| Project | License | +| --------------------------------------------------------------------------- | -------------------- | +| [waifu2x-caffe](https://github.com/lltcggie/waifu2x-caffe) | MIT License | +| [waifu2x-converter-cpp](https://github.com/DeadSix27/waifu2x-converter-cpp) | MIT License | +| [Anime4K](https://github.com/bloc97/Anime4K) | MIT License | +| [Anime4KCPP](https://github.com/TianZerL/Anime4KCPP) | MIT License | +| [Gifski](https://github.com/ImageOptim/gifski) | AGPLv3 | +| [tqdm](https://github.com/tqdm/tqdm) | MPLv2.0, MIT License | More licensing information can be found in the [NOTICES](NOTICES) file. diff --git a/licenses/LICENSE-tqdm b/licenses/LICENSE-tqdm deleted file mode 100644 index 5b3cab7..0000000 --- a/licenses/LICENSE-tqdm +++ /dev/null @@ -1,49 +0,0 @@ -`tqdm` is a product of collaborative work. -Unless otherwise stated, all authors (see commit logs) retain copyright -for their respective work, and release the work under the MIT licence -(text below). - -Exceptions or notable authors are listed below -in reverse chronological order: - -* files: * - MPLv2.0 2015-2021 (c) Casper da Costa-Luis - [casperdcl](https://github.com/casperdcl). -* files: tqdm/_tqdm.py - MIT 2016 (c) [PR #96] on behalf of Google Inc. -* files: tqdm/_tqdm.py setup.py README.rst MANIFEST.in .gitignore - MIT 2013 (c) Noam Yorav-Raphael, original author. - -[PR #96]: https://github.com/tqdm/tqdm/pull/96 - - -Mozilla Public Licence (MPL) v. 2.0 - Exhibit A ------------------------------------------------ - -This Source Code Form is subject to the terms of the -Mozilla Public License, v. 2.0. -If a copy of the MPL was not distributed with this project, -You can obtain one at https://mozilla.org/MPL/2.0/. - - -MIT License (MIT) ------------------ - -Copyright (c) 2013 noamraph - -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. diff --git a/setup.cfg b/setup.cfg index 6920b05..14f3ea1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ # Name: Video2X PyPI setup file # Creator: K4YT3X # Date Created: June 17, 2021 -# Last Modified: February 11, 2022 +# Last Modified: February 12, 2022 # build & publish commands # pip install --user -U setuptools wheel twine build @@ -39,7 +39,6 @@ install_requires = opencv-python pillow rich - tqdm realsr-ncnn-vulkan-python rife-ncnn-vulkan-python srmd-ncnn-vulkan-python diff --git a/video2x/requirements.txt b/video2x/requirements.txt deleted file mode 100644 index 5b9344b..0000000 --- a/video2x/requirements.txt +++ /dev/null @@ -1,13 +0,0 @@ -# *-ncnn-vulkan driver backends -realsr-ncnn-vulkan-python -rife-ncnn-vulkan-python -srmd-ncnn-vulkan-python -waifu2x-ncnn-vulkan-python - -# regular Python packages from PyPI -ffmpeg-python -loguru -opencv-python -pillow -rich -tqdm