From 8ce0c26e9a61eda5770ee23a3f9a23d883519e4b Mon Sep 17 00:00:00 2001 From: TLu Date: Fri, 20 Dec 2024 21:41:46 +0100 Subject: [PATCH] it works --- CHANGES.md | 2 +- README.md | 13 +++++++------ setup.py | 27 +++++++++++++++++---------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ffd57e9..881a5f9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,7 +2,7 @@ ## 2024 -5.1.3 get screenshost from clopboard on Linux, MacOS and Windows. Linux and BSD users - please install xclip +5.1.3 get screenshost from clipboard and copy result into clipboard. Linux and BSD users - please install xclip 5.1.2 fixed: compose and crop, updated italian translation, less duplicates, require Python 3.10+ diff --git a/README.md b/README.md index 902362c..96eba47 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,8 @@ If ImageMagick or Wand are unavailable, Pillow is in use. There some limitation, - processing JPG, PNG, SVG and TIFF images, - processing picture in the fly, originals are safe, - processing single file or whole directory, - - take screenshot (Linux) or get picture from clipboard (Windows and MacOS) and use it as source picture, - - after processing results is copied into clipboard (Windows and MacOS), + - get picture from clipboard and use it as source picture, + - after processing results is copied into clipboard, - display selected tools, - tools selection, - preview orignal and result, @@ -140,13 +140,13 @@ Download and install requirements: - [ImageMagick](https://imagemagick.org/script/download.php#windows) - add path into `%PATH%` environment variable, enable install libraries! ```bash -python -m pip install pywin32 fotokilof +python -m pip install fotokilof ``` #### MacOS Install requirements: ```bash -brew install imagemagick python@3.12 python-tk@3.12 +brew install imagemagick python@3.13 python-tk@3.13 ``` For Apple Silicon (M1, M2, M3) based Macs, the default Homebrew install directory differs from that on Homebrew Intel installs. The following environment variable allows FotoKilof to correctly locate the Homebrew-installed ImageMagick on Apple Silicon Macs: @@ -215,5 +215,6 @@ Press F2 to toggle from Light to Dark or opposite. ![Python powered](python-powered.png) [Imagemagick](https://github.com/ImageMagick/ImageMagick) [Wand](https://github.com/emcconville/wand) -[ttkbootstrap](https://github.com/israel-dryer/ttkbootstrap) - +[ttkbootstrap](https://github.com/israel-dryer/ttkbootstrap) +[FindSystemFontsFilename](https://github.com/moi15moi/FindSystemFontsFilename) +[Pillow](https://github.com/python-pillow/Pillow) diff --git a/setup.py b/setup.py index a933640..cd423af 100644 --- a/setup.py +++ b/setup.py @@ -9,13 +9,13 @@ with open("fotokilof/version.py") as fp: exec(fp.read(), pkg_vars) setup( - name=pkg_vars['__appname__'], - version=pkg_vars['__version__'], - author=pkg_vars['__author__'], - author_email=pkg_vars['__email__'], - description=pkg_vars['__description__'], - keywords=pkg_vars['__keywords__'], - url=pkg_vars['__url__'], + name=pkg_vars["__appname__"], + version=pkg_vars["__version__"], + author=pkg_vars["__author__"], + author_email=pkg_vars["__email__"], + description=pkg_vars["__description__"], + keywords=pkg_vars["__keywords__"], + url=pkg_vars["__url__"], long_description=long_description, long_description_content_type="text/markdown", license="MIT", @@ -25,11 +25,18 @@ "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", ], - python_requires='>=3.10', + python_requires=">=3.10", include_package_data=True, packages=find_packages(), - install_requires=['FindSystemFontsFilename','pillow','requests','ttkbootstrap','wand'], - entry_points = { + install_requires=[ + "FindSystemFontsFilename", + "pillow", + "requests", + "ttkbootstrap", + "wand", + 'pywin32;platform_system=="Windows"', + ], + entry_points={ "gui_scripts": [ "fotokilof = fotokilof:__main__", ]