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.

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

Bindings removal and internals rewrite: Merge to master #361

Merged
merged 295 commits into from
Jan 18, 2019

Conversation

achilleas-k
Copy link
Member

@achilleas-k achilleas-k commented Jan 18, 2019

Everything on no-bindings-dev branch has been reviewed and tested. This new branch is the result of rebasing no-bindings-dev onto master. The merge-base between the two is db6669d after which there were 35 commits made to master.

After the rebase, I had to cleanup some leftovers. For example, bindings files were changed in master, deleted in the dev branch, and the changes of course remained after the rebase. Instead of cleaning up the history by going back and amending the original src/ removal commits (21c6b89 and 4b7131c) to delete the changed files, I opted to create a single commit that fixes the rebase (3d03ed8).

This branch (dev15) should differ from the no-bindings-dev branch only in places where changes were made to master that were meant to persist after the removal of the bindings and container rewrite.

Things to check:

No cross-compatibility tests (yet).
- conftest.py: Adds option to force compatibility tests
               (--force-compat).
- Compatibility test file returns with error when tests are forced and
the compilation fails.
- Bugfix: was returning inverse exit value when run as script.
- Bugfix: missing LD_LIBRARY_PATH would return empty string which would
create an empty argument and fail.
- Windows: library name is nixio.
- Windows: MSVC compiler does not have /std:c++11 option (only 14 and
latest).
Accidentally added when merging changes from master branch.
The removal of the bindings lets us clean out the Mixins so we can
rewrite the class in a much cleaner fashion. The File.open() function
now simply calls the File() constructor.
ProxyLists are going to be removed but for now, I need to duplicate this
definition to avoid an import cycle.
Was only supported in HDF5 backend.
- Dimension
- EntityWithSources
- Property
- Section
HDF5 object wrappers (h5group and h5dataset) submodule is now called
HDF5.
Top level files should retain original dates:
2015 for group.py and 2014 for the rest.
hkchekc and others added 20 commits January 17, 2019 14:34
* fixed broken links eddited install instruction to install nixio no bindings

* deleted all NIX c++ dependencies and information, added new "advance install"

* added mising link to NIXPy

* added beta version install instructions, fixed stable version install instruction
* small fix to append_column/ short col too long

* write_df_compat sole test

* fix bug for np.string not converted to vlen_str

* Revert "write_df_compat sole test" in this branch

This reverts commit a1c0ab1.
When looking for NIX to compile cross-compatibility tests, search both
in /usr and /usr/local directories, as well as any directories supplied
by the user through the env vars (NIX_LIBDIR, NIX_INCDIR, BOOST_LIBDIR,
BOOST_INCDIR)
Old way is deprecated and produces warnings.
Now building in conftest and sending bindir to tests via fixture. Tests
are disabled by being marked with 'skip' if the build fails and
force-compat is not specified.
The compatibility tests are no longer run by default when NIX is
detected. They can be run by specifying --nix-compat. If specified, the
tests are compiled and any errors will cause failure of the
compatibility tests. If the option is not specified, the tests are
skipped, even if NIX is available.

One reason for this change is that the compatibility tests were always
compiled when NIX was available, even when they are unselected, and
compilation slows down the tests.

With this change, they are only compiled and run when explicitly
enabled.
Rebasing of no-bindings-dev branch off master had leftover files that
were modified in master after the merge-base. Removing them here.
Counterpart to 779ee10 from before 1.5
dev rebase.
Counterpart to cca977c from before 1.5
dev rebase.
@achilleas-k achilleas-k requested review from jgrewe and gicmo and removed request for jgrewe January 18, 2019 12:02
@coveralls
Copy link

Coverage Status

Coverage decreased (-3.9%) to 89.71% when pulling 6487b8f on achilleas-k:dev15 into 25ccda7 on G-Node:master.

Copy link
Member

@gicmo gicmo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚢🤡

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants