Skip to content

Commit 878c199

Browse files
committed
Merge branch '0.10.1.rel' of https://github.com/annoviko/pyclustering into 0.10.1.rel
2 parents 384baeb + 6916a6a commit 878c199

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,8 @@ Illustrations
484484
:target: https://ci.appveyor.com/project/annoviko/pyclustering/branch/master
485485
.. |Coverage Status| image:: https://coveralls.io/repos/github/annoviko/pyclustering/badge.svg?branch=master&ts=1
486486
:target: https://coveralls.io/github/annoviko/pyclustering?branch=master
487-
.. |DOI| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1491324.svg
488-
:target: https://doi.org/10.5281/zenodo.1491324
487+
.. |DOI| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.4280556.svg
488+
:target: https://doi.org/10.5281/zenodo.4280556
489489
.. |PyPi| image:: https://badge.fury.io/py/pyclustering.svg
490490
:target: https://badge.fury.io/py/pyclustering
491491
.. |Build Status Linux MacOS 0.10.dev| image:: https://travis-ci.org/annoviko/pyclustering.svg?branch=0.10.dev

ci/github-ci.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ run_pypi_install_job() {
3535
print_info "Install 'setuptools' for pip3."
3636

3737
sudo apt-get install -qq python3-pip
38+
sudo apt-get install -qq python3-setuptools
3839

3940
print_info "Install 'pyclustering' from PyPi."
4041

docs/doxygen_conf_ccore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ TREEVIEW_WIDTH = 250
180180
EXT_LINKS_IN_WINDOW = NO
181181
FORMULA_FONTSIZE = 10
182182
FORMULA_TRANSPARENT = YES
183-
USE_MATHJAX = NO
183+
USE_MATHJAX = YES
184184
MATHJAX_FORMAT = HTML-CSS
185185
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
186186
MATHJAX_EXTENSIONS =

docs/doxygen_conf_pyclustering

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# Project related configuration options
55
#---------------------------------------------------------------------------
66
DOXYFILE_ENCODING = UTF-8
7-
PROJECT_NAME = ""
8-
PROJECT_NUMBER =
9-
PROJECT_BRIEF =
10-
PROJECT_LOGO = docs/logo/pyclustering_logo_01_small.png
7+
PROJECT_NAME = "pyclustering"
8+
PROJECT_NUMBER = 0.10.1
9+
PROJECT_BRIEF = "pyclustring is a Python, C++ data mining library."
10+
PROJECT_LOGO = docs/logo/pyclustering_logo_02.png
1111
OUTPUT_DIRECTORY = doxygen_python_docs
1212
CREATE_SUBDIRS = YES
1313
OUTPUT_LANGUAGE = English
@@ -25,7 +25,7 @@ QT_AUTOBRIEF = NO
2525
MULTILINE_CPP_IS_BRIEF = NO
2626
INHERIT_DOCS = YES
2727
SEPARATE_MEMBER_PAGES = NO
28-
TAB_SIZE = 8
28+
TAB_SIZE = 4
2929
ALIASES =
3030
TCL_SUBST =
3131
OPTIMIZE_OUTPUT_FOR_C = NO
@@ -227,19 +227,19 @@ QHP_SECT_FILTER_ATTRS =
227227
QHG_LOCATION =
228228
GENERATE_ECLIPSEHELP = NO
229229
ECLIPSE_DOC_ID = org.doxygen.Project
230-
DISABLE_INDEX = NO
230+
DISABLE_INDEX = YES
231231
GENERATE_TREEVIEW = YES
232232
ENUM_VALUES_PER_LINE = 4
233233
TREEVIEW_WIDTH = 250
234234
EXT_LINKS_IN_WINDOW = NO
235235
FORMULA_FONTSIZE = 10
236236
FORMULA_TRANSPARENT = YES
237-
USE_MATHJAX = NO
237+
USE_MATHJAX = YES
238238
MATHJAX_FORMAT = HTML-CSS
239239
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
240240
MATHJAX_EXTENSIONS =
241241
MATHJAX_CODEFILE =
242-
SEARCHENGINE = YES
242+
SEARCHENGINE = NO
243243
SERVER_BASED_SEARCH = YES
244244
EXTERNAL_SEARCH = NO
245245
SEARCHENGINE_URL =
@@ -359,4 +359,4 @@ MAX_DOT_GRAPH_DEPTH = 0
359359
DOT_TRANSPARENT = NO
360360
DOT_MULTI_TARGETS = NO
361361
GENERATE_LEGEND = YES
362-
DOT_CLEANUP = NO
362+
DOT_CLEANUP = NO

docs/logo/pyclustering_logo_02.png

-223 KB
Loading

0 commit comments

Comments
 (0)