Merge branch 'master' into oetc-support

FabianHofmann · web-flow · commit 9b95e638d40e · 2025-09-04T11:30:40.000+02:00
diff --git a/.github/workflows/claude-code-review.yml.bkp b/.github/workflows/claude-code-review.yml.bkp
diff --git a/.github/workflows/test-models.yml b/.github/workflows/test-models.yml
@@ -3,12 +3,12 @@ name: Test models
 on:
   push:
     branches:
-    - master
+      - master
   pull_request:
     branches:
-    - master
+      - master
   schedule:
-  - cron: "0 5 * * *"
+    - cron: "0 5 * * *"
 
 # Cancel any in-progress runs when a new run is triggered
 concurrency:
@@ -23,89 +23,89 @@ jobs:
       fail-fast: false
       matrix:
         version:
-        - master
+          - master
         # - latest # Activate when v0.14.0 is released
 
     defaults:
       run:
         shell: bash -l {0}
 
     steps:
-    - uses: actions/checkout@v4
-      with:
-        repository: PyPSA/pypsa-eur
-        ref: master
-
-    - name: Check out latest release
-      if: matrix.version == 'latest'
-      run: |
-        git fetch --tags
-        latest_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
-        git checkout $latest_tag
-
-    # Only run check if package is not pinned
-    - name: Check if inhouse package is pinned
-      run: |
-        grep_line=$(grep -- '- pypsa' envs/environment.yaml)
-        if [[ $grep_line == *"<"* || $grep_line == *"=="* ]]; then
-            echo "pinned=true" >> $GITHUB_ENV
-        else
-            echo "pinned=false" >> $GITHUB_ENV
-        fi
-
-    - name: Setup secrets & cache dates
-      if: env.pinned == 'false'
-      run: |
-        echo -ne "url: ${CDSAPI_URL}\nkey: ${CDSAPI_TOKEN}\n" > ~/.cdsapirc
-        echo "week=$(date +'%Y%U')" >> $GITHUB_ENV # data and cutouts
-
-    - uses: actions/cache@v4
-      if: env.pinned == 'false'
-      with:
-        path: |
-          data
-          cutouts
-        key: data-cutouts-${{ env.week }}
-
-    - uses: conda-incubator/setup-miniconda@v3
-      if: env.pinned == 'false'
-      with:
-        activate-environment: pypsa-eur
-
-    - name: Cache Conda env
-      if: env.pinned == 'false'
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CONDA }}/envs
-        key: conda-pypsa-eur-${{ env.week }}-${{ hashFiles('envs/linux-pinned.yaml') }}
-      id: cache-env
-
-    - name: Update environment
-      if: env.pinned == 'false' && steps.cache-env.outputs.cache-hit != 'true'
-      run: conda env update -n pypsa-eur -f envs/linux-pinned.yaml
-
-    - name: Install package from ref
-      if: env.pinned == 'false'
-      run: |
-        python -m pip install git+https://github.com/${{ github.repository }}@${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-
-    - name: Run snakemake test workflows
-      if: env.pinned == 'false'
-      run: |
-        make test
-
-    - name: Run unit tests
-      if: env.pinned == 'false'
-      run: |
-        make unit-test
-
-    - name: Upload artifacts
-      if: env.pinned == 'false'
-      uses: actions/upload-artifact@v4
-      with:
-        name: results-pypsa-eur-${{ matrix.version }}
-        path: |
-          logs
-          .snakemake/log
-          results
-        retention-days: 3
+      - uses: actions/checkout@v4
+        with:
+          repository: PyPSA/pypsa-eur
+          ref: master
+
+      - name: Check out latest release
+        if: matrix.version == 'latest'
+        run: |
+          git fetch --tags
+          latest_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
+          git checkout $latest_tag
+
+      # Only run check if package is not pinned
+      - name: Check if inhouse package is pinned
+        run: |
+          grep_line=$(grep -- '- pypsa' envs/environment.yaml)
+          if [[ $grep_line == *"<"* || $grep_line == *"=="* ]]; then
+              echo "pinned=true" >> $GITHUB_ENV
+          else
+              echo "pinned=false" >> $GITHUB_ENV
+          fi
+
+      - name: Setup secrets & cache dates
+        if: env.pinned == 'false'
+        run: |
+          echo -ne "url: ${CDSAPI_URL}\nkey: ${CDSAPI_TOKEN}\n" > ~/.cdsapirc
+          echo "week=$(date +'%Y%U')" >> $GITHUB_ENV # data and cutouts
+
+      - uses: actions/cache@v4
+        if: env.pinned == 'false'
+        with:
+          path: |
+            data
+            cutouts
+          key: data-cutouts-${{ env.week }}
+
+      - uses: conda-incubator/setup-miniconda@v3
+        if: env.pinned == 'false'
+        with:
+          activate-environment: pypsa-eur
+
+      - name: Cache Conda env
+        if: env.pinned == 'false'
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.CONDA }}/envs
+          key: conda-pypsa-eur-${{ env.week }}-${{ hashFiles('envs/linux-64.lock.yaml') }}
+        id: cache-env
+
+      - name: Update environment
+        if: env.pinned == 'false' && steps.cache-env.outputs.cache-hit != 'true'
+        run: conda env update -n pypsa-eur -f envs/linux-64.lock.yaml
+
+      - name: Install package from ref
+        if: env.pinned == 'false'
+        run: |
+          python -m pip install git+https://github.com/${{ github.repository }}@${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+
+      - name: Run snakemake test workflows
+        if: env.pinned == 'false'
+        run: |
+          make test
+
+      - name: Run unit tests
+        if: env.pinned == 'false'
+        run: |
+          make unit-test
+
+      - name: Upload artifacts
+        if: env.pinned == 'false'
+        uses: actions/upload-artifact@v4
+        with:
+          name: results-pypsa-eur-${{ matrix.version }}
+          path: |
+            logs
+            .snakemake/log
+            results
+          retention-days: 3
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,6 @@ benchmark/scripts/leftovers/
 
 # Claude
 .claude/settings.local.json
