Skip to content

Commit 7774b16

Browse files
authored
Merge branch 'master' into da-on-jax
2 parents 7ff43c9 + acd84ed commit 7774b16

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016 Rémi Flamary
3+
Copyright (c) 2016-2023 POT contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,16 @@ The examples folder contain several examples and use case for the library. The f
185185

186186
## Acknowledgements
187187

188-
This toolbox has been created and is maintained by
188+
This toolbox has been created by
189189

190-
* [Rémi Flamary](http://remi.flamary.com/)
190+
* [Rémi Flamary](https://remi.flamary.com/)
191191
* [Nicolas Courty](http://people.irisa.fr/Nicolas.Courty/)
192192

193+
It is currently maintained by
194+
195+
* [Rémi Flamary](https://remi.flamary.com/)
196+
* [Cédric Vincent-Cuaz](https://cedricvincentcuaz.github.io/)
197+
193198
The numerous contributors to this library are listed [here](CONTRIBUTORS.md).
194199

195200
POT has benefited from the financing or manpower from the following partners:

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ def __getattr__(cls, name):
9999

100100
# General information about the project.
101101
project = u'POT Python Optimal Transport'
102-
copyright = u'2016-2021, Rémi Flamary, Nicolas Courty'
103-
author = u'Rémi Flamary, Nicolas Courty'
102+
copyright = u'2016-2023, POT Contributors'
103+
author = u'Rémi Flamary, POT Contributors'
104104

105105
# The version info for the project you're documenting, acts as replacement for
106106
# |version| and |release|, also used in various other places throughout the

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
description='Python Optimal Transport Library',
5252
long_description=README,
5353
long_description_content_type='text/markdown',
54-
author=u'Remi Flamary, Nicolas Courty',
54+
author=u'Remi Flamary, Nicolas Courty, POT Contributors',
5555
author_email='remi.flamary@gmail.com, ncourty@gmail.com',
5656
url='https://github.com/PythonOT/POT',
5757
packages=find_packages(exclude=["benchmarks"]),

0 commit comments

Comments
 (0)