Skip to content

Commit 5baacb3

Browse files
blnichoblnicho
authored
Merge pull request #2635 from mrmundt/release-file-change
NFC: Convert `txt` to `md` file type
2 parents ba05c17 + c6db42c commit 5baacb3

File tree

9 files changed

+55
-48
lines changed

9 files changed

+55
-48
lines changed

‎.coin-or/projDesc.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e
107107
license file directly.
108108
-->
109109
<projectLicenseURL>
110-
https://github.com/Pyomo/pyomo/blob/main/LICENSE.txt
110+
https://github.com/Pyomo/pyomo/blob/main/LICENSE.md
111111
</projectLicenseURL>
112112

113113
<!-- Below, you can list other COIN projects your project -->

‎AUTHORS.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎CHANGELOG.txt‎ renamed to ‎CHANGELOG.md‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
===============
21
Pyomo CHANGELOG
32
===============
43

54
-------------------------------------------------------------------------------
6-
Pyomo 6.4.3 28 Nov 2022
5+
Pyomo 6.4.3 (28 Nov 2022)
76
-------------------------------------------------------------------------------
87

98
- General
@@ -90,7 +89,7 @@ Pyomo 6.4.3 28 Nov 2022
9089
- PyROS: Fix collection of sub-solver solve times (#2543)
9190

9291
-------------------------------------------------------------------------------
93-
Pyomo 6.4.2 17 Aug 2022
92+
Pyomo 6.4.2 (17 Aug 2022)
9493
-------------------------------------------------------------------------------
9594

9695
- General
@@ -149,7 +148,7 @@ Pyomo 6.4.2 17 Aug 2022
149148
- PyROS: Update exception handling parsing BARON lower/upper bounds (#2486)
150149

151150
-------------------------------------------------------------------------------
152-
Pyomo 6.4.1 13 May 2022
151+
Pyomo 6.4.1 (13 May 2022)
153152
-------------------------------------------------------------------------------
154153

155154
- General
@@ -187,7 +186,7 @@ Pyomo 6.4.1 13 May 2022
187186
(#2353, #2371)
188187

189188
-------------------------------------------------------------------------------
190-
Pyomo 6.4.0 16 Mar 2022
189+
Pyomo 6.4.0 (16 Mar 2022)
191190
-------------------------------------------------------------------------------
192191

193192
- General
@@ -215,7 +214,7 @@ Pyomo 6.4.0 16 Mar 2022
215214
- PyROS: Fix variable default initialization (#2331)
216215

217216
-------------------------------------------------------------------------------
218-
Pyomo 6.3.0 23 Feb 2022
217+
Pyomo 6.3.0 (23 Feb 2022)
219218
-------------------------------------------------------------------------------
220219

221220
ADVANCE CHANGE NOTICE
@@ -295,7 +294,7 @@ ADVANCE CHANGE NOTICE
295294
- TrustRegion: New implementation of Trust Region Framework (#2238, #2279)
296295

297296
-------------------------------------------------------------------------------
298-
Pyomo 6.2 17 Nov 2021
297+
Pyomo 6.2 (17 Nov 2021)
299298
-------------------------------------------------------------------------------
300299

301300
- General
@@ -367,7 +366,7 @@ Pyomo 6.2 17 Nov 2021
367366
- PyROS: Add uncertain variable bounds detection (#2159)
368367

369368
-------------------------------------------------------------------------------
370-
Pyomo 6.1.2 20 Aug 2021
369+
Pyomo 6.1.2 (20 Aug 2021)
371370
-------------------------------------------------------------------------------
372371

373372
- General
@@ -382,14 +381,14 @@ Pyomo 6.1.2 20 Aug 2021
382381
- MindtPy: Support gurobi_persistent in LP/NLP-based B&B algorithm (#2071)
383382

384383
-------------------------------------------------------------------------------
385-
Pyomo 6.1.1 17 Aug 2021
384+
Pyomo 6.1.1 (17 Aug 2021)
386385
-------------------------------------------------------------------------------
387386

388387
- General
389388
- Adding missing __init__.py files across Pyomo (#2086)
390389

391390
-------------------------------------------------------------------------------
392-
Pyomo 6.1 17 Aug 2021
391+
Pyomo 6.1 (17 Aug 2021)
393392
-------------------------------------------------------------------------------
394393

395394
- General
@@ -451,7 +450,7 @@ Pyomo 6.1 17 Aug 2021
451450

452451

453452
-------------------------------------------------------------------------------
454-
Pyomo 6.0.1 4 Jun 2021
453+
Pyomo 6.0.1 (4 Jun 2021)
455454
-------------------------------------------------------------------------------
456455

457456
- General
@@ -466,7 +465,7 @@ Pyomo 6.0.1 4 Jun 2021
466465
- GDPopt: Fix implicit conversion warnings (#2002)
467466

468467
-------------------------------------------------------------------------------
469-
Pyomo 6.0 20 May 2021
468+
Pyomo 6.0 (20 May 2021)
470469
-------------------------------------------------------------------------------
471470

472471
BACKWARDS COMPATIBILITY WARNINGS
@@ -595,7 +594,7 @@ BACKWARDS COMPATIBILITY WARNINGS
595594
- MindtPy: general improvements and add feasibility pump (#1847)
596595

597596
-------------------------------------------------------------------------------
598-
Pyomo 5.7.3 29 Jan 2021
597+
Pyomo 5.7.3 (29 Jan 2021)
599598
-------------------------------------------------------------------------------
600599

601600
ADVANCE CHANGE NOTICE:
@@ -642,7 +641,7 @@ ADVANCE CHANGE NOTICE:
642641
- Parmest: update pairwise plot to use the covariance matrix (#1774)
643642

644643
-------------------------------------------------------------------------------
645-
Pyomo 5.7.2 17 Dec 2020
644+
Pyomo 5.7.2 (17 Dec 2020)
646645
-------------------------------------------------------------------------------
647646

648647
- General
@@ -732,7 +731,7 @@ Pyomo 5.7.2 17 Dec 2020
732731
misc updates (#1632, #1653, #1610, #1667, #1681, #1705, #1724)
733732

734733
-------------------------------------------------------------------------------
735-
Pyomo 5.7.1 15 Sep 2020
734+
Pyomo 5.7.1 (15 Sep 2020)
736735
-------------------------------------------------------------------------------
737736

738737
- General
@@ -794,7 +793,7 @@ Pyomo 5.7.1 15 Sep 2020
794793
- Add integer arithmetic option to FME transformation (#1594)
795794

796795
-------------------------------------------------------------------------------
797-
Pyomo 5.7.0 19 Jun 2020
796+
Pyomo 5.7.0 (19 Jun 2020)
798797
-------------------------------------------------------------------------------
799798

800799
- General
@@ -880,7 +879,7 @@ Pyomo 5.7.0 19 Jun 2020
880879
- Add basic interior point algorithm based on PyNumero (#1450, #1505, #1495)
881880

882881
-------------------------------------------------------------------------------
883-
Pyomo 5.6.9 18 Mar 2020
882+
Pyomo 5.6.9 (18 Mar 2020)
884883
-------------------------------------------------------------------------------
885884

886885
- General
@@ -950,7 +949,7 @@ Pyomo 5.6.9 18 Mar 2020
950949
- Fix Benders MPI logic bug and expand parallel test coverage (#1278)
951950

952951
-------------------------------------------------------------------------------
953-
Pyomo 5.6.8 13 Dec 2019
952+
Pyomo 5.6.8 (13 Dec 2019)
954953
-------------------------------------------------------------------------------
955954

956955
- General
@@ -983,7 +982,7 @@ Pyomo 5.6.8 13 Dec 2019
983982
- Add test skipping to trust region tests requiring IPOPT (#1220)
984983

985984
-------------------------------------------------------------------------------
986-
Pyomo 5.6.7 7 Nov 2019
985+
Pyomo 5.6.7 (7 Nov 2019)
987986
-------------------------------------------------------------------------------
988987

989988
- General
@@ -1029,7 +1028,7 @@ Pyomo 5.6.7 7 Nov 2019
10291028
- Add documentation for user interface to LinearExpression (#1120)
10301029

10311030
-------------------------------------------------------------------------------
1032-
Pyomo 5.6.6 21 Jun 2019
1031+
Pyomo 5.6.6 (21 Jun 2019)
10331032
-------------------------------------------------------------------------------
10341033

10351034
- Core
@@ -1046,7 +1045,7 @@ Pyomo 5.6.6 21 Jun 2019
10461045
support for AbstractModels (#955, #1054, #1066)
10471046

10481047
-------------------------------------------------------------------------------
1049-
Pyomo 5.6.5 10 Jun 2019
1048+
Pyomo 5.6.5 (10 Jun 2019)
10501049
-------------------------------------------------------------------------------
10511050

10521051
- General
@@ -1059,14 +1058,14 @@ Pyomo 5.6.5 10 Jun 2019
10591058
- Benders cut generator component (#1028)
10601059

10611060
-------------------------------------------------------------------------------
1062-
Pyomo 5.6.4 24 May 2019
1061+
Pyomo 5.6.4 (24 May 2019)
10631062
-------------------------------------------------------------------------------
10641063

10651064
- General
10661065
- Resolve project description rendering on PyPI
10671066

10681067
-------------------------------------------------------------------------------
1069-
Pyomo 5.6.3 24 May 2019
1068+
Pyomo 5.6.3 (24 May 2019)
10701069
-------------------------------------------------------------------------------
10711070

10721071
- General
@@ -1092,7 +1091,7 @@ Pyomo 5.6.3 24 May 2019
10921091
- GDPbb improvements and cleanup (#982)
10931092

10941093
-------------------------------------------------------------------------------
1095-
Pyomo 5.6.2 1 May 2019
1094+
Pyomo 5.6.2 (1 May 2019)
10961095
-------------------------------------------------------------------------------
10971096

10981097
- General
@@ -1177,7 +1176,7 @@ Pyomo 5.6.2 1 May 2019
11771176
- Show how to activate/deactivate constraints (#932)
11781177

11791178
-------------------------------------------------------------------------------
1180-
Pyomo 5.6.1 18 Jan 2019
1179+
Pyomo 5.6.1 (18 Jan 2019)
11811180
-------------------------------------------------------------------------------
11821181

11831182
- General
@@ -1193,7 +1192,7 @@ Pyomo 5.6.1 18 Jan 2019
11931192
- Add support for RangeSet in GDP transformations (#803)
11941193

11951194
-------------------------------------------------------------------------------
1196-
Pyomo 5.6 19 Dec 2018
1195+
Pyomo 5.6 (19 Dec 2018)
11971196
-------------------------------------------------------------------------------
11981197

11991198
- General
@@ -1318,14 +1317,14 @@ Pyomo 5.6 19 Dec 2018
13181317
- Update examples (#436)
13191318

13201319
-------------------------------------------------------------------------------
1321-
Pyomo 5.5.1 26 Oct 2018
1320+
Pyomo 5.5.1 (26 Oct 2018)
13221321
-------------------------------------------------------------------------------
13231322

13241323
- General
13251324
- Adding support for Python 3.7
13261325

13271326
-------------------------------------------------------------------------------
1328-
Pyomo 5.5 14 Apr 2018
1327+
Pyomo 5.5 (14 Apr 2018)
13291328
-------------------------------------------------------------------------------
13301329

13311330
- Move preprocessing transformations to contrib (#426)
@@ -1360,25 +1359,25 @@ Pyomo 5.5 14 Apr 2018
13601359
- Documentation updates (#425)
13611360

13621361
-------------------------------------------------------------------------------
1363-
Pyomo 5.4.3 2 Mar 2018
1362+
Pyomo 5.4.3 (2 Mar 2018)
13641363
-------------------------------------------------------------------------------
13651364

13661365
- Another fix in the release process.
13671366

13681367
-------------------------------------------------------------------------------
1369-
Pyomo 5.4.2 2 Mar 2018
1368+
Pyomo 5.4.2 (2 Mar 2018)
13701369
-------------------------------------------------------------------------------
13711370

13721371
- Misc fix in the release process.
13731372

13741373
-------------------------------------------------------------------------------
1375-
Pyomo 5.4.1 28 Feb 2018
1374+
Pyomo 5.4.1 (28 Feb 2018)
13761375
-------------------------------------------------------------------------------
13771376

13781377
- Misc version increment to support pypi idiosyncrasies.
13791378

13801379
-------------------------------------------------------------------------------
1381-
Pyomo 5.4 28 Feb 2018
1380+
Pyomo 5.4 (28 Feb 2018)
13821381
-------------------------------------------------------------------------------
13831382

13841383
=======
@@ -1424,7 +1423,7 @@ Pyomo 5.4 28 Feb 2018
14241423
- Logging overhaul and support for timing concrete models (#245)
14251424

14261425
-------------------------------------------------------------------------------
1427-
Pyomo 5.3 21 Oct 2017
1426+
Pyomo 5.3 (21 Oct 2017)
14281427
-------------------------------------------------------------------------------
14291428

14301429
- Removed testing for Python 3.4
@@ -1448,7 +1447,7 @@ Pyomo 5.3 21 Oct 2017
14481447
- Tracking changes in pyutilib.th
14491448

14501449
-------------------------------------------------------------------------------
1451-
Pyomo 5.2 14 May 2017
1450+
Pyomo 5.2 (14 May 2017)
14521451
-------------------------------------------------------------------------------
14531452

14541453
- Resolved timeout issues running NEOS solvers
@@ -1493,13 +1492,13 @@ Pyomo 5.2 14 May 2017
14931492
- Updating the bilinear transform to avoid creating a Set `index`.
14941493

14951494
-------------------------------------------------------------------------------
1496-
Pyomo 5.1.1 8 Jan 2017
1495+
Pyomo 5.1.1 (8 Jan 2017)
14971496
-------------------------------------------------------------------------------
14981497

14991498
- Monkeypatch to resolve (#95)
15001499

15011500
-------------------------------------------------------------------------------
1502-
Pyomo 5.1 4 Jan 2017
1501+
Pyomo 5.1 (4 Jan 2017)
15031502
-------------------------------------------------------------------------------
15041503

15051504
- Added a CONOPT plugin to handle a custom SOL file output (#88)
@@ -1523,13 +1522,13 @@ Pyomo 5.1 4 Jan 2017
15231522
- Removed support for OpenOpt
15241523

15251524
-------------------------------------------------------------------------------
1526-
Pyomo 5.0.1 16 Nov 2016
1525+
Pyomo 5.0.1 (16 Nov 2016)
15271526
-------------------------------------------------------------------------------
15281527

15291528
- Updating PyUtilib dependency
15301529

15311530
-------------------------------------------------------------------------------
1532-
Pyomo 5.0 15 Nov 2016
1531+
Pyomo 5.0 (15 Nov 2016)
15331532
-------------------------------------------------------------------------------
15341533

15351534
- Added examples used in the Pyomo book to the Pyomo software repos

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ Contributing to Pyomo
44
Online Documentation
55
--------------------
66

7-
Detailed contribution guidelines may be found in our [online documentation](http://pyomo.readthedocs.io/en/latest/contribution_guide.html).
7+
Detailed contribution guidelines may be found in our
8+
[online documentation](http://pyomo.readthedocs.io/en/latest/contribution_guide.html).
89

910
Pull Requests
1011
-------------

‎LICENSE.txt‎ renamed to ‎LICENSE.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
LICENSE
2+
=======
3+
14
Copyright (c) 2008-2022 National Technology and Engineering Solutions of
25
Sandia, LLC . Under the terms of Contract DE-NA0003525 with National
36
Technology and Engineering Solutions of Sandia, LLC , the U.S.

‎MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
include README.md
2-
include LICENSE.txt
2+
include LICENSE.md

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ subproblems using Python parallel communication libraries.
4545

4646
Pyomo was formerly released as the Coopr software library.
4747

48-
Pyomo is available under the BSD License, see the LICENSE.txt file.
48+
Pyomo is available under the BSD License - see the
49+
[`LICENSE.md`](https://github.com/Pyomo/pyomo/blob/main/LICENSE.md) file.
4950

5051
Pyomo is currently tested with the following Python implementations:
5152

@@ -78,7 +79,7 @@ To get help from the Pyomo community ask a question on one of the following:
7879

7980
Pyomo development moved to this repository in June, 2016 from
8081
Sandia National Laboratories. Developer discussions are hosted by
81-
[google groups](https://groups.google.com/forum/#!forum/pyomo-developers).
82+
[Google Groups](https://groups.google.com/forum/#!forum/pyomo-developers).
8283

8384
By contributing to this software project, you are agreeing to the
8485
following terms and conditions for your contributions:

0 commit comments

Comments
 (0)