+
+# direnv
+.envrc
diff --git a/doc/release_notes.rst b/doc/release_notes.rst
@@ -15,6 +15,9 @@ Version 0.5.6
 
 * With this release, the package support for Python 3.9 was dropped and support for Python 3.10 was officially added.
 
+* The selection of a single item in `__getitem__` now returns a `Variable` instead of a `ScalarVariable`.
+
+
 Version 0.5.5
 --------------
 
diff --git a/linopy/solvers.py b/linopy/solvers.py
@@ -460,6 +460,7 @@ def solve_problem_from_file(
 
         # Use HiGHS to parse the problem file and find the set of variable names, needed to parse solution
         h = highspy.Highs()
+        h.silent()
         h.readModel(path_to_string(problem_fn))
         variables = {v.name for v in h.getVariables()}
 
@@ -755,11 +756,11 @@ def solve_problem_from_model(
             )
 
         h = model.to_highspy(explicit_coordinate_names=explicit_coordinate_names)
+        self._set_solver_params(h, log_fn)
 
         return self._solve(
             h,
             solution_fn,
-            log_fn,
             warmstart_fn,
             basis_fn,
             model=model,
@@ -804,23 +805,35 @@ def solve_problem_from_file(
 
         problem_fn_ = path_to_string(problem_fn)
         h = highspy.Highs()
+        self._set_solver_params(h, log_fn)
+
         h.readModel(problem_fn_)
 
         return self._solve(
             h,
             solution_fn,
-            log_fn,
             warmstart_fn,
             basis_fn,
             io_api=read_io_api_from_problem_file(problem_fn),
             sense=read_sense_from_problem_file(problem_fn),
         )
 
+    def _set_solver_params(
+        self,
+        highs_solver: highspy.Highs,
+        log_fn: Path | None = None,
+    ) -> None:
+        if log_fn is not None:
+            self.solver_options["log_file"] = path_to_string(log_fn)
+            logger.info(f"Log file at {self.solver_options['log_file']}")
+
+        for k, v in self.solver_options.items():
+            highs_solver.setOptionValue(k, v)
+
     def _solve(
         self,
         h: highspy.Highs,
         solution_fn: Path | None = None,
-        log_fn: Path | None = None,
         warmstart_fn: Path | None = None,
         basis_fn: Path | None = None,
         model: Model | None = None,
@@ -877,13 +890,6 @@ def _solve(
             highspy.HighsModelStatus.kUnknown: TerminationCondition.unknown,
         }
 
-        if log_fn is not None:
-            self.solver_options["log_file"] = path_to_string(log_fn)
-            logger.info(f"Log file at {self.solver_options['log_file']}")
-
-        for k, v in self.solver_options.items():
-            h.setOptionValue(k, v)
-
         if warmstart_fn is not None and warmstart_fn.suffix == ".sol":
             h.readSolution(path_to_string(warmstart_fn), 0)
         elif warmstart_fn:
diff --git a/linopy/variables.py b/linopy/variables.py
@@ -199,22 +199,9 @@ def __init__(
     def __getitem__(
         self, selector: list[int] | int | slice | tuple[int64, str_]
     ) -> Variable | ScalarVariable:
-        keys = selector if isinstance(selector, tuple) else (selector,)
-        if all(map(pd.api.types.is_scalar, keys)):
-            warn(
-                "Accessing a single value with `Variable[...]` and return type "
-                "ScalarVariable is deprecated. In future, this will return a Variable."
-                "To get a ScalarVariable use `Variable.at[...]` instead.",
-                FutureWarning,
-            )
-            return self.at[keys]
-
-        else:
-            # return selected Variable
-            data = Dataset(
-                {k: self.data[k][selector] for k in self.data}, attrs=self.attrs
-            )
-            return self.__class__(data, self.model, self.name)
+        # return selected Variable
+        data = Dataset({k: self.data[k][selector] for k in self.data}, attrs=self.attrs)
+        return self.__class__(data, self.model, self.name)
 
     @property
     def attrs(self) -> dict[str, Hashable]:
diff --git a/pyproject.toml b/pyproject.toml
@@ -91,6 +91,10 @@ include = ["linopy"]
 write_to = "linopy/version.py"
 version_scheme = "no-guess-dev"
 
+[tool.pytest.ini_options]
+testpaths = ["test"]
+norecursedirs = ["dev-scripts", "doc", "examples", "benchmark"]
+
 [tool.coverage.run]
 branch = true
 source = ["linopy"]
diff --git a/test/test_variable.py b/test/test_variable.py
@@ -73,9 +73,7 @@ def test_wrong_variable_init(m: Model, x: linopy.Variable) -> None:
 
 
 def test_variable_getter(x: linopy.Variable, z: linopy.Variable) -> None:
-    with pytest.warns(FutureWarning):
-        assert isinstance(x[0], linopy.variables.ScalarVariable)
-        assert isinstance(z[0], linopy.variables.ScalarVariable)
+    assert isinstance(x[0], linopy.variables.Variable)
 
     assert isinstance(x.at[0], linopy.variables.ScalarVariable)
 
