Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/pyside6-lte-6.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ab5424 committed May 23, 2024
2 parents 051041b + 4b8ff27 commit 78504fb
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 40 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Lint

on: [push]

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -10,22 +13,20 @@ jobs:
python-version: ["3.9", "3.11"]
steps:
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: pip
cache-dependency-path: requirements-dev.txt

- name: Install dependencies
run: |
pip install -r requirements-dev.txt
pip install ruff
pip install ruff mypy --upgrade
- name: ruff
run: |
ruff check .
ruff format --check .
- name: mypy
run: |
mypy --version
rm -rf .mypy_cache
mypy $(find . -name "*.py" | xargs)
run: mypy ${{ github.event.repository.name }}
16 changes: 0 additions & 16 deletions .mypy.ini

This file was deleted.

5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "0.0.3"
description = "Analysis tool for simulations of grain boundaries and interfaces"
authors = [{name = "Alexander Bonkowski", email = "[email protected]"}]
maintainers = [{name = "Alexander Bonkowski"}]
dependencies = ["numpy", "pandas", "scipy"]
dependencies = ["numpy", "pandas", "scipy", "seaborn"]
requires-python = ">=3.8"
readme = "README.md"
license = {file = "LICENSE"}
Expand Down Expand Up @@ -77,6 +77,9 @@ lint.ignore = [
lint.pydocstyle.convention = "google"
lint.isort.required-imports = ["from __future__ import annotations"]

[tool.mypy]
ignore_missing_imports = true

[tool.codespell]
ignore-words-list = """
cna
Expand Down
12 changes: 4 additions & 8 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
ovito
Pyside6<=6.7.0
pymatgen
ase
black
pylint
mypy
ovito
pymatgen
Pyside6<=6.7.0
pytest
data-science-types
pydocstyle
flake8
ruff
11 changes: 4 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
matplotlib
numpy
scipy
coverage
seaborn
pandas
jupyter
numpy==1.26.4
pandas==2.2.2
scipy==1.13.0
seaborn==0.13.2

0 comments on commit 78504fb

Please sign in to comment.