Merge a634334 into c55ed28

equinor · Feb 8, 2024 · cf8c8c8 · cf8c8c8
2 parents c55ed28 + a634334
commit cf8c8c8
Show file tree

Hide file tree

Showing 47 changed files with 10 additions and 36 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-pyscal/_version.py export-subst
+src/pyscal/_version.py export-subst
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@main
 
     - name: Setup Python
-      uses: actions/setup-python@main
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
 

diff --git a/.github/workflows/pyscal.yml b/.github/workflows/pyscal.yml
@@ -44,7 +44,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -71,7 +71,7 @@ jobs:
       - name: Check typing with mypy
         if: ${{ always() }}
         run: |
-          mypy ./pyscal
+          mypy src/pyscal
 
       - name: Run tests
         if: ${{ always() }}

diff --git a/.gitignore b/.gitignore
@@ -110,4 +110,4 @@ env*/
 
 # mypy
 .mypy_cache/
-pyscal/version.py
+src/pyscal/version.py
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -55,7 +55,7 @@ Now you can make your changes locally.
   
         ruff check .
         ruff format .
-        mypy ./pyscal
+        mypy src/pyscal
         pytest -n auto
   
 8. Commit your changes and push your branch to GitHub:

diff --git a/docs/make_plots.py b/docs/make_plots.py
@@ -2,7 +2,6 @@
 from pathlib import Path
 
 import matplotlib.pyplot as plt
-
 from pyscal import GasOil, GasWater, WaterOil
 
 IMG_DIR = Path(__file__).absolute().parent / "images"

