Merge master into v1.5 #362
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Travis issue causes packages to be built from source, which times out.
HDF5 object wrappers (h5group and h5dataset) submodule is now called HDF5.
More efficient versions of ProxyList and RefProxyList
… err for len(col) not correct/ del col_idx for unit.setter
* 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.
Bindings removal and internals rewrite: Merge to master
jgrewe
approved these changes
Jan 23, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges master into v1.5 with all the history and changes that came from the dev branch.
Changes made to the info.json (version bumps) are preserved.
We need this merge to easily bring the release branch up to date with master when preparing releases.