Skip to content

Commit

Permalink
v1.3.0 (#215)
Browse files Browse the repository at this point in the history
* Updated versioneer
* Fixes bug in handling of complex numbers on Windows, added test
* Add GitHub URL for PyPi (resolves #213), updated version
  • Loading branch information
martinandersen committed Mar 7, 2022
1 parent 92e26af commit f236615
Show file tree
Hide file tree
Showing 30 changed files with 300 additions and 257 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/windows_build.yml
Expand Up @@ -7,7 +7,7 @@ jobs:

# if: false

runs-on: windows-latest
runs-on: windows-2019
env:
SUITESPARSE_VERSION: 5.10.1
SUITESPARSE_SHA256: acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee
Expand Down Expand Up @@ -79,7 +79,6 @@ jobs:
shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars${{matrix.msvc_target}}.bat"
- name: Build/install CVXOPT
shell: cmd
run: |
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
CVXOPT version 1.2
CVXOPT version 1.3

Copyright (c) 2012-2022 M. Andersen and L. Vandenberghe.
Copyright (c) 2010-2011 L. Vandenberghe.
Expand Down
6 changes: 4 additions & 2 deletions doc/html/_static/basic.css
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
* :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down Expand Up @@ -731,8 +731,9 @@ dl.glossary dt {

.classifier:before {
font-style: normal;
margin: 0.5em;
margin: 0 0.5em;
content: ":";
display: inline-block;
}

abbr, acronym {
Expand All @@ -756,6 +757,7 @@ span.pre {
-ms-hyphens: none;
-webkit-hyphens: none;
hyphens: none;
white-space: nowrap;
}

div[class*="highlight-"] {
Expand Down
5 changes: 4 additions & 1 deletion doc/html/_static/doctools.js
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for all documentation.
*
* :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down Expand Up @@ -264,6 +264,9 @@ var Documentation = {
hideSearchWords : function() {
$('#searchbox .highlight-link').fadeOut(300);
$('span.highlighted').removeClass('highlighted');
var url = new URL(window.location);
url.searchParams.delete('highlight');
window.history.replaceState({}, '', url);
},

/**
Expand Down
2 changes: 1 addition & 1 deletion doc/html/_static/documentation_options.js
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '1.2.8',
VERSION: '1.3.0',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
2 changes: 1 addition & 1 deletion doc/html/_static/language_data.js
Expand Up @@ -5,7 +5,7 @@
* This script contains the language-specific data used by searchtools.js,
* namely the list of stopwords, stemmer, scorer and splitter.
*
* :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down
15 changes: 11 additions & 4 deletions doc/html/_static/searchtools.js
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for the full-text search.
*
* :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down Expand Up @@ -282,7 +282,10 @@ var Search = {
complete: function(jqxhr, textstatus) {
var data = jqxhr.responseText;
if (data !== '' && data !== undefined) {
listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
var summary = Search.makeSearchSummary(data, searchterms, hlterms);
if (summary) {
listItem.append(summary);
}
}
Search.output.append(listItem);
setTimeout(function() {
Expand Down Expand Up @@ -325,7 +328,9 @@ var Search = {
var results = [];

for (var prefix in objects) {
for (var name in objects[prefix]) {
for (var iMatch = 0; iMatch != objects[prefix].length; ++iMatch) {
var match = objects[prefix][iMatch];
var name = match[4];
var fullname = (prefix ? prefix + '.' : '') + name;
var fullnameLower = fullname.toLowerCase()
if (fullnameLower.indexOf(object) > -1) {
Expand All @@ -339,7 +344,6 @@ var Search = {
} else if (parts[parts.length - 1].indexOf(object) > -1) {
score += Scorer.objPartialMatch;
}
var match = objects[prefix][name];
var objname = objnames[match[1]][2];
var title = titles[match[0]];
// If more than one term searched for, we require other words to be
Expand Down Expand Up @@ -498,6 +502,9 @@ var Search = {
*/
makeSearchSummary : function(htmlText, keywords, hlwords) {
var text = Search.htmlToText(htmlText);
if (text == "") {
return null;
}
var textLower = text.toLowerCase();
var start = 0;
$.each(keywords, function() {
Expand Down
58 changes: 29 additions & 29 deletions doc/html/blas.html

Large diffs are not rendered by default.

112 changes: 56 additions & 56 deletions doc/html/c-api.html

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions doc/html/coneprog.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions doc/html/copyright.html
Expand Up @@ -30,7 +30,7 @@
<a href="index.html" class="icon icon-home"> CVXOPT User's Guide
</a>
<div class="version">
1.2.8
1.3.0
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
Expand Down Expand Up @@ -112,7 +112,7 @@ <h1>Copyright and License<a class="headerlink" href="#copyright-and-license" tit

<div role="contentinfo">
<p>&#169; <a href="#">Copyright</a> 2004-2022, M.S. Andersen, J. Dahl, L. Vandenberghe.
<span class="lastupdated">Last updated on Jan 31, 2022.
<span class="lastupdated">Last updated on Mar 07, 2022.
</span></p>
</div>

Expand All @@ -132,7 +132,7 @@ <h1>Copyright and License<a class="headerlink" href="#copyright-and-license" tit
});
</script>
<div class="footer">
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 4.1.2.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 4.4.0.
</div>

</body>
Expand Down

0 comments on commit f236615

Please sign in to comment.