Merge pull request #728 from finos/python_monorepo

convert to monolithic python install

Author: texodus

.travis.yml

@@ -21,18 +21,6 @@ matrix:
       cache: pip
       services: docker
 
-    - python: "3.6"
-      language: python
-      env: TEST=PYTHON_TABLE
-      cache: pip
-      services: docker
-
-    - python: "3.6"
-      language: python
-      env: TEST=PYTHON_NODE
-      cache: pip
-      services: docker
-
     - language: c++
       env: TEST=CPP_OSX
       os: osx
@@ -48,7 +36,7 @@ env:
 
 install:
   - if [ "$TEST" = "CPP_OSX" ]; then brew install yarn; fi
-  - if [ "$TEST" = "PYTHON_NODE"]; then curl -sL https://deb.nodesource.com/setup_8.x | bash - && apt-get install npm; fi
+  - if [ "$TEST" = "PYTHON"]; then curl -sL https://deb.nodesource.com/setup_8.x | bash - && apt-get install npm; fi
   - yarn
 
 script:
@@ -59,7 +47,5 @@ script:
   - if [ "$TEST" = "CPP" ]; then PSP_DOCKER=1 yarn build_cpp; fi
   - if [ "$TEST" = "CPP" ]; then PSP_DOCKER=1 yarn test_cpp; fi
   - if [ "$TEST" = "PYTHON" ]; then PSP_DOCKER=1 yarn ci_python; fi
-  - if [ "$TEST" = "PYTHON_TABLE" ]; then PSP_DOCKER=1 yarn ci_python:table; fi
-  - if [ "$TEST" = "PYTHON_NODE" ]; then PSP_DOCKER=1 yarn ci_python:node; fi
   - if [ "$TEST" = "CPP_OSX" ]; then yarn build_cpp; fi
   - if [ "$TEST" = "CPP_OSX" ]; then yarn test_cpp; fi

cpp/perspective/CMakeLists.txt

@@ -241,7 +241,7 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
 		# PYTHON BINDINGS BUILD #
 		#########################
 		include_directories("/usr/local/include/python3.7m")  # FIXME
-		include_directories("${CMAKE_SOURCE_DIR}/../../python/table/perspective/include")
+		include_directories("${CMAKE_SOURCE_DIR}/../../python/perspective/perspective/include")
 		find_package( PythonInterp 3.7 REQUIRED )
 		find_package( PythonLibs 3.7 REQUIRED )
 		include_directories( ${PYTHON_INCLUDE_DIRS} )
@@ -356,14 +356,14 @@ set (SOURCE_FILES
 	)
 
 set (PYTHON_SOURCE_FILES
-	${CMAKE_SOURCE_DIR}/../../python/table/perspective/src/accessor.cpp
-	${CMAKE_SOURCE_DIR}/../../python/table/perspective/src/context.cpp
-	${CMAKE_SOURCE_DIR}/../../python/table/perspective/src/fill.cpp
-	${CMAKE_SOURCE_DIR}/../../python/table/perspective/src/python.cpp
-	${CMAKE_SOURCE_DIR}/../../python/table/perspective/src/serialization.cpp
-	${CMAKE_SOURCE_DIR}/../../python/table/perspective/src/table.cpp
-	${CMAKE_SOURCE_DIR}/../../python/table/perspective/src/utils.cpp
-	${CMAKE_SOURCE_DIR}/../../python/table/perspective/src/view.cpp
+	${CMAKE_SOURCE_DIR}/../../python/perspective/perspective/src/accessor.cpp
+	${CMAKE_SOURCE_DIR}/../../python/perspective/perspective/src/context.cpp
+	${CMAKE_SOURCE_DIR}/../../python/perspective/perspective/src/fill.cpp
+	${CMAKE_SOURCE_DIR}/../../python/perspective/perspective/src/python.cpp
+	${CMAKE_SOURCE_DIR}/../../python/perspective/perspective/src/serialization.cpp
+	${CMAKE_SOURCE_DIR}/../../python/perspective/perspective/src/table.cpp
+	${CMAKE_SOURCE_DIR}/../../python/perspective/perspective/src/utils.cpp
+	${CMAKE_SOURCE_DIR}/../../python/perspective/perspective/src/view.cpp
 	)
 
 if (WIN32)

package.json

@@ -72,39 +72,28 @@
         "build": "node scripts/build.js",
         "build_cpp": "node scripts/build_cpp.js",
         "build_python": "node scripts/build_python.js",
-        "build_python:table": "node scripts/build_python.js --target table",
-        "build_python:node": "node scripts/build_python.js --target node",
         "ci_python": "node scripts/ci_python.js",
-        "ci_python:table": "node scripts/ci_python.js --target table",
-        "ci_python:node": "node scripts/ci_python.js --target node",
         "install_python": "cd python/table && python3 setup.py install",
-        "install_python:table": "cd python/perspective && python3 setup.py install",
         "bench": "node scripts/bench.js",
         "setup": "node scripts/setup.js",
         "docs": "node scripts/docs.js",
         "test": "node scripts/test.js",
         "test_js": "node scripts/test_js.js",
         "test_cpp": "node scripts/test_cpp.js",
         "test_python": "node scripts/test_python.js",
-        "test_python:table": "node scripts/test_python.js --target table",
-        "test_python:node": "node scripts/test_python.js --target node",
         "clean": "node scripts/clean.js",
         "start": "lerna run start --stream --scope",
         "precommit": "npm run lint",
         "publish_python": "python3 setup.py sdist upload -r pypi",
-        "lint": "npm-run-all lint:* lint_python:*",
+        "lint": "npm-run-all lint:* lint_python",
         "lint:eslint": "eslint packages/*/src/**/*.js packages/*/test/**/*.js examples/*/*.js",
         "lint_python": "node scripts/lint_python.js",
-        "lint_python:table": "node scripts/lint_python.js --target table",
-        "lint_python:node": "node scripts/lint_python.js --target node",
         "fix:es": "npm run lint:eslint -- --fix",
         "fix:cpp": "node scripts/fix_cpp.js",
         "fix:less": "prettier --tab-width 4 --write packages/**/src/less/*.less",
         "fix:html": "html-beautify packages/**/src/html/*.html -r",
         "fix:json": "prettier --tab-width 4 --write **/package.json",
         "fix_python": "node scripts/lint_python.js --fix",
-        "fix_python:table": "node scripts/lint_python.js --fix --target table",
-        "fix_python:node": "node scripts/lint_python.js --fix --target node",
         "fix": "npm-run-all --silent fix:*",
         "toggle_puppeteer": "node scripts/toggle_puppeteer.js"
     }