Merge pull request #77 from python-ellar/package_fix

rearrangement lib dependencies

Author: eadwinCode

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Install build dependencies
         run: pip install build
       - name: Build distribution

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Test
         run: make test-cov
       - name: Coverage

.github/workflows/test_full.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Test
         run: pytest tests
 
@@ -36,7 +36,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Ruff linting check
         run: ruff check ellar_cli tests
       - name: mypy

Makefile

@@ -11,7 +11,8 @@ clean: ## Removing cached python compiled files
 	find . -name __pycache__  | xargs  rm -rfv
 
 install: ## Install dependencies
-	flit install --deps develop --symlink
+	pip install -r requirements.txt
+	flit install --symlink
 
 install-full: ## Install dependencies
 	make install

pyproject.toml

@@ -44,6 +44,7 @@ dependencies = [
     "tomlkit >=0.11.1,<1.0.0,!=0.11.2,!=0.11.3",
     "uvicorn[standard] == 0.27.1",
     "ellar >= 0.7.1",
+    "click >= 8.1.7",
 ]
 
 [project.scripts]
@@ -54,19 +55,6 @@ Documentation = "https://github.com/python-ellar/ellar-cli"
 Source = "https://github.com/python-ellar/ellar-cli"
 Homepage = "https://python-ellar.github.io/ellar-cli/"
 
-[project.optional-dependencies]
-test = [
-    "pytest >=7.1.3,<9.0.0",
-    "pytest-cov >=2.12.0,<5.0.0",
-    "mypy == 1.8.0",
-    "ruff ==0.3.0",
-    "pytest-asyncio",
-    "autoflake",
-]
-dev = [
-    "pre-commit"
-]
-
 [tool.ruff]
 select = [
     "E",  # pycodestyle errors

requirements-tests.txt

@@ -0,0 +1,6 @@
+autoflake
+mypy == 1.8.0
+pytest >=7.1.3,<9.0.0
+pytest-asyncio
+pytest-cov >=2.12.0,<5.0.0
+ruff ==0.3.0

requirements.txt

@@ -0,0 +1,4 @@
+-e .
+-r requirements-tests.txt
+
+pre-commit >=2.17.0,<4.0.0