Skip to content

Commit

Permalink
Fixes based on feedbacks
Browse files Browse the repository at this point in the history
  • Loading branch information
alifbe committed Nov 24, 2023
1 parent 94de58a commit 4c3fdfb
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pyscal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Lint with black
if: ${{ always() }}
run: |
black --check --force-exclude="pyscal/version.py" pyscal/*py tests/test_*py docs/conf.py
black --check --force-exclude="pyscal/version.py" pyscal tests docs
- name: Lint with flake8
if: ${{ always() }}
Expand All @@ -79,7 +79,7 @@ jobs:
- name: Run tests
run: |
python -c "import pyscal"
pytest --strict-markers --hypothesis-profile ci tests/
pytest -n auto --strict-markers --hypothesis-profile ci tests/
- name: Syntax check documentation
run: |
Expand Down
38 changes: 17 additions & 21 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
requires = [
"setuptools>=45.0",
"setuptools_scm[toml]>=6.2",
"wheel>=0.38.1",
]

build-backend = "setuptools.build_meta"
Expand Down Expand Up @@ -51,21 +50,16 @@ dependencies = [

[project.optional-dependencies]
tests = [
"autoapi",
"black",
"flake8",
"hypothesis",
"isort",
"mypy",
"pre-commit",
"pytest",
"pytest-cov",
"pytest-mock",
"rstcheck",
"sphinx<7",
"sphinx-argparse",
"sphinx-autodoc-typehints",
"sphinx_rtd_theme",
"black",
"flake8",
"hypothesis",
"isort",
"mypy",
"pytest",
"pytest-cov",
"pytest-mock",
"pytest-xdist",
"rstcheck",
]

docs = [
Expand All @@ -77,9 +71,9 @@ docs = [
]

[project.urls]
homepage = "https://github.com/equinor/pyscal"
documentation = "https://equinor.github.io/pyscal/"
repository = "https://github.com/equinor/pyscal"
Homepage = "https://github.com/equinor/pyscal"
Documentation = "https://equinor.github.io/pyscal/"
Repository = "https://github.com/equinor/pyscal"

[project.scripts]
pyscal = "pyscal.pyscalcli:main"
Expand All @@ -91,7 +85,9 @@ line-length = 88
profile = "black"
skip = "pyscal/__init__.py"

[tool.mypy]
[[tool.mypy.overrides]]
module = ["numpy.*", "pyscal.version", "pandas.*", "matplotlib.*", "scipy.*", "xlrd.*", "openpyxl.*"
]
ignore_missing_imports = true

[tool.pylint]
Expand All @@ -105,7 +101,7 @@ norecursedirs = [
]
xfail_strict = "True"

addopts = "-ra --strict-markers --ignore=docs/conf.py --ignore=setup.py --ignore=.eggs"
addopts = "-ra --strict-markers --ignore=docs/conf.py --ignore=.eggs"

markers = [
"integration: marks a test as an integration test",
Expand Down
5 changes: 1 addition & 4 deletions pyscal/utils/string.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@ def df2str(
dframe = modify_dframe_monotonicity(dframe, monotonicity, digits)

return dframe.round(roundlevel).to_csv(
sep=" ",
float_format=float_format,
header=header,
index=False
sep=" ", float_format=float_format, header=header, index=False
)


Expand Down

0 comments on commit 4c3fdfb

Please sign in to comment.