diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index f42162c..1550a3a 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -48,7 +48,6 @@ jobs: - dev - standard python-version: - - "3.8" - "3.9" - "3.10" - "3.11" @@ -70,14 +69,21 @@ jobs: steps: - if: matrix.install-mode == 'dev' uses: actions/checkout@v4 + with: + fetch-depth: 0 - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true + miniforge-version: latest python-version: ${{ matrix.python-version }} activate-environment: ${{ matrix.install-mode == 'dev' && 'parameter-sweep-dev' || 'parameter-sweep' }} - if: matrix.install-mode == 'dev' name: Install (dev) + env: + SETUPTOOLS_SCM_DEBUG: "1" run: | + pip install build + python -c "import build.util; print(build.util.project_wheel_metadata('.')['Version'])" pip install -r requirements-dev.txt - if: matrix.install-mode == 'standard' name: Install (standard) @@ -148,8 +154,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.11' - run: pip install -r requirements-dev.txt - run: make -C docs html diff --git a/pyproject.toml b/pyproject.toml index 01ffb0e..cf4fc52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools >= 64", + "setuptools >=64", "setuptools_scm >= 7", ] build-backend = "setuptools.build_meta" diff --git a/src/parameter_sweep/loop_tool/tests/ro_setup.py b/src/parameter_sweep/loop_tool/tests/ro_setup.py index 1c3c210..470fd0a 100644 --- a/src/parameter_sweep/loop_tool/tests/ro_setup.py +++ b/src/parameter_sweep/loop_tool/tests/ro_setup.py @@ -10,7 +10,7 @@ # "https://github.com/watertap-org/watertap/" ################################################################################# -import watertap.examples.flowsheets.RO_with_energy_recovery.RO_with_energy_recovery as ro_erd +import watertap.flowsheets.RO_with_energy_recovery.RO_with_energy_recovery as ro_erd from parameter_sweep.parameter_sweep import ( ParameterSweep, RecursiveParameterSweep, diff --git a/tutorials/assets_parameter_sweep_demo/parameter_sweep_demo_script.py b/tutorials/assets_parameter_sweep_demo/parameter_sweep_demo_script.py index a5ab4d5..0e2fa69 100644 --- a/tutorials/assets_parameter_sweep_demo/parameter_sweep_demo_script.py +++ b/tutorials/assets_parameter_sweep_demo/parameter_sweep_demo_script.py @@ -10,10 +10,10 @@ # "https://github.com/watertap-org/watertap/" ################################################################################# from watertap.core.solvers import get_solver -from watertap.examples.flowsheets.RO_with_energy_recovery.RO_with_energy_recovery import ( +from watertap.flowsheets.RO_with_energy_recovery.RO_with_energy_recovery import ( optimize, ) -from watertap.examples.flowsheets.RO_with_energy_recovery.monte_carlo_sampling_RO_ERD import ( +from watertap.flowsheets.RO_with_energy_recovery.monte_carlo_sampling_RO_ERD import ( build_model, build_outputs, ) diff --git a/tutorials/parameter_sweep_demo.ipynb b/tutorials/parameter_sweep_demo.ipynb index 86a09dd..7295b7c 100644 --- a/tutorials/parameter_sweep_demo.ipynb +++ b/tutorials/parameter_sweep_demo.ipynb @@ -174,10 +174,10 @@ "from pprint import pprint\n", "from IPython import get_ipython\n", "from watertap.core.solvers import get_solver\n", - "from watertap.examples.flowsheets.RO_with_energy_recovery.RO_with_energy_recovery import (\n", + "from watertap.flowsheets.RO_with_energy_recovery.RO_with_energy_recovery import (\n", " optimize,\n", ")\n", - "from watertap.examples.flowsheets.RO_with_energy_recovery.monte_carlo_sampling_RO_ERD import (\n", + "from watertap.flowsheets.RO_with_energy_recovery.monte_carlo_sampling_RO_ERD import (\n", " build_model,\n", " build_outputs,\n", ")\n",