chore: replace black, isort, absolufy-imports with ruff

.git-blame-ignore-revs

@@ -0,0 +1 @@
+756928f89df774f79e28380640c3cf45865b5282

.github/workflows/test.yml

@@ -83,14 +83,6 @@ jobs:
       run: |
         python -m pip install "$(ls dist/*.whl)[dev,solvers]"
 
-    - name: Lint with flake8
-      run: |
-        pip install flake8
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=benchmark/scripts,.git/
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-
     - name: Test with pytest
       env:
         MOSEKLM_LICENSE_FILE: ${{ secrets.MSK_LICENSE }}

.pre-commit-config.yaml

@@ -5,10 +5,12 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
     -   id: check-merge-conflict
--   repo: https://github.com/psf/black
-    rev: 24.4.2
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.5.2
     hooks:
-    -   id: black
+    -   id: ruff
+        args: [--fix]
+    -   id: ruff-format
     # Current docformatter version has a problem with urls (it's annoying)
 # -   repo: https://github.com/PyCQA/docformatter
 #     rev: v1.6.0.rc1
@@ -18,16 +20,7 @@ repos:
 -   repo: https://github.com/keewis/blackdoc
     rev: v0.3.9
     hooks:
-      - id: blackdoc
--   repo: https://github.com/MarcoGorelli/absolufy-imports
-    rev: v0.3.1
-    hooks:
-    -   id: absolufy-imports
--   repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        args: ["--profile", "black", "--filter-files"]
+    -   id: blackdoc
 -   repo: https://github.com/codespell-project/codespell
     rev: v2.3.0
     hooks:

benchmark/notebooks/plot-benchmarks.py.ipynb

@@ -7,10 +7,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt\n",
-    "import numpy as np\n",
+    "\n",
     "sns.set_theme(\"paper\", \"white\")\n",
     "#plt.rc('text', usetex=True)\n",
     "#plt.rc('font', family='sans-serif')"
