From 966473b3f1efa5f3307b44c7dcc62d856baca2fa Mon Sep 17 00:00:00 2001
From: ful1e5 <24286590+ful1e5@users.noreply.github.com>
Date: Wed, 30 Jun 2021 18:16:13 +0530
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20remove=20setup.py=20from=20`buil?=
 =?UTF-8?q?der`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                          | 15 ++++-----------
 builder/Makefile                    | 13 +++----------
 builder/build.py                    |  4 ++--
 builder/setup.py                    | 22 ----------------------
 builder/{bbpkg => src}/__init__.py  |  0
 builder/{bbpkg => src}/configure.py |  2 +-
 builder/{bbpkg => src}/constants.py |  0
 builder/{bbpkg => src}/generator.py |  5 +++--
 builder/{bbpkg => src}/symlinks.py  |  0
 9 files changed, 13 insertions(+), 48 deletions(-)
 delete mode 100644 builder/setup.py
 rename builder/{bbpkg => src}/__init__.py (100%)
 rename builder/{bbpkg => src}/configure.py (96%)
 rename builder/{bbpkg => src}/constants.py (100%)
 rename builder/{bbpkg => src}/generator.py (98%)
 rename builder/{bbpkg => src}/symlinks.py (100%)

diff --git a/.gitignore b/.gitignore
index eae3e687..109e4b4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,9 @@
-########## Custom
-# Out Dir
+# --------------------------------------------- Custom
 bitmaps
 themes
-test.py
+bin
 
-# Logs Files
-builder/files.txt
-
-# Extra
-.vscode
-
-########## Python
+# --------------------------------------------- Python
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -143,7 +136,7 @@ dmypy.json
 .pyre/
 
 
-######### Node
+# --------------------------------------------- Nodejs
 
 # Logs
 logs
diff --git a/builder/Makefile b/builder/Makefile
index f4210675..5dca9da5 100644
--- a/builder/Makefile
+++ b/builder/Makefile
@@ -13,17 +13,10 @@ WIN_CANVAS_SIZE ?= 32
 WIN_SIZE ?= 24
 
 clean:
-	@rm -rf bbpkg.egg-info build dist
-	@find -iname "*.pyc" -delete
-	# Removing setup.py package files if installed
-	@if [ -f "files.txt" ]; then
-		@xargs rm -rf < files.txt
-		@rm -rf files.txt
-	@fi
-
-setup: setup.py
-	@python3 setup.py install --user --record files.txt
+	@rm -rf src/__pycache__
 
+setup:
+	@python3 -m pip install clickgen --user
 
 build: build_modern build_original
 
diff --git a/builder/build.py b/builder/build.py
index d7fe7c9a..d99fb8bc 100644
--- a/builder/build.py
+++ b/builder/build.py
@@ -4,8 +4,8 @@
 import argparse
 from pathlib import Path
 
-from bbpkg.configure import get_config
-from bbpkg.generator import Info, xbuild, wbuild, build
+from src.configure import get_config
+from src.generator import Info, xbuild, wbuild, build
 
 
 parser = argparse.ArgumentParser(
diff --git a/builder/setup.py b/builder/setup.py
deleted file mode 100644
index 119a7e7c..00000000
--- a/builder/setup.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from setuptools import setup
-
-setup(
-    name="bbpkg",
-    version="1.1.1",
-    description="Generate 'Bibata' cursor theme from PNGs file",
-    url="https://github.com/ful1e5/Bibata_Cursor",
-    packages=["bbpkg"],
-    package_dir={"bbpkg": "bbpkg"},
-    author="Kaiz Khatri",
-    author_email="kaizmandhu@gamil.com",
-    install_requires=["clickgen==1.1.9"],
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-    ],
-    python_requires=">=3.8",
-    zip_safe=True,
-)
diff --git a/builder/bbpkg/__init__.py b/builder/src/__init__.py
similarity index 100%
rename from builder/bbpkg/__init__.py
rename to builder/src/__init__.py
diff --git a/builder/bbpkg/configure.py b/builder/src/configure.py
similarity index 96%
rename from builder/bbpkg/configure.py
rename to builder/src/configure.py
index 44461f1c..f46d0fd1 100644
--- a/builder/bbpkg/configure.py
+++ b/builder/src/configure.py
@@ -6,7 +6,7 @@ from typing import Any, Dict, Tuple, TypeVar, Union
 
 from clickgen.util import PNGProvider
 
-from bbpkg.constants import WIN_CURSORS_CFG, WIN_DELAY, X_CURSORS_CFG, X_DELAY
+from .constants import WIN_CURSORS_CFG, WIN_DELAY, X_CURSORS_CFG, X_DELAY
 
 
 X = TypeVar("X")
diff --git a/builder/bbpkg/constants.py b/builder/src/constants.py
similarity index 100%
rename from builder/bbpkg/constants.py
rename to builder/src/constants.py
diff --git a/builder/bbpkg/generator.py b/builder/src/generator.py
similarity index 98%
rename from builder/bbpkg/generator.py
rename to builder/src/generator.py
index e2d4ed91..f4dfcd04 100644
--- a/builder/bbpkg/generator.py
+++ b/builder/src/generator.py
@@ -4,12 +4,13 @@
 from pathlib import Path
 from typing import Any, Dict, NamedTuple
 
-from bbpkg.constants import AUTHOR, URL
-from bbpkg.symlinks import add_missing_xcursor
 from clickgen.builders import WindowsCursor, XCursor
 from clickgen.core import CursorAlias
 from clickgen.packagers import WindowsPackager, XPackager
 
+from .constants import AUTHOR, URL
+from .symlinks import add_missing_xcursor
+
 
 class Info(NamedTuple):
     """Important cursor package's information field"""
diff --git a/builder/bbpkg/symlinks.py b/builder/src/symlinks.py
similarity index 100%
rename from builder/bbpkg/symlinks.py
rename to builder/src/symlinks.py