From 53e314b6def65c8c48bffc7d167140d6c2c761fd Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Sat, 9 Nov 2019 16:46:01 +0100 Subject: [PATCH] Remove further references to ctx --- LICENSE_adccore | 15 +-------------- MANIFEST.in | 2 -- extension/AdcCore.py | 2 -- setup.py | 3 +-- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/LICENSE_adccore b/LICENSE_adccore index 66ac3c87..f25c494a 100644 --- a/LICENSE_adccore +++ b/LICENSE_adccore @@ -2,7 +2,7 @@ #-- Introduction --# ###################### adcc and the adcc source code is released under the terms of the GNU General Public - License Version 3 (LGPLv3). This terms of release, however, do not apply to the + License Version 3 (GPLv3). This terms of release, however, do not apply to the adccore binary file `libadccore.so` (or a simlilarly named dylib file for MacOS), contained in the `adcc/lib` directory of the python code tarball or the python package directory. @@ -119,19 +119,6 @@ them, and agree to be bound by their terms and conditions. This section lists the third-party components integrated into adccore in binary form, provides the copyright holders and their terms of use. -# -# ctx -# -- **Description:** Library providing key-value C++ datastructures - for organised hierarchical storage. -- **Copyright:** Copyright (c) 2019 Michael F. Herbst -- **License:** Apache License 2.0 -- **Website:** https://github.com/mfherbst/ctx -- **Publication:** http://doi.org/10.5281/zenodo.2590706 - -To view the license statement and copyright notices, see the files -in the folder adcc/lib/libadccore_thirdparty/ctx - # # libadc # diff --git a/MANIFEST.in b/MANIFEST.in index 6fd3fc3b..8c171b99 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -14,11 +14,9 @@ include extension/AdcCore.py # (i.e. include files and compiled binary) include extension/adccore/adccore_config.json recursive-include extension/adccore/include/adcc/ *.hh -recursive-include extension/adccore/include/ctx/ *.hh include adcc/lib/libadccore.so include adcc/lib/libadccore.dylib include adcc/lib/libadccore.*.dylib include adcc/lib/libstdc++.so.* include adcc/lib/libc++.so.* include adcc/lib/libadccore_LICENSE -recursive-include adcc/lib/libadccore_thirdparty/ctx/ * diff --git a/extension/AdcCore.py b/extension/AdcCore.py index cfe7dc52..7ee1ae53 100644 --- a/extension/AdcCore.py +++ b/extension/AdcCore.py @@ -175,7 +175,6 @@ def file_globs(self): """ return [ self.install_dir + "/adccore_config.json", - self.install_dir + "/include/ctx/*.hh", self.install_dir + "/include/adcc/*.hh", self.install_dir + "/include/adcc/*/*.hh", self.library_dir + "/libadccore.so", @@ -184,7 +183,6 @@ def file_globs(self): self.library_dir + "/libstdc++.so.*", self.library_dir + "/libc++.so.*", self.library_dir + "/libadccore_LICENSE", - self.library_dir + "/libadccore_thirdparty/ctx/*", ] def get_tarball_name(self, version=None, postfix=None): diff --git a/setup.py b/setup.py index 72130ca6..d3692bd2 100755 --- a/setup.py +++ b/setup.py @@ -349,8 +349,7 @@ def run_tests(self): packages=find_packages(exclude=["*.test*", "test"]), package_data={"adcc": ["lib/*.so", "lib/*.dylib", "lib/*.so.*", - "lib/libadccore_LICENSE", - "lib/libadccore_thirdparty/ctx/*"], + "lib/libadccore_LICENSE"], "": ["LICENSE*"]}, ext_modules=ext_modules, zip_safe=False,