Starting a refactor of the whole project

BrunoB81HK · Oct 13, 2024 · c8450e3 · c8450e3
1 parent 8350614
commit c8450e3
Show file tree

Hide file tree

Showing 33 changed files with 1,416 additions and 266 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 *.spec
 build/
 dist/
-venv/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,19 @@
+---
+repos:
+  - repo: "https://github.com/pre-commit/pre-commit-hooks"
+    rev: "v4.5.0"
+    hooks:
+      - id: "trailing-whitespace"
+      - id: "end-of-file-fixer"
+      - id: "check-toml"
+  - repo: "https://github.com/astral-sh/ruff-pre-commit"
+    rev: "v0.2.1"
+    hooks:
+      - id: "ruff"
+        types_or:
+          - "python"
+        args:
+          - "--fix"
+      - id: "ruff-format"
+        types_or:
+          - "python"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,4 +57,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [2.0] - 2020-09-04
 
-- Changed the entirety of the user interface.
+- Changed the entirety of the user interface.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -671,4 +671,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/resources/icon.ico → assets/icon.ico b/resources/icon.ico → assets/icon.ico
diff --git a/resources/icon.png → assets/icon.png b/resources/icon.png → assets/icon.png
diff --git a/resources/placeholder.png → assets/placeholder.png b/resources/placeholder.png → assets/placeholder.png
diff --git a/assets/source/icon.xcf b/assets/source/icon.xcf
diff --git a/resources/originalGraph.png → assets/source/original_graph.png b/resources/originalGraph.png → assets/source/original_graph.png
diff --git a/assets/source/splash.xcf b/assets/source/splash.xcf
diff --git a/assets/splash.png b/assets/splash.png
diff --git a/build.py b/build.py
diff --git a/curvefinder.py b/curvefinder.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -2,8 +2,11 @@
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/curve_extractor"]
+
 [project]
-name = "CurveExtractor"
+name = "curve_extractor"
 version = "3.0"
 description = "Simple app to let you extract the equations from a graph"
 readme = "README.md"
@@ -25,14 +28,19 @@ dependencies = [
 ]
 requires-python = ">=3.10"
 license = { file = "LICENSE.txt" }
-keywords = ["curve", "extractor", "finder", "equation"]
+keywords = ["curve", "equation", "extractor", "finder"]
 classifiers = ["Programming Language :: Python"]
 
 [project.optional-dependencies]
-gui = ["PyQt5"]
-cli = ["rich", "click"]
+dev = ["ruff", "pre-commit"]
 
 [project.urls]
 Repository = "https://github.com/BrunoB81HK/CurveExtractor.git"
 "Bug Tracker" = "https://github.com/BrunoB81HK/CurveExtractor/issues"
 Changelog = "https://github.com/BrunoB81HK/CurveExtractor/blob/master/CHANGELOG.md"
+
+[project.scripts]
+ce_cli = "curve_extractor.cli:main"
+
+[project.gui-scripts]
+curve_extractor = "curve_extractor.main:main"
diff --git a/resources/icon.xcf b/resources/icon.xcf
diff --git a/resources/splash.png b/resources/splash.png
diff --git a/resources/splash.xcf b/resources/splash.xcf
diff --git a/QCurveFinder/__init__.py → src/curve_extractor/__init__.py b/QCurveFinder/__init__.py → src/curve_extractor/__init__.py
diff --git a/src/curve_extractor/__pycache__/__init__.cpython-311.pyc b/src/curve_extractor/__pycache__/__init__.cpython-311.pyc
diff --git a/src/curve_extractor/__pycache__/cli.cpython-311.pyc b/src/curve_extractor/__pycache__/cli.cpython-311.pyc
diff --git a/src/curve_extractor/__pycache__/constants.cpython-311.pyc b/src/curve_extractor/__pycache__/constants.cpython-311.pyc
diff --git a/src/curve_extractor/__pycache__/main.cpython-311.pyc b/src/curve_extractor/__pycache__/main.cpython-311.pyc
diff --git a/src/curve_extractor/app.py b/src/curve_extractor/app.py
-Original file line number
+Diff line change
@@ -1,4 +1,3 @@
     *.spec
     build/
     dist/
-    venv/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -57,4 +57,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

		## [2.0] - 2020-09-04

		- Changed the entirety of the user interface.
		- Changed the entirety of the user interface.