-
Notifications
You must be signed in to change notification settings - Fork 6
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
Add scikit-beam correlation code. #13
Draft
danielballan
wants to merge
1,787
commits into
scikit-beam:master
Choose a base branch
from
danielballan:add-skbeam-code
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
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
ENH: Fix up repo to respect flake8
CI: Invoke coverage with the 'coverage run`
…We don't need two coverage tools
CI: Build docs separately from automated testing.
* upstream/master: (35 commits) Fix up the math rendering in correlation and utils CI: Add sphinxcontrib-napoleon to the doc build DOC: Fix docstrings to correctly render in sphinx Update index pages to capture all modules in the api Add sphinxcontrib.napoleon to capture Yields in docstring DOC: Fix flake8. Fix rendering of math Final clean up of flake8 for real Final clean up of skbeam! woo! MNT: Delete VCS comments in files Clean up if block TST: Add utils.py for copy/paste code PEP: Fix flake8 errors PEP: Fix flake8 errors PEP: Fix flake8 errors PEP: Fix flake8 errors PEP: Fix flake8 errors PEP: Fix flake8 errors PEP: Fix flake8 errors and ignore api file PEP: Fix flake8 errors PEP: Fix flake8 errors ...
* upstream/master: Set the BUILD_DOCS global coveralls was reporting that scikit-beam was not uploading properly. We don't need two coverage tools Remove lingering flake8 test from bad rebase Only upload to coveralls and codecov if the tests ran ipython nbconvert -> jupyter nbconvert CI: Add doc build separate from tests Invoke coverage with the Nothing to do. Use 'coverage help' for help. mechanism
TST: fixed the tests
To draw bar rois and box rois
MNT: Allow conda binaries for windows to be produced
popd has always been a problem: - https://travis-ci.org/scikit-beam/scikit-beam/jobs/578952209#L3118
Specify numpy version during the installation; support OSX builds
CI configuration: migration from 'nose' to 'pytest'
More stable implementation of 'gaussian_tail' function
Fix setup.py and pip installation
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 branch was created via the following procedure:
scikit-beam/scikit-beam
repo.git filter-branch --force --tree-filter 'rm -rf <path> <another_path> ...' --prune-empty
to remove all files exceptcorrelation.py
, the other modules that it imports, and its tests. Any commits that didn't touch any of the relevant files were pruned.autocorr
branch use,git subtree add --prefix=skbeam_copied ../scikit-beam-copy/ master
to merge the history into this project.Useful reference: https://dalibornasevic.com/posts/2-permanently-remove-files-and-folders-from-git-repo
This is not ready to merge. The relative imports need to be fixed.