Skip to content

Commit 095a6ed

Browse files
authored
Merge pull request #3463 from jsiirola/qt-test-fix
2025 Testing update: Black 25.1.0, testing Qt withough X11
2 parents aa652ca + 3a0cf09 commit 095a6ed

File tree

32 files changed

+46
-46
lines changed

32 files changed

+46
-46
lines changed

examples/gdp/circles/circles.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# ___________________________________________________________________________
1111

1212
"""
13-
The "circles" GDP example problem originating in Lee and Grossman (2000). The
14-
goal is to choose a point to minimize a convex quadratic function over a set of
13+
The "circles" GDP example problem originating in Lee and Grossman (2000). The
14+
goal is to choose a point to minimize a convex quadratic function over a set of
1515
disjoint hyperspheres.
1616
"""
1717

examples/gdp/farm_layout/farm_layout.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
"""
1313
Farm layout example from Sawaya (2006). The goal is to determine optimal placements and dimensions for farm
14-
plots of specified areas to minimize the perimeter of a minimal enclosing fence. This is a GDP problem with
15-
some hyperbolic constraints to establish consistency of areas with length and width. The FLay05 and FLay06
16-
instances may take some time to solve; the others should be fast. Note that the Sawaya paper contains a
17-
little bit of nonclarity: it references "height" variables which do not exist - we use "length" for the x-axis
14+
plots of specified areas to minimize the perimeter of a minimal enclosing fence. This is a GDP problem with
15+
some hyperbolic constraints to establish consistency of areas with length and width. The FLay05 and FLay06
16+
instances may take some time to solve; the others should be fast. Note that the Sawaya paper contains a
17+
little bit of nonclarity: it references "height" variables which do not exist - we use "length" for the x-axis
1818
and "width" on the y-axis, and it also is unclear on the way the coordinates define the rectangles; we have
1919
decided that they are on the bottom-left and adapted the disjunction constraints to match.
2020
"""

examples/gdp/nine_process/small_process.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
# This software is distributed under the 3-clause BSD License.
1010
# ___________________________________________________________________________
1111

12-
"""Small process synthesis-inspired toy GDP example.
13-
14-
"""
12+
"""Small process synthesis-inspired toy GDP example."""
1513

1614
from pyomo.core import ConcreteModel, RangeSet, Var, Constraint, Objective
1715
from pyomo.core.expr.current import exp, log, sqrt

examples/gdp/small_lit/basic_step.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
# This software is distributed under the 3-clause BSD License.
1010
# ___________________________________________________________________________
1111

12-
""" Example from Section 3.2 in paper of Pseudo Basic Steps
12+
"""Example from Section 3.2 in paper of Pseudo Basic Steps
1313
1414
Ref:
15-
Pseudo basic steps: bound improvement guarantees from Lagrangian
15+
Pseudo basic steps: bound improvement guarantees from Lagrangian
1616
decomposition in convex disjunctive programming
1717
Papageorgiou and Trespalacios, 2017
1818

examples/pyomo/columngeneration/cutting_stock.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Bradley, S.P., A.C. Hax, and T.L. Magnanti. 1977. Applied Mathematical Programming,
1717
Addison-Wesley, Reading, MA. Available: http://web.mit.edu/15.053/www/AMP.htm.
1818
19-
Data from https://en.wikipedia.org/wiki/Cutting_stock_problem
19+
Data from https://en.wikipedia.org/wiki/Cutting_stock_problem
2020
'''
2121

2222
import pyomo.environ as pyo

examples/pyomo/sos/sos2_piecewise.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
# ___________________________________________________________________________
1111

1212
"""
13-
This example shows how to represent a piecewise function using
13+
This example shows how to represent a piecewise function using
1414
Pyomo's built SOSConstraint component. The function is defined as:
1515
1616
/ 3x-2 , 1 <= x <= 2
17-
f(x) = |
17+
f(x) = |
1818
\ 5x-6 , 2 <= x <= 3
1919
"""
2020

pyomo/common/tests/test_config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ def _display(obj, *args):
8888

8989
class GlobalClass(object):
9090
"test class for test_known_types"
91+
9192
pass
9293

9394

pyomo/contrib/community_detection/event_log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# This software is distributed under the 3-clause BSD License.
1010
# ___________________________________________________________________________
1111

12-
""" Logger function for community_graph.py """
12+
"""Logger function for community_graph.py"""
1313

1414
from logging import getLogger
1515
from pyomo.core import Constraint, Objective, Var

pyomo/contrib/incidence_analysis/config.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
# rights in this software.
99
# This software is distributed under the 3-clause BSD License.
1010
# ___________________________________________________________________________
11-
"""Configuration options for incidence graph generation
12-
"""
11+
"""Configuration options for incidence graph generation"""
1312

1413
import enum
1514
from pyomo.common.config import ConfigDict, ConfigValue, InEnum

pyomo/contrib/incidence_analysis/incidence.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
# rights in this software.
99
# This software is distributed under the 3-clause BSD License.
1010
# ___________________________________________________________________________
11-
"""Functionality for identifying variables that participate in expressions
12-
"""
11+
"""Functionality for identifying variables that participate in expressions"""
1312

1413
from contextlib import nullcontext
1514

0 commit comments

Comments
 (0)