a few fixes

AsyncAlgoTrading · Dec 27, 2019 · a90814d · a90814d
1 parent 6492f89
commit a90814d
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 105 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,27 @@
-recursive-include aat *
+graft aat
+include LICENSE
+include README.md
 
-include requirements.txt
+include setup.cfg
+include pyproject.toml
+include .bumpversion.cfg
+include Makefile
 
+include aat/*.so
+include aat/*.dll
+include aat/*.dylib
+
+graft aat/tests
+
+# C++ build
+graft cpp
+graft cmake
+include CMakeLists.txt
+
+# Patterns to exclude from any directory
+global-exclude *~
+global-exclude *.pyc
+global-exclude *.pyo
+global-exclude .git
+global-exclude .ipynb_checkpoints
+global-exclude .DS_Store
diff --git a/aat/_version.py b/aat/_version.py
@@ -1,11 +1,3 @@
-################################################################################
-#
-# Copyright (c) 2019, the Perspective Authors.
-#
-# This file is part of the Perspective library, distributed under the terms of
-# the Apache License 2.0.  The full license can be found in the LICENSE file.
-#
-
 from collections import namedtuple
 
 VersionInfo = namedtuple('VersionInfo', [

diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
diff --git a/cpp/tests/include/aat/simple.h b/cpp/tests/include/aat/simple.h
diff --git a/cpp/tests/include/aat/test_utils.h b/cpp/tests/include/aat/test_utils.h
diff --git a/cpp/tests/src/aat.cpp b/cpp/tests/src/aat.cpp
diff --git a/cpp/tests/src/simple.cpp b/cpp/tests/src/simple.cpp
diff --git a/setup.py b/setup.py
@@ -78,16 +78,14 @@ def build_extension_cmake(self, ext):
         cfg = 'Debug' if self.debug else 'Release'
 
         cmake_args = [
-            '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + os.path.abspath(os.path.join('perspective', 'table')),
+            '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + os.path.abspath('aat'),
             '-DCMAKE_BUILD_TYPE=' + cfg,
             '-DCPP_BUILD_TESTS=0',
             '-DAAT_PYTHON_VERSION={}'.format(platform.python_version()),
             '-DPYTHON_EXECUTABLE={}'.format(sys.executable),
             '-DPython_ROOT_DIR={}'.format(PREFIX),
             '-DPython_ROOT={}'.format(PREFIX),
-            '-DPSP_CMAKE_MODULE_PATH={folder}'.format(folder=os.path.join(ext.sourcedir, 'cmake')),
-            '-DPSP_CPP_SRC={folder}'.format(folder=ext.sourcedir),
-            '-DPSP_PYTHON_SRC={folder}'.format(folder=os.path.join(ext.sourcedir, "..", 'perspective'))
+            '-DAAT_CMAKE_MODULE_PATH={folder}'.format(folder=os.path.join(ext.sourcedir, 'cmake')),
         ]
 
         build_args = ['--config', cfg]
@@ -104,7 +102,6 @@ def build_extension_cmake(self, ext):
             build_args += ['--', '-j2' if os.environ.get('DOCKER', '') else '-j{}'.format(CPU_COUNT)]
 
         env = os.environ.copy()
-        env['PSP_ENABLE_PYTHON'] = '1'
         env["PYTHONPATH"] = os.path.pathsep.join((os.path.join(os.path.dirname(os.__file__), 'site-packages'), os.path.dirname(os.__file__)))
 
         if not os.path.exists(self.build_temp):