Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/python.yml
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this file, the test step has a small issue. The run block for pytest contains two separate commands, which will cause the entire test suite to run twice.

The first pytest command should be removed, leaving only the one with the --ignore-glob flag.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v3
Expand All @@ -35,4 +35,4 @@ jobs:
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
pytest
pytest --ignore-glob="*api.py"
5 changes: 1 addition & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ stages:
script:
- pip install -r requirements.txt
- pip install -r test-requirements.txt
- pytest --cov=lighter
- pytest --cov=lighter --ignore-glob *api.py

pytest-3.7:
extends: .pytest
image: python:3.7-alpine
pytest-3.8:
extends: .pytest
image: python:3.8-alpine
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# ref: https://docs.travis-ci.com/user/languages/python
language: python
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ include = ["lighter/py.typed"]
python = ["lighter"]

[tool.poetry.dependencies]
python = "^3.7"
python = "^3.8"

urllib3 = ">= 1.25.3"
python-dateutil = ">=2.8.2"
aiohttp = ">= 3.8.4"
aiohttp-retry = ">= 2.8.3"
pydantic = ">=2"
typing-extensions = ">=4.7.1"
websockets = ">= 12.0.0"
eth-account = ">=0.13.4"

[tool.poetry.dev-dependencies]
pytest = ">=7.2.1"
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The eth-account package is missing from this file. It was added to pyproject.toml but not here.

This inconsistency can cause installation errors for environments that rely on requirements.txt. Please add the package to this file as well to keep the dependencies in sync.

Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ pydantic >= 2
typing-extensions >= 4.7.1
aiohttp >= 3.0.0
aiohttp-retry >= 2.8.3
websockets >= 12.0.0
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
"aiohttp-retry >= 2.8.3",
"pydantic >= 2",
"typing-extensions >= 4.7.1",
"websockets >= 12.0.0"
"eth-account >= 0.13.4"
]

setup(
Expand Down
2 changes: 2 additions & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ pytest-cov>=2.8.1
pytest-randomly>=3.12.0
mypy>=1.4.1
types-python-dateutil>=2.8.19
eth-account>=0.13.4

2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ deps=-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt

commands=
pytest --cov=lighter
pytest --cov=lighter --ignore-glob *api.py