@@ -37,7 +37,7 @@
    "source": [
     "if snakemake.wildcards[\"kind\"] == 'overhead':\n",
     "    labels = ['Overhead time (s)', 'Overhead memory (MB)']\n",
-    "else: \n",
+    "else:\n",
     "    labels = ['Time (s)', 'Memory (MB)']\n",
     "\n",
     "g = sns.FacetGrid(data=df, row=\"kind\", sharey=False, height=2., aspect=2)\n",
@@ -61,7 +61,7 @@
    "source": [
     "if snakemake.wildcards[\"kind\"] == 'overhead':\n",
     "    label = 'Computational overhead [MBs]'\n",
-    "else: \n",
+    "else:\n",
     "    label = 'Computational resource [MBs]'\n",
     "\n",
     "df = data.assign(Resource = data[\"Time\"] * data[\"Memory\"])\n",

benchmark/scripts/benchmark_cvxpy.py

@@ -1,10 +1,10 @@
 import cvxpy as cp
 import numpy as np
 from common import profile
-from numpy.random import randint, seed
+from numpy.random import default_rng
 
 # Random seed for reproducibility
-seed(125)
+rng = default_rng(125)
 
 
 def basic_model(n, solver):
@@ -26,8 +26,8 @@ def basic_model(n, solver):
 
 def knapsack_model(n, solver):
     # Define the variables
-    weight = randint(1, 100, size=n)
-    value = randint(1, 100, size=n)
+    weight = rng.integers(1, 100, size=n)
+    value = rng.integers(1, 100, size=n)
 
     x = cp.Variable(n, boolean=True)
 

benchmark/scripts/benchmark_gurobipy.py

@@ -1,10 +1,10 @@
 import gurobipy as gp
 import numpy as np
 from common import profile
-from numpy.random import randint, seed
+from numpy.random import default_rng
 
 # Random seed for reproducibility
-seed(125)
+rng = default_rng(125)
 
 
 def basic_model(n, solver):
@@ -32,8 +32,8 @@ def knapsack_model(n, solver):
     # Create a new model
     m = gp.Model()
 
-    weight = randint(1, 100, size=n)
-    value = randint(1, 100, size=n)
+    weight = rng.integers(1, 100, size=n)
+    value = rng.integers(1, 100, size=n)
 
     # Create variables
     x = m.addMVar(n, vtype=gp.GRB.BINARY, name="x")

benchmark/scripts/benchmark_linopy.py

@@ -1,20 +1,18 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Fri Nov 19 17:40:33 2021.
 
 @author: fabian
 """
 
-
 from common import profile
 from numpy import arange
-from numpy.random import randint, seed
+from numpy.random import default_rng
 
 from linopy import Model
 
 # Random seed for reproducibility
-seed(125)
+rng = default_rng(125)
 
 
 def basic_model(n, solver):
@@ -33,8 +31,8 @@ def basic_model(n, solver):
 def knapsack_model(n, solver):
     m = Model()
     packages = m.add_variables(coords=[arange(n)], binary=True)
-    weight = randint(1, 100, size=n)
-    value = randint(1, 100, size=n)
+    weight = rng.integers(1, 100, size=n)
+    value = rng.integers(1, 100, size=n)
     m.add_constraints((weight * packages).sum() <= 200)
     m.add_objective(-(value * packages).sum())  # use minus because of minimization
     m.solve(solver_name=solver)

benchmark/scripts/benchmark_ortools.py

@@ -1,9 +1,9 @@
 from common import profile
-from numpy.random import randint, seed
+from numpy.random import default_rng
 from ortools.linear_solver import pywraplp
 
 # Random seed for reproducibility
-seed(125)
+rng = default_rng(125)
 
 
 def model(n, solver):
@@ -41,8 +41,8 @@ def knapsack_model(n, solver):
     # Create a new linear solver
     solver = pywraplp.Solver("LinearExample", pywraplp.Solver.GUROBI_LINEAR_PROGRAMMING)
 
-    weight = randint(1, 100, size=n)
-    value = randint(1, 100, size=n)
+    weight = rng.integers(1, 100, size=n)
+    value = rng.integers(1, 100, size=n)
 
     x = {i: solver.BoolVar("x_%d" % i) for i in range(n)}
     # Create constraints

benchmark/scripts/benchmark_pulp.py

@@ -1,10 +1,9 @@
 import pulp
 from common import profile
-from numpy import arange
-from numpy.random import randint, seed
+from numpy.random import default_rng
 
 # Random seed for reproducibility
-seed(125)
+rng = default_rng(125)
 
 
 def basic_model(n, solver):
@@ -34,8 +33,8 @@ def knapsack_model(n, solver):
     m.i = list(range(n))
 
     # Define the variables
-    weight = randint(1, 100, size=n)
-    value = randint(1, 100, size=n)
+    weight = rng.integers(1, 100, size=n)
+    value = rng.integers(1, 100, size=n)
 
     x = pulp.LpVariable.dicts("x", (m.i,), lowBound=0, upBound=1, cat=pulp.LpInteger)
 

benchmark/scripts/benchmark_pyomo.py

@@ -1,15 +1,13 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Fri Nov 19 17:40:33 2021.
 
 @author: fabian
 """
 
-
 from common import profile
 from numpy import arange
-from numpy.random import randint, seed
+from numpy.random import default_rng
 from pyomo.environ import (
     Binary,
     ConcreteModel,
@@ -18,12 +16,11 @@
     Set,
     Var,
     maximize,
-    value,
 )
 from pyomo.opt import SolverFactory
 
 # Random seed for reproducibility
-seed(125)
+rng = default_rng(125)
 
 
 def basic_model(n, solver):
@@ -57,8 +54,8 @@ def knapsack_model(n, solver):
     m.i = Set(initialize=arange(n))
 
     m.x = Var(m.i, domain=Binary)
-    m.weight = randint(1, 100, size=n)
-    m.value = randint(1, 100, size=n)
+    m.weight = rng.integers(1, 100, size=n)
+    m.value = rng.integers(1, 100, size=n)
 
     def bound1(m):
         return sum(m.x[i] * m.weight[i] for i in m.i) <= 200

benchmark/scripts/benchmarks-pypsa-eur/benchmark-linopy.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Tue Feb 15 16:20:51 2022.
 

benchmark/scripts/benchmarks-pypsa-eur/benchmark-pyomo.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Tue Feb 15 16:20:51 2022.
 
@@ -18,7 +17,7 @@ def solve():
     n.generators.p_nom_max.fillna(np.inf, inplace=True)
     n.snapshots = n.snapshots[:NSNAPSHOTS]
 
-    m = n.lopf(
+    m = n.lopf(  # noqa: F841
         solver_options=SOLVER_PARAMS, formulation="kirchhoff", solver_name=SOLVER
     )
 

benchmark/scripts/benchmarks-pypsa-eur/benchmark-pypsa-linopf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Tue Feb 15 16:20:51 2022.
 
@@ -18,7 +17,7 @@ def solve():
     n.generators.p_nom_max.fillna(np.inf, inplace=True)
     n.snapshots = n.snapshots[:NSNAPSHOTS]
 
-    m = n.lopf(solver_options=SOLVER_PARAMS, pyomo=False, solver_name=SOLVER)
+    m = n.lopf(solver_options=SOLVER_PARAMS, pyomo=False, solver_name=SOLVER)  # noqa: F841
 
 
 solve()

benchmark/scripts/benchmarks-pypsa-eur/plot-benchmarks.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Tue Feb 15 17:11:01 2022.
 

benchmark/scripts/concat-benchmarks.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Wed Feb  9 09:34:00 2022.
 

benchmark/scripts/leftovers/benchmark-linopy.py

@@ -1,15 +1,12 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Fri Nov 19 17:40:33 2021.
 
 @author: fabian
 """
 
-
-import pandas as pd
 from common import profile
-from numpy import arange, cos, sin
+from numpy import arange
 
 from linopy import Model
 

benchmark/scripts/leftovers/benchmarks-pypsa-eur/benchmark-linopy.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Tue Feb 15 16:20:51 2022.
 

benchmark/scripts/leftovers/benchmarks-pypsa-eur/benchmark-pyomo.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Tue Feb 15 16:20:51 2022.
 
@@ -18,7 +17,7 @@ def solve():
     n.generators.p_nom_max.fillna(np.inf, inplace=True)
     n.snapshots = n.snapshots[:NSNAPSHOTS]
 
-    m = n.lopf(
+    m = n.lopf(  # noqa: F841
         solver_options=SOLVER_PARAMS, formulation="kirchhoff", solver_name=SOLVER
     )
 

benchmark/scripts/leftovers/benchmarks-pypsa-eur/benchmark-pypsa-linopf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Tue Feb 15 16:20:51 2022.
 
@@ -18,7 +17,7 @@ def solve():
     n.generators.p_nom_max.fillna(np.inf, inplace=True)
     n.snapshots = n.snapshots[:NSNAPSHOTS]
 
-    m = n.lopf(solver_options=SOLVER_PARAMS, pyomo=False, solver_name=SOLVER)
+    m = n.lopf(solver_options=SOLVER_PARAMS, pyomo=False, solver_name=SOLVER)  # noqa: F841
 
 
 solve()

benchmark/scripts/leftovers/benchmarks-pypsa-eur/plot-benchmarks.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Tue Feb 15 17:11:01 2022.
 

benchmark/scripts/merge-benchmarks.py

@@ -1,14 +1,10 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Mon Feb 14 18:00:44 2022.
 
 @author: fabian
 """
 
-
-from pathlib import Path
-
 import pandas as pd
 
 df = [pd.read_csv(fn, index_col=0) for fn in snakemake.input.benchmarks]

benchmark/scripts/plot-benchmarks.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Wed Jan 26 23:37:38 2022.
 

benchmark/scripts/run-linopy.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Fri Nov 19 17:40:33 2021.
 

benchmark/scripts/run-pyomo.py

@@ -1,12 +1,10 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 Created on Fri Nov 19 17:40:33 2021.
 
 @author: fabian
 """
 
-
 from benchmark_pyomo import basic_model, knapsack_model
 
 if snakemake.config["benchmark"] == "basic":