Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merge error with renamed types #358 #361

Merged
merged 3 commits into from
Jan 4, 2019
Merged

Fix merge error with renamed types #358 #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37c4273
fix python for types, prepare for publish
timkpaine Jan 4, 2019
3bd8811
will no coinstall namespaced with https://github.com/timkpaine/perspe…
timkpaine Jan 4, 2019
bf060c5
fix dist command
timkpaine Jan 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
201 changes: 0 additions & 201 deletions python/LICENSE
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions python/MANIFEST.in
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Empty file removed python/README.md
View file
Open in desktop
Empty file.
10 changes: 5 additions & 5 deletions python/perspective/include/perspective/binding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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>())

Expand Down Expand Up @@ -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
Expand Down
Loading