diff --git a/pyproject.toml b/pyproject.toml
@@ -7,11 +7,8 @@ requires = [
 
 build-backend = "setuptools.build_meta"
 
-[tool.setuptools]
-packages = ["pyscal"]
-
 [tool.setuptools_scm]
-write_to = "pyscal/version.py"
+write_to = "src/pyscal/version.py"
 
 [project]
 name = "pyscal"
@@ -79,7 +76,7 @@ pyscal = "pyscal.pyscalcli:main"
 
 
 [tool.ruff]
-select=[
+lint.select=[
     "E",
     "F",
     "I",
@@ -96,7 +93,7 @@ select=[
 
 line-length = 88
 
-ignore = ["E741"]
+lint.ignore = ["E741"]
 
 [[tool.mypy.overrides]]
 module = ["numpy.*", "pyscal.version", "pandas.*", "matplotlib.*", "scipy.*", "xlrd.*", "openpyxl.*"

diff --git a/pyscal/__init__.py → src/pyscal/__init__.py b/pyscal/__init__.py → src/pyscal/__init__.py
diff --git a/pyscal/constants.py → src/pyscal/constants.py b/pyscal/constants.py → src/pyscal/constants.py
diff --git a/pyscal/factory.py → src/pyscal/factory.py b/pyscal/factory.py → src/pyscal/factory.py
diff --git a/pyscal/gasoil.py → src/pyscal/gasoil.py b/pyscal/gasoil.py → src/pyscal/gasoil.py
diff --git a/pyscal/gaswater.py → src/pyscal/gaswater.py b/pyscal/gaswater.py → src/pyscal/gaswater.py
diff --git a/pyscal/plotting.py → src/pyscal/plotting.py b/pyscal/plotting.py → src/pyscal/plotting.py
diff --git a/pyscal/pyscalcli.py → src/pyscal/pyscalcli.py b/pyscal/pyscalcli.py → src/pyscal/pyscalcli.py
diff --git a/pyscal/pyscallist.py → src/pyscal/pyscallist.py b/pyscal/pyscallist.py → src/pyscal/pyscallist.py
diff --git a/pyscal/scalrecommendation.py → src/pyscal/scalrecommendation.py b/pyscal/scalrecommendation.py → src/pyscal/scalrecommendation.py
diff --git a/pyscal/utils/__init__.py → src/pyscal/utils/__init__.py b/pyscal/utils/__init__.py → src/pyscal/utils/__init__.py
diff --git a/pyscal/utils/capillarypressure.py → src/pyscal/utils/capillarypressure.py b/pyscal/utils/capillarypressure.py → src/pyscal/utils/capillarypressure.py
diff --git a/pyscal/utils/interpolation.py → src/pyscal/utils/interpolation.py b/pyscal/utils/interpolation.py → src/pyscal/utils/interpolation.py
diff --git a/pyscal/utils/monotonicity.py → src/pyscal/utils/monotonicity.py b/pyscal/utils/monotonicity.py → src/pyscal/utils/monotonicity.py
diff --git a/pyscal/utils/relperm.py → src/pyscal/utils/relperm.py b/pyscal/utils/relperm.py → src/pyscal/utils/relperm.py
diff --git a/pyscal/utils/string.py → src/pyscal/utils/string.py b/pyscal/utils/string.py → src/pyscal/utils/string.py
diff --git a/pyscal/utils/testing.py → src/pyscal/utils/testing.py b/pyscal/utils/testing.py → src/pyscal/utils/testing.py
diff --git a/pyscal/wateroil.py → src/pyscal/wateroil.py b/pyscal/wateroil.py → src/pyscal/wateroil.py
diff --git a/pyscal/wateroilgas.py → src/pyscal/wateroilgas.py b/pyscal/wateroilgas.py → src/pyscal/wateroilgas.py
diff --git a/tests/test_estimateendpoints.py b/tests/test_estimateendpoints.py
@@ -3,7 +3,6 @@
 import hypothesis.strategies as st
 import numpy as np
 from hypothesis import given
-
 from pyscal import GasOil, WaterOil
 from pyscal.constants import EPSILON as epsilon
 

diff --git a/tests/test_factory.py b/tests/test_factory.py
@@ -5,7 +5,6 @@
 import numpy as np
 import pandas as pd
 import pytest
-
 from pyscal import (
     GasOil,
     GasWater,

diff --git a/tests/test_fromtable.py b/tests/test_fromtable.py
@@ -5,7 +5,6 @@
 import pandas as pd
 import pytest
 from hypothesis import given
-
 from pyscal import GasOil, WaterOil, WaterOilGas
 from pyscal.utils.testing import check_table, float_df_checker
 

diff --git a/tests/test_gasoil.py b/tests/test_gasoil.py
@@ -9,7 +9,6 @@
 import pandas as pd
 import pytest
 from hypothesis import given
-
 from pyscal import GasOil
 from pyscal.constants import MAX_EXPONENT_KR, SWINTEGERS
 from pyscal.utils.relperm import truncate_zeroness

diff --git a/tests/test_gaswater.py b/tests/test_gaswater.py
@@ -8,7 +8,6 @@
 import numpy as np
 import pytest
 from hypothesis import given
-
 from pyscal import GasWater
 from pyscal.constants import SWINTEGERS
 from pyscal.utils.testing import (

diff --git a/tests/test_interactive_plots.py b/tests/test_interactive_plots.py
@@ -9,7 +9,6 @@
 import numpy as np
 import pytest
 from matplotlib import pyplot
-
 from pyscal import GasOil, GasWater, PyscalFactory, WaterOil, utils
 
 from .test_scalrecommendation import BASE_SAMPLE_LET, HIGH_SAMPLE_LET, LOW_SAMPLE_LET

diff --git a/tests/test_logging.py b/tests/test_logging.py
@@ -2,9 +2,8 @@
 import sys
 from pathlib import Path
 
-import pytest
-
 import pyscal
+import pytest
 from pyscal import pyscalcli
 
 

diff --git a/tests/test_plotting.py b/tests/test_plotting.py
@@ -4,7 +4,6 @@
 
 import matplotlib.pyplot as plt
 import pytest
-
 from pyscal import GasOil, GasWater, PyscalList, WaterOil, WaterOilGas, plotting
 
 

diff --git a/tests/test_pyscalcli.py b/tests/test_pyscalcli.py
@@ -8,7 +8,6 @@
 
 import pandas as pd
 import pytest
-
 from pyscal import pyscalcli
 from pyscal.utils.testing import sat_table_str_ok
 

diff --git a/tests/test_pyscallist.py b/tests/test_pyscallist.py
@@ -5,7 +5,6 @@
 import numpy as np
 import pandas as pd
 import pytest
-
 from pyscal import (
     GasOil,
     GasWater,

diff --git a/tests/test_scalrecommendation.py b/tests/test_scalrecommendation.py
@@ -4,7 +4,6 @@
 import pandas as pd
 import pytest
 from hypothesis import given
-
 from pyscal import GasWater, PyscalFactory, SCALrecommendation, WaterOil, WaterOilGas
 from pyscal.factory import slicedict
 from pyscal.utils.testing import check_table, sat_table_str_ok, slow_hypothesis

diff --git a/tests/test_slgof.py b/tests/test_slgof.py
@@ -4,7 +4,6 @@
 import numpy as np
 import pytest
 from hypothesis import given
-
 from pyscal import GasOil, WaterOilGas
 from pyscal.constants import EPSILON, SWINTEGERS
 from pyscal.utils.testing import sat_table_str_ok

diff --git a/tests/test_utils_capillarypressure.py b/tests/test_utils_capillarypressure.py
@@ -5,7 +5,6 @@
 import numpy as np
 import pytest
 from hypothesis import given
-
 from pyscal.constants import EPSILON
 from pyscal.utils import capillarypressure
 

diff --git a/tests/test_utils_interpolation.py b/tests/test_utils_interpolation.py
@@ -6,7 +6,6 @@
 import pytest
 from hypothesis import given
 from matplotlib import pyplot as plt
-
 from pyscal import GasOil, WaterOil
 from pyscal.constants import EPSILON as epsilon
 from pyscal.utils.interpolation import (

diff --git a/tests/test_utils_monotonicity.py b/tests/test_utils_monotonicity.py
@@ -4,7 +4,6 @@
 import numpy as np
 import pandas as pd
 import pytest
-
 from pyscal.utils.monotonicity import (
     check_almost_monotone,
     check_limits,

diff --git a/tests/test_utils_relperm.py b/tests/test_utils_relperm.py
@@ -3,7 +3,6 @@
 import numpy as np
 import pandas as pd
 import pytest
-
 from pyscal.utils.relperm import crosspoint, estimate_diffjumppoint, truncate_zeroness
 
 # pyscal.utils.relperm.crosspoint() is also tested in test_wateroil and test_gasoil.

diff --git a/tests/test_utils_string.py b/tests/test_utils_string.py
@@ -1,7 +1,6 @@
 """Test module for pyscal.utils"""
 
 import pandas as pd
-
 from pyscal.utils.string import comment_formatter, df2str
 
 

diff --git a/tests/test_utils_testing.py b/tests/test_utils_testing.py
@@ -4,7 +4,6 @@
 
 import pandas as pd
 import pytest
-
 from pyscal.utils.testing import float_df_checker, sat_table_str_ok
 
 

diff --git a/tests/test_wateroil.py b/tests/test_wateroil.py
@@ -9,7 +9,6 @@
 import pandas as pd
 import pytest
 from hypothesis import given
-
 from pyscal import WaterOil
 from pyscal.constants import SWINTEGERS
 from pyscal.utils.testing import (

diff --git a/tests/test_wateroil_pc.py b/tests/test_wateroil_pc.py
@@ -4,7 +4,6 @@
 import numpy as np
 import pytest
 from hypothesis import given
-
 from pyscal import WaterOil
 from pyscal.constants import MAX_EXPONENT_PC
 from pyscal.utils.testing import check_table, float_df_checker, sat_table_str_ok

diff --git a/tests/test_wateroil_saturation.py b/tests/test_wateroil_saturation.py
@@ -4,7 +4,6 @@
 
 import hypothesis.strategies as st
 from hypothesis import given
-
 from pyscal import WaterOil
 from pyscal.constants import EPSILON, SWINTEGERS
 from pyscal.utils.testing import check_table, float_df_checker

diff --git a/tests/test_wateroilgas.py b/tests/test_wateroilgas.py
@@ -4,7 +4,6 @@
 from pathlib import Path
 
 import pytest
-
 from pyscal import GasOil, WaterOil, WaterOilGas
 from pyscal.utils.testing import sat_table_str_ok
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pyscal/_version.py export-subst
		src/pyscal/_version.py export-subst
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,6 @@

		import matplotlib.pyplot as plt
		import pytest

		from pyscal import GasOil, GasWater, PyscalList, WaterOil, WaterOilGas, plotting


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,6 @@

		import pandas as pd
		import pytest

		from pyscal.utils.testing import float_df_checker, sat_table_str_ok


Expand Down