Skip to content

Commit bbaebe4

Browse files
authored
Merge pull request #35 from python-ellar/requirement_fix
rearrangement lib dependencies
2 parents 1c4f82a + 6eb09eb commit bbaebe4

File tree

7 files changed

+20
-22
lines changed

7 files changed

+20
-22
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_jwt tests
4242
- name: mypy

Makefile

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

1414
install: ## Install dependencies
15-
flit install --deps develop --symlink
15+
pip install -r requirements.txt
16+
flit install --symlink
1617

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

pyproject.toml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,29 +45,14 @@ dependencies = [
4545
"pyjwt[crypto]"
4646
]
4747

48-
crypto = [
49-
"cryptography>=3.3.1",
50-
]
51-
52-
dev = [
53-
"pre-commit"
54-
]
55-
5648
[project.urls]
5749
Documentation = "https://github.com/python-ellar/ellar-jwt"
5850
Source = "https://github.com/python-ellar/ellar-jwt"
5951
Homepage = "https://python-ellar.github.io/ellar-jwt/"
6052

6153
[project.optional-dependencies]
62-
test = [
63-
"pytest >= 7.1.3,< 9.0.0",
64-
"pytest-cov >= 2.12.0,<5.0.0",
65-
"mypy == 1.8.0",
66-
"ruff ==0.3.0",
67-
"pytest-asyncio",
68-
"autoflake",
69-
"types-python-dateutil",
70-
"types-pytz"
54+
crypto = [
55+
"cryptography>=3.3.1"
7156
]
7257

7358
[tool.ruff]

requirements-tests.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
autoflake
2+
mypy == 1.8.0
3+
pytest >= 7.1.3,<8.0.0
4+
pytest-asyncio
5+
pytest-cov >= 2.12.0,<5.0.0
6+
ruff ==0.3.0
7+
types-python-dateutil
8+
types-pytz

requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-e .[crypto]
2+
-r requirements-tests.txt
3+
4+
pre-commit

0 commit comments

Comments
 (0)