Merge pull request vnpy#2979 from vnpy/dev

Dev
kylingood · May 3, 2021 · 81ab73d · 81ab73d
2 parents 7963389 + aa4e5cc
commit 81ab73d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 42 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -27,4 +27,7 @@ QScintilla==2.11.4
 plotly
 quickfix
 trading-calendars
-influxdb
+influxdb
+vnpy_ctp
+vnpy_ctptest
+vnpy_okex
diff --git a/setup.py b/setup.py
@@ -108,42 +108,6 @@ def get_ext_modules():
         extra_link_args = ["-lstdc++"]
         runtime_library_dirs = ["$ORIGIN"]
 
-    vnctpmd = Extension(
-        "vnpy.api.ctp.vnctpmd",
-        [
-            "vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.cpp",
-        ],
-        include_dirs=["vnpy/api/ctp/include",
-                      "vnpy/api/ctp/vnctp"],
-        define_macros=[],
-        undef_macros=[],
-        library_dirs=["vnpy/api/ctp/libs", "vnpy/api/ctp"],
-        libraries=["thostmduserapi_se", "thosttraderapi_se"],
-        extra_compile_args=compiler_flags,
-        extra_link_args=extra_link_args,
-        runtime_library_dirs=runtime_library_dirs,
-        depends=[],
-        language="cpp",
-    )
-
-    vnctptd = Extension(
-        "vnpy.api.ctp.vnctptd",
-        [
-            "vnpy/api/ctp/vnctp/vnctptd/vnctptd.cpp",
-        ],
-        include_dirs=["vnpy/api/ctp/include",
-                      "vnpy/api/ctp/vnctp"],
-        define_macros=[],
-        undef_macros=[],
-        library_dirs=["vnpy/api/ctp/libs", "vnpy/api/ctp"],
-        libraries=["thostmduserapi_se", "thosttraderapi_se"],
-        extra_compile_args=compiler_flags,
-        extra_link_args=extra_link_args,
-        runtime_library_dirs=runtime_library_dirs,
-        depends=[],
-        language="cpp",
-    )
-
     vnxtpmd = Extension(
         "vnpy.api.xtp.vnxtpmd",
         [
@@ -337,18 +301,13 @@ def get_ext_modules():
         ext_modules = []
     else:
         ext_modules = [
-            vnctptd, vnctpmd,
             vnxtptd, vnxtpmd,
             vnsgittd, vnsgitmd,
             vnksgoldmd, vnksgoldtd,
             vnnhmd, vnnhfutures, vnnhstock,
             vnrohontd, vnrohonmd,
         ]
 
-    ext_modules = check_extension_build_flag(
-        ext_modules, "VNPY_BUILD_CTP", vnctptd)
-    ext_modules = check_extension_build_flag(
-        ext_modules, "VNPY_BUILD_CTP", vnctpmd)
     ext_modules = check_extension_build_flag(
         ext_modules, "VNPY_BUILD_XTP", vnxtptd)
     ext_modules = check_extension_build_flag(