Skip to content

Commit 86faaa4

Browse files
author
Nathan Cassereau
committed
Now using MYST_PARSER and solving links issue in the README.md / online docs
1 parent d02f71a commit 86faaa4

File tree

10 files changed

+24
-17
lines changed

10 files changed

+24
-17
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,12 @@ This toolbox benefit a lot from open source research and we would like to thank
202202

203203
* [Gabriel Peyré](http://gpeyre.github.io/) (Wasserstein Barycenters in Matlab)
204204
* [Mathieu Blondel](https://mblondel.org/) (original implementation smooth OT)
205-
* [Nicolas Bonneel](http://liris.cnrs.fr/~nbonneel/) ( C++ code for EMD)
205+
* [Nicolas Bonneel](http://liris.cnrs.fr/~nbonneel/) (C++ code for EMD)
206206
* [Marco Cuturi](http://marcocuturi.net/) (Sinkhorn Knopp in Matlab/Cuda)
207207

208208
## Contributions and code of conduct
209209

210-
Every contribution is welcome and should respect the [contribution guidelines](https://pythonot.github.io/contributing.html). Each member of the project is expected to follow the [code of conduct](https://pythonot.github.io/code_of_conduct.html).
210+
Every contribution is welcome and should respect the [contribution guidelines](.github/CONTRIBUTING.md). Each member of the project is expected to follow the [code of conduct](.github/CODE_OF_CONDUCT.md).
211211

212212
## Support
213213

@@ -217,7 +217,7 @@ You can ask questions and join the development discussion:
217217
* On the POT [gitter channel](https://gitter.im/PythonOT/community)
218218
* On the POT [mailing list](https://mail.python.org/mm3/mailman3/lists/pot.python.org/)
219219

220-
You can also post bug reports and feature requests in Github issues. Make sure to read our [guidelines](https://pythonot.github.io/contributing.html) first.
220+
You can also post bug reports and feature requests in Github issues. Make sure to read our [guidelines](.github/CONTRIBUTING.md) first.
221221

222222
## References
223223

benchmarks/benchmark.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ def convert_to_html_table(results, param_name, main_title=None, comments=None):
8484

8585
# make device header
8686
string += f'<tr><th align="center">Device</th>'
87-
string += f'<th align="center" colspan="{cpus_cols}"">CPU</th>'
88-
string += f'<th align="center" colspan="{gpus_cols}">GPU</tr>\n'
87+
string += f'<th align="center" colspan="{cpus_cols}">CPU</th>'
88+
string += f'<th align="center" colspan="{gpus_cols}">GPU</th></tr>\n'
8989

9090
# make param_name / backend header
9191
string += f'<tr><th align="center">{param_name}</th>'

docs/requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ numpydoc
44
memory_profiler
55
pillow
66
networkx
7-
mistune==0.8.4
8-
m2r2
7+
myst-parser

docs/requirements_rtd.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ numpydoc
33
memory_profiler
44
pillow
55
networkx
6-
mistune==0.8.4
7-
m2r2
6+
myst-parser
87
numpy
98
scipy>=1.0
109
cython
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Code of Conduct
2+
===============
3+
4+
.. include:: ../../../.github/CODE_OF_CONDUCT.md
5+
:parser: myst_parser.sphinx_
6+
:start-line: 2

docs/source/.github/CONTRIBUTING.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Contributing to POT
2+
===================
3+
4+
.. include:: ../../../.github/CONTRIBUTING.md
5+
:parser: myst_parser.sphinx_
6+
:start-line: 3

docs/source/code_of_conduct.rst

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

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def __getattr__(cls, name):
6969
'sphinx.ext.viewcode',
7070
'sphinx.ext.napoleon',
7171
'sphinx_gallery.gen_gallery',
72-
'm2r2'
72+
'myst_parser'
7373
]
7474

7575
autosummary_generate = True

docs/source/contributing.rst

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

docs/source/index.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ Contents
1717
all
1818
auto_examples/index
1919
releases
20-
contributing
21-
Code of Conduct <code_of_conduct>
22-
23-
.. mdinclude:: ../../README.md
24-
:start-line: 2
20+
.github/CONTRIBUTING
21+
.github/CODE_OF_CONDUCT
2522

23+
.. include:: ../../README.md
24+
:parser: myst_parser.sphinx_
2625

2726

2827
Indices and tables

0 commit comments

Comments
 (0)