Skip to content

Commit

Permalink
Remove further references to ctx
Browse files Browse the repository at this point in the history
  • Loading branch information
mfherbst committed Nov 9, 2019
1 parent 0f6af89 commit 53e314b
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 20 deletions.
15 changes: 1 addition & 14 deletions LICENSE_adccore
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
#
Expand Down
2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -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/ *
2 changes: 0 additions & 2 deletions extension/AdcCore.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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):
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 53e314b

Please sign in to comment.