Skip to content

Commit 31adab1

Browse files
committed
rearrangement lib dependencies
1 parent b667a9b commit 31adab1

File tree

8 files changed

+34
-33
lines changed

8 files changed

+34
-33
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install Flit
1818
run: pip install flit
1919
- name: Install Dependencies
20-
run: flit install --symlink
20+
run: make install
2121
- name: Install build dependencies
2222
run: pip install build
2323
- name: Build distribution

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Install Flit
1919
run: pip install flit
2020
- name: Install Dependencies
21-
run: flit install --symlink
21+
run: make install
2222
- name: Test
2323
run: make test-cov
2424
- name: Coverage

.github/workflows/test_full.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Install Flit
2222
run: pip install flit
2323
- name: Install Dependencies
24-
run: flit install --symlink
24+
run: make install
2525
- name: Test
2626
run: pytest tests
2727

@@ -36,7 +36,7 @@ jobs:
3636
- name: Install Flit
3737
run: pip install flit
3838
- name: Install Dependencies
39-
run: flit install --symlink
39+
run: make install
4040
- name: Linting check
4141
run: ruff check ellar_sql tests
4242
- name: mypy

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ clean: ## Removing cached python compiled files
1313
find . -name .ruff_cache | xargs rm -rfv
1414

1515
install: ## Install dependencies
16-
flit install --deps develop --symlink
16+
pip install -r requirements.txt
17+
flit install --symlink
1718

1819
install-full: ## Install dependencies
1920
make install

pyproject.toml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,40 +37,12 @@ dependencies = [
3737
"alembic >= 1.10.0"
3838
]
3939

40-
dev = [
41-
"pre-commit"
42-
]
43-
doc = [
44-
"mkdocs >=1.1.2,<2.0.0",
45-
"mkdocs-material >=7.1.9,<10.0.0",
46-
"mdx-include >=1.4.1,<2.0.0",
47-
"mkdocs-markdownextradata-plugin >=0.1.7,<0.3.0",
48-
"markdown-include",
49-
"mkdocstrings",
50-
"mkdocs-minify-plugin",
51-
"mkdocs-git-revision-date-localized-plugin"
52-
]
53-
5440
[project.urls]
5541
Documentation = "https://github.com/python-ellar/ellar-sql"
5642
Source = "https://github.com/python-ellar/ellar-sql"
5743
Homepage = "https://python-ellar.github.io/ellar-sql/"
5844
"Bug Tracker" = "https://github.com/python-ellar/ellar-sql/issues"
5945

60-
[project.optional-dependencies]
61-
test = [
62-
"pytest >= 7.1.3,< 9.0.0",
63-
"pytest-cov >= 2.12.0,<5.0.0",
64-
"pytest-asyncio",
65-
"aiosqlite",
66-
"anyio[trio] >= 3.2.1",
67-
"ruff ==0.3.0",
68-
"mypy == 1.8.0",
69-
"autoflake",
70-
"ellar-cli >= 0.3.3",
71-
"factory-boy >= 3.3.0"
72-
]
73-
7446
[tool.ruff]
7547
select = [
7648
"E", # pycodestyle errors

requirements-docs.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
markdown-include
2+
mdx-include >=1.4.1,<2.0.0
3+
mkdocs >=1.1.2,<2.0.0
4+
mkdocs-git-revision-date-localized-plugin
5+
mkdocs-markdownextradata-plugin >=0.1.7,<0.3.0
6+
mkdocs-material >=7.1.9,<10.0.0
7+
mkdocs-minify-plugin
8+
mkdocstrings[python] >=0.19.0, <0.25.0

requirements-tests.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
aiosqlite
2+
anyio[trio] >= 3.2.1
3+
autoflake
4+
ellar-cli >= 0.3.7
5+
factory-boy >= 3.3.0
6+
mypy == 1.8.0
7+
pytest >= 7.1.3,< 9.0.0
8+
pytest-asyncio
9+
pytest-cov >= 2.12.0,<5.0.0
10+
ruff ==0.3.0

requirements.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
-e .[all]
2+
-r requirements-docs.txt
3+
-r requirements-tests.txt
4+
5+
aiomcache
6+
7+
pre-commit >=2.17.0,<4.0.0
8+
pylibmc
9+
pymemcache
10+
redis

0 commit comments

Comments
 (0)