lfp

commit 674077467d1f51ac9b17a24b84d9a3038b3240d5

Author: wallentx <[email protected]>

Date:   Tue Oct 31 16:35:42 2023 -0500

    Remove usage of distutils, fix install from AUR

---

 Makefile                   |  5 ++---

 PKGBUILD                   |  5 ++---

 lfpreviewer/pyproject.toml |  3 +++

 lfpreviewer/setup.py       | 12 ++++++------

 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile

index ac1b8bb..8e0253e 100644

--- a/Makefile

+++ b/Makefile

@@ -35,12 +35,11 @@ all: info

 lfpreviewer:

 	@echo -e "\n\e[1;33m[+]\e[0m Installing ${PREVIEWER}...\n"

-	@rm -rf ${PREVIEWER}/build ${PREVIEWER}/${PREVIEWER}.egg-info ${PREVIEWER}/dist

 	@${QUERY} ${PKGS} || ${INSTALL} ${PKGS}

 	@python3 -m pip install --upgrade pip

 	@python3 -m pip install --upgrade setuptools

-	@cd ${PREVIEWER} && python3 ./setup.py install && cd .. || true

-	@which lfpreviewer >/dev/null 2>&1 || echo -e "\n\e[1;31m[-]\e[0m Please ensure you have sufficient premission to install ${PREVIEWER}."

+	@cd ${PREVIEWER} && pip install . && cd .. || true

+	@which lfpreviewer >/dev/null 2>&1 || echo -e "\n\e[1;31m[-]\e[0m Please ensure you have sufficient permission to install ${PREVIEWER}."

 lfp:

 	@echo -e "\n\e[1;33m[+]\e[0m Installing ${PKG}...\n"

diff --git a/PKGBUILD b/PKGBUILD

index 3dba7a3..aa55b6b 100644

--- a/PKGBUILD

+++ b/PKGBUILD

@@ -8,7 +8,7 @@ license=('MIT')

 arch=('x86_64')

 install="lfp.install"

 url="https://gitlab.com/a4to/lfp"

-depends=(lf zsh ffmpeg graphicsmagick openslide ghostscript bat fzf dunst dialog xsel lolcat python3 python-docopt python-pillow python-attrs libxres python-setuptools)

+depends=(lf zsh ffmpeg graphicsmagick openslide ghostscript bat fzf dunst dialog xsel lolcat python3)

 conflicts=(lfp-git)

 optdepends=(

   'nodejs: to make use of lfps built in node actions manager'

@@ -32,8 +32,7 @@ package() {

   cd "$srcdir/${pkgname}-${pkgver}-${pkgrel}-${arch}/lfpreviewer" ||

   cd "$srcdir/${pkgname}/lfpreviewer"

-  pip3 install --user --upgrade --force-reinstall --no-deps setuptools wheel

-  python3 ./setup.py install --root="$pkgdir" --prefix=/usr --optimize=1

+  pip install . --root="$pkgdir" --prefix=/usr --no-deps

   cd "$srcdir/${pkgname}-${pkgver}-${pkgrel}-${arch}" >/dev/null 2>&1 ||

   cd "$srcdir/${pkgname}"

diff --git a/lfpreviewer/pyproject.toml b/lfpreviewer/pyproject.toml

new file mode 100644

index 0000000..9787c3b

--- /dev/null

+++ b/lfpreviewer/pyproject.toml

@@ -0,0 +1,3 @@

+[build-system]

+requires = ["setuptools", "wheel"]

+build-backend = "setuptools.build_meta"

diff --git a/lfpreviewer/setup.py b/lfpreviewer/setup.py

index 6608b67..3413522 100644

--- a/lfpreviewer/setup.py

+++ b/lfpreviewer/setup.py

@@ -1,9 +1,9 @@

 #!/usr/bin/env python3

-import lfpreviewer

-import distutils.core, setuptools, glob

+import setuptools

+import glob

-distutils.core.setup(

+setuptools.setup(

     name='lfpreviewer',

     version='0.1.0',

     description='Previewer for lfp',

@@ -14,10 +14,10 @@ distutils.core.setup(

     package_data={ '': ['*.sh'] },

     packages=setuptools.find_packages(),

     entry_points={ 'console_scripts': [

-        'lfpreviewer=lfpreviewer.__main__:main' ]

-    },

+        'lfpreviewer=lfpreviewer.__main__:main'

+    ]},

     ext_modules=[

-        distutils.core.Extension( "lfpreviewer.X", glob.glob("lfpreviewer/X/*.c"),

+        setuptools.Extension("lfpreviewer.X", glob.glob("lfpreviewer/X/*.c"),

         libraries=["X11", "Xext", "XRes"], include_dirs=["lfpreviewer/X"]),

     ],

     classifiers=[