Merge pull request #361 from timkpaine/python

Fix merge error with renamed types #358

MANIFEST.in

@@ -0,0 +1,8 @@
+prune examples/
+prune test_data/
+prune perspective/*.so
+prune perspective/include/
+prune perspective/src/
+prune src/
+include python/requirements.txt
+include CMakeList.txt

python/Makefile

@@ -1,9 +1,9 @@
 build: ## build the package
-	python3 setup.py build
+	cd .. && python3 setup.py build
 
 inplace: ## copy things inplace
-	cp `find build -name "libbinding.so"` perspective/
-	cp `find build -name "libpsp.so"` perspective/
+	cp `find ../build -name "libbinding.so"` perspective/table/
+	cp `find ../build -name "libpsp.so"` perspective/table/
 
 tests: inplace ## Clean and Make unit tests
 	python3 -m nose2 -v perspective --with-coverage --coverage=perspective
@@ -31,7 +31,7 @@ clean: ## clean the repository
 	find . -name "*.a"  | xargs rm -rf
 
 install:  ## install to site-packages
-	python3 setup.py install
+	python3 -m pip install ..
 
 preinstall:  ## install dependencies
 	python3 -m pip install -r requirements.txt
@@ -40,7 +40,7 @@ docs:  ## make documentation
 	make -C ./docs html
 
 dist:  ## dist to pypi
-	python3 setup.py sdist upload -r pypi
+	cd .. && python3 setup.py sdist upload -r pypi
 
 # Thanks to Francoise at marmelab.com for this
 .DEFAULT_GOAL := help

python/perspective/include/perspective/binding.h

@@ -25,10 +25,10 @@ void test(const char* name);
 perspective::t_schema* t_schema_init(py::list& columns, py::list& types);
 
 template<typename T>
-void _fill_col(std::vector<T>& dcol, perspective::t_col_sptr col);
+void _fill_col(std::vector<T>& dcol, std::shared_ptr<perspective::t_column> col);
 
 template<typename T>
-void _fill_col_np(np::ndarray& dcol, perspective::t_col_sptr col);
+void _fill_col_np(np::ndarray& dcol, std::shared_ptr<perspective::t_column> col);
 
 
 void _fill_data_single_column(perspective::t_table& tbl,
@@ -80,7 +80,7 @@ BOOST_PYTHON_MODULE(libbinding)
 
 
     py::class_<perspective::t_schema>("t_schema",
-        py::init<perspective::t_svec, perspective::t_dtypevec>())
+        py::init<std::vector<std::string>, std::vector<perspective::t_dtype> >())
         .def(py::init<>())
         .def(py::init<perspective::t_schema_recipe>())
 
@@ -132,8 +132,8 @@ BOOST_PYTHON_MODULE(libbinding)
 
         .def("pprint", static_cast<void (perspective::t_table::*)() const>(&perspective::t_table::pprint))
         .def("pprint", static_cast<void (perspective::t_table::*)(perspective::t_uindex, std::ostream*) const>(&perspective::t_table::pprint))
-        .def("pprint", static_cast<void (perspective::t_table::*)(const perspective::t_str&) const>(&perspective::t_table::pprint))
-        .def("pprint", static_cast<void (perspective::t_table::*)(const perspective::t_uidxvec&) const>(&perspective::t_table::pprint))
+        .def("pprint", static_cast<void (perspective::t_table::*)(const std::string&) const>(&perspective::t_table::pprint))
+        .def("pprint", static_cast<void (perspective::t_table::*)(const std::vector<perspective::t_uindex>&) const>(&perspective::t_table::pprint))
 
 
         // custom add ins