Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove tox #622

Merged
merged 2 commits into from
Jun 11, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on: [pull_request]

jobs:
lint:
name: Linting through tox
name: Linting through pre-commit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.12"
- name: Install tox
run: pip install tox
- name: Run style
run: tox -e style
- name: Install semeio with style deps
run: pip install ".[style]"
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure
8 changes: 4 additions & 4 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
with:
python-version: "${{ matrix.python-version }}"

- name: "Install dependencies"
run: python -m pip install tox tox-gh-actions
- name: Install test dependencies
run: pip install ".[test]"

- name: "Run tox targets on ${{ matrix.os }} for ${{ matrix.python-version }}"
run: "python -m tox"
- name: "Run tests"
run: pytest tests -n logical --durations 5 --ert-integration
2 changes: 1 addition & 1 deletion .github/workflows/typing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install semeio and dependencies
run: |
pip install ".[test]"
pip install ".[types]"
- name: Run mypy
run: |
mypy src/semeio
3 changes: 0 additions & 3 deletions .mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ ignore_missing_imports = True
[mypy-fmu.*]
ignore_missing_imports = True

[mypy-configsuite.*]
ignore_missing_imports = True

[mypy-segyio.*]
ignore_missing_imports = True

Expand Down
8 changes: 0 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,4 @@ repos:
args: [ --fix ]
- id: ruff-format

- repo: local
hooks:
- id: pylint
name: pylint
language: system
types: [python]
entry: "python -m pylint"

exclude: ".*snapshots/"
Loading