Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 2 additions & 43 deletions .coin-or/projDesc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,29 +74,11 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e
<!-- Fill in the URLS you would like use for your main -->
<!-- home page. This could be either your Trac page or -->
<!-- your static page (if you have one). -->
<!-- For example, for SYMPHONY, you would put -->
<!-- -->
<!-- -->
<!--<projectHomePage> -->
<!-- https://projects.coin-or.org/SYMPHONY -->
<!--</projectHomePage> -->
<!-- -->
<!--Fill in your text below (outside the comment block). -->

<projectHomePage>https://www.pyomo.org/</projectHomePage>

<!-- Fill in the name of the license your project uses -->
<!-- and a link to its page on www.opensource.org -->
<!-- For example, if you use the CPL, you would put -->
<!-- -->
<!--<projectLicense> -->
<!-- Common Public License 1.0 -->
<!--</projectLicense> -->
<!--<projectLicenseURL> -->
<!-- http://www.opensource.org/licenses/cpl1.0.php -->
<!--</projectLicenseURL> -->
<!-- -->
<!--Fill in your text below (outside the comment block). -->

<projectLicense>BSD</projectLicense>
<!-- Note that while Pyomo is licensed under the
Expand Down Expand Up @@ -313,37 +295,14 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e
<!--Below, you can specify the links for the left-hand side menu. -->
<!--Note that these are optional, so if there is a blank, there will -->
<!--be no corresponding menu item -->
<!-- -->
<!--For SYMPHONY, this block would look like this: -->
<!-- -->
<!--<leftMenuLinks> -->
<!-- -->
<!-- <documentation> -->
<!-- http://www.coin-or.org/SYMPHONY/man-5.1 -->
<!-- </documentation> -->
<!-- -->
<!-- <sourceCodeDownload> -->
<!-- http://www.coin-or.org/download/source/SYMPHONY -->
<!-- </sourceCodeDownload> -->
<!-- -->
<!-- <binaryDownload> -->
<!-- http://www.coin-or.org/download/binary/SYMPHONY -->
<!-- </binaryDownload> -->
<!-- -->
<!-- <mailingList> -->
<!-- http://list.coin-or.org/mailman/listinfo/coin-symphony -->
<!-- </mailingList> -->
<!--</leftMenuLinks> -->
<!-- -->
<!--Fill in your text below (outside the comment block). -->

<leftMenuLinks>

<documentation>https://pyomo.readthedocs.org/</documentation>

<sourceCodeDownload>https://www.pyomo.org/installation</sourceCodeDownload>
<sourceCodeDownload>https://github.com/Pyomo/pyomo/releases/latest</sourceCodeDownload>

<binaryDownload>https://www.pyomo.org/installation</binaryDownload>
<binaryDownload>https://github.com/Pyomo/pyomo/releases/latest</binaryDownload>

<mailingList>https://groups.google.com/group/pyomo-forum</mailingList>

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![GitHub Actions Status](https://github.com/Pyomo/pyomo/actions/workflows/test_pr_and_main.yml/badge.svg?branch=main&event=push)](https://github.com/Pyomo/pyomo/actions/workflows/test_pr_and_main.yml?query=branch%3Amain+event%3Apush)
[![Jenkins Status](https://github.com/Pyomo/jenkins-status/blob/main/pyomo_main.svg)](https://pyomo-jenkins.sandia.gov/)
[![codecov](https://codecov.io/gh/Pyomo/pyomo/branch/main/graph/badge.svg)](https://codecov.io/gh/Pyomo/pyomo)
[![Documentation Status](https://readthedocs.org/projects/pyomo/badge/?version=latest)](http://pyomo.readthedocs.org/en/latest/)
[![Documentation Status](https://readthedocs.org/projects/pyomo/badge/?version=latest)](https://pyomo.readthedocs.org/en/latest/)
[![Build services](https://github.com/Pyomo/jenkins-status/blob/main/pyomo_services.svg)](https://pyomo-jenkins.sandia.gov/)
[![GitHub contributors](https://img.shields.io/github/contributors/pyomo/pyomo.svg)](https://github.com/pyomo/pyomo/graphs/contributors)
[![Merged PRs](https://img.shields.io/github/issues-pr-closed-raw/pyomo/pyomo.svg?label=merged+PRs)](https://github.com/pyomo/pyomo/pulls?q=is:pr+is:merged)
Expand Down Expand Up @@ -38,10 +38,10 @@ Pyomo's modeling objects are embedded within a full-featured high-level
programming language, which allows for transparent parallelization of
subproblems using Python parallel communication libraries.

* [Pyomo Home](http://www.pyomo.org)
* [About Pyomo](http://www.pyomo.org/about)
* [Download](http://www.pyomo.org/installation/)
* [Documentation](http://www.pyomo.org/documentation/)
* [Pyomo Home](https://www.pyomo.org)
* [About Pyomo](https://www.pyomo.org/about)
* [Download](https://www.pyomo.org/installation/)
* [Documentation](https://www.pyomo.org/documentation/)
* [Performance Plots](https://pyomo.github.io/performance/)

Pyomo was formerly released as the Coopr software library.
Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/solver/tests/solvers/test_ipopt.py
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ def test_parse_output_diagnostic_tags(self):
output = """******************************************************************************
This program contains Ipopt, a library for large-scale nonlinear optimization.
Ipopt is released as open source code under the Eclipse Public License (EPL).
For more information visit http://projects.coin-or.org/Ipopt
For more information visit [legacy Ipopt URL removed]

This version of Ipopt was compiled from source code available at
https://github.com/IDAES/Ipopt as part of the Institute for the Design of
Expand Down
Loading