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

Add scikit-beam correlation code. #13

Draft
wants to merge 1,787 commits into
base: master
Choose a base branch
from

Conversation

danielballan
Copy link
Member

@danielballan danielballan commented Jan 30, 2020

This branch was created via the following procedure:

  1. Create a copy of the scikit-beam/scikit-beam repo.
  2. Execute git filter-branch --force --tree-filter 'rm -rf <path> <another_path> ...' --prune-empty to remove all files except correlation.py, the other modules that it imports, and its tests. Any commits that didn't touch any of the relevant files were pruned.
  3. On this 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.

ericdill and others added 30 commits February 18, 2016 12:31
CI: Invoke coverage with the 'coverage run`
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
MNT: Allow conda binaries for windows to be produced
mrakitin and others added 29 commits October 11, 2019 16:40
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
…3f2c5'

git-subtree-dir: skbeam_copied
git-subtree-mainline: dd47b01
git-subtree-split: f92e107
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.