rearrangement lib dependencies

eadwinCode · eadwinCode · commit 31adab1a4946 · 2024-03-02T23:28:15.000+01:00
diff --git a/.github/workflows/publish.yml b/.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
diff --git a/.github/workflows/test.yml b/.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
diff --git a/.github/workflows/test_full.yml b/.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: Linting check
         run: ruff check ellar_sql tests
       - name: mypy
diff --git a/Makefile b/Makefile
@@ -13,7 +13,8 @@ clean: ## Removing cached python compiled files
 	find . -name .ruff_cache  | 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
diff --git a/pyproject.toml b/pyproject.toml
@@ -37,40 +37,12 @@ dependencies = [
     "alembic >= 1.10.0"
 ]
 
-dev = [
-    "pre-commit"
-]
-doc = [
-    "mkdocs >=1.1.2,<2.0.0",
-    "mkdocs-material >=7.1.9,<10.0.0",
-    "mdx-include >=1.4.1,<2.0.0",
-    "mkdocs-markdownextradata-plugin >=0.1.7,<0.3.0",
-    "markdown-include",
-    "mkdocstrings",
-    "mkdocs-minify-plugin",
-    "mkdocs-git-revision-date-localized-plugin"
-]
-
 [project.urls]
 Documentation = "https://github.com/python-ellar/ellar-sql"
 Source = "https://github.com/python-ellar/ellar-sql"
 Homepage = "https://python-ellar.github.io/ellar-sql/"
 "Bug Tracker" = "https://github.com/python-ellar/ellar-sql/issues"
 
-[project.optional-dependencies]
-test = [
-    "pytest >= 7.1.3,< 9.0.0",
-    "pytest-cov >= 2.12.0,<5.0.0",
-    "pytest-asyncio",
-    "aiosqlite",
-    "anyio[trio] >= 3.2.1",
-    "ruff ==0.3.0",
-    "mypy == 1.8.0",
-    "autoflake",
-    "ellar-cli >= 0.3.3",
-    "factory-boy >= 3.3.0"
-]
-
 [tool.ruff]
 select = [
     "E",  # pycodestyle errors
diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -0,0 +1,8 @@
+markdown-include
+mdx-include >=1.4.1,<2.0.0
+mkdocs >=1.1.2,<2.0.0
+mkdocs-git-revision-date-localized-plugin
+mkdocs-markdownextradata-plugin >=0.1.7,<0.3.0
+mkdocs-material >=7.1.9,<10.0.0
+mkdocs-minify-plugin
+mkdocstrings[python] >=0.19.0, <0.25.0
diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -0,0 +1,10 @@
+aiosqlite
+anyio[trio] >= 3.2.1
+autoflake
+ellar-cli >= 0.3.7
+factory-boy >= 3.3.0
+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
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,10 @@
+-e .[all]
+-r requirements-docs.txt
+-r requirements-tests.txt
+
+aiomcache
+
+pre-commit >=2.17.0,<4.0.0
+pylibmc
+pymemcache
+redis
