merged RC_1_2 into RC_2_0

This commit is contained in:
arvidn
2022-01-29 17:56:16 +01:00
4 changed files with 41 additions and 5 deletions

View File

@ -100,8 +100,10 @@ jobs:
# command that works everywhere
python3 setup.py build_ext install --user --prefix=
# TODO: we currently don't run the tests on MacOS, because something fails
# to install correctly. It needs to be resolved
- name: tests
if: runner.os != 'Windows'
if: runner.os == 'Linux'
run: |
cd bindings/python
python3 test.py

View File

@ -45,8 +45,7 @@ else
lib boost_system : : <target-os>darwin <name>boost_system-mt $(boost-lib-search-path)
: : $(boost-include-path) ;
lib boost_system : : <name>boost_system $(boost-lib-search-path)
: : $(boost-include-path) ;
lib boost_system : : <name>boost_system ;
}
use-project /try_signal : ./deps/try_signal ;

19
LICENSE
View File

@ -86,7 +86,24 @@ DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------
ed25519 implementation based on public domain version of https://github.com/orlp/ed25519
ed25519 implementation based on:
Copyright (c) 2015 Orson Peters <orsonpeters@gmail.com>
This software is provided 'as-is', without any express or implied warranty. In no event will the
authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the
original software. If you use this software in a product, an acknowledgment in the product
documentation would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be misrepresented as
being the original software.
3. This notice may not be removed or altered from any source distribution.
------------------------------------------------------------------------------

View File

@ -1,4 +1,22 @@
Derived from https://ed25519.cr.yp.to/software.html which is public domain
Additional contributions are placed in the public domain by
Orson Peters
Arvid Norberg
Copyright (c) 2015 Orson Peters <orsonpeters@gmail.com>
This software is provided 'as-is', without any express or implied warranty. In no event will the
authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial
applications, and to alter it and redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the
original software. If you use this software in a product, an acknowledgment in the product
documentation would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be misrepresented as
being the original software.
3. This notice may not be removed or altered from any source distribution.