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
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1787 commits
Select commit Hold shift + click to select a range
6ecd833
CI: Add sphinxcontrib-napoleon to the doc build
ericdill Feb 18, 2016
f2c76d2
ENH: Added box roi
sameera2004 Feb 18, 2016
9d0834d
Fix up the math rendering in correlation and utils
ericdill Feb 18, 2016
016d349
Merge pull request #414 from ericdill/flake8-is-demanding
sameera2004 Feb 18, 2016
9197970
Merge pull request #415 from ericdill/fix-coverage
ericdill Feb 18, 2016
28969f0
CI: Add doc build separate from tests
ericdill Feb 18, 2016
5038a03
Only upload to coveralls and codecov if the tests ran
ericdill Feb 18, 2016
c99a913
Remove lingering flake8 test from bad rebase
ericdill Feb 18, 2016
40e9e93
coveralls was reporting that scikit-beam was not uploading properly. …
ericdill Feb 18, 2016
e016040
Set the BUILD_DOCS global
ericdill Feb 19, 2016
8b7a78e
Merge pull request #416 from ericdill/build-docs-separately
tacaswell Feb 19, 2016
0df87eb
try/except ctrans imports for windows users
ericdill Feb 19, 2016
cc260dc
ENH: fixed the box roi's function
sameera2004 Feb 19, 2016
92b6496
TST: added a test for bar rois and box rois
sameera2004 Feb 19, 2016
3909d46
Merge remote-tracking branch 'upstream/master' into bar_box_rois
sameera2004 Feb 19, 2016
5e54636
TST: tests are working for both bar_rois and box_rois
sameera2004 Feb 19, 2016
868a59d
Merge remote-tracking branch 'upstream/master' into bar_box_rois
sameera2004 Feb 20, 2016
f0a4928
Don't use a special function to raise
ericdill Feb 22, 2016
7fe20ef
API: name changed to bar, box and new function added _make_roi
sameera2004 Feb 22, 2016
b6e1a1f
DOC: fixed the docs
sameera2004 Feb 22, 2016
0abf1fe
DOC: fixed the docs
sameera2004 Feb 22, 2016
6c472f1
DEV: fixed the pep8
sameera2004 Feb 22, 2016
cd2401d
ENH: added spaces
sameera2004 Feb 22, 2016
a2ce88c
DOC: added a note primary use case GISAXS
sameera2004 Feb 22, 2016
ed0e5ce
BUG: took out the extra tab
sameera2004 Feb 22, 2016
4a476d0
TST: covered all the lines - tests
sameera2004 Feb 22, 2016
6a9d7e8
Merge pull request #419 from sameera2004/bar_box_rois
ericdill Feb 22, 2016
c3de1a0
Merge pull request #417 from ericdill/build-for-windows
ericdill Feb 22, 2016
f92ce6e
Merge branch 'tag-release'
ericdill Feb 22, 2016
d9f17b3
ENH: Working version of grid3d with OpenMP
stuwilkins Feb 24, 2016
04682e5
FIX: Fix tests
stuwilkins Feb 24, 2016
0542d99
FIX: Fix tests for recip
stuwilkins Feb 24, 2016
9b1ecb8
TST: Increased points for stderr, fixed compare
stuwilkins Feb 24, 2016
96fc403
ENH: Working version of grid3d with OpenMP
stuwilkins Feb 24, 2016
ef80e94
FIX: Fix tests
stuwilkins Feb 24, 2016
a12ff8e
FIX: Fix tests for recip
stuwilkins Feb 24, 2016
3cd01e3
TST: Increased points for stderr, fixed compare
stuwilkins Feb 24, 2016
4920ebe
Merge branch 'fix_ctrans' of https://github.com/stuwilkins/scikit-bea…
stuwilkins Feb 24, 2016
e1d2ccd
BKN: non working version
stuwilkins Feb 24, 2016
26ceee9
ENH: Changed stderror calculation
stuwilkins Feb 24, 2016
8d4b00b
Merge pull request #422 from stuwilkins/fix_ctrans
licode Feb 28, 2016
3a6ecd1
WIP: adding roi lines
sameera2004 Mar 10, 2016
36bcdf8
TST: added a test for roi lines
sameera2004 Mar 10, 2016
377beda
ENH: rearranged the roi_lines
sameera2004 Mar 10, 2016
32f68bf
ENH: added checks to point[0] and point[1] whether >=0
sameera2004 Mar 10, 2016
aca6a4f
BUG: fixed the bar rois vertical bars, to use rectangle shapes
sameera2004 Mar 11, 2016
f623b5d
ENH: changed the l variable to label
sameera2004 Mar 12, 2016
111ea9b
Merge pull request #426 from sameera2004/roi_more
tacaswell Mar 12, 2016
bfd3b32
BUG: took out the repeated labels parameter
sameera2004 Mar 15, 2016
5f23c3c
Merge pull request #428 from sameera2004/take_out_repeated
ericdill Mar 15, 2016
e256a14
DOC: Fixed reference
stuwilkins Mar 28, 2016
c2d8d08
Merge pull request #432 from stuwilkins/fix_ref
ericdill Mar 28, 2016
e561f6e
ENH: Add tests for size check for PR
souravsingh Mar 11, 2016
cacda6b
Updates to Travis
souravsingh Mar 18, 2016
263704c
Update .travis.yml
souravsingh Mar 18, 2016
c392ad5
Removed the start_test script
souravsingh Mar 21, 2016
3a734f2
Update .travis.yml
souravsingh Apr 7, 2016
428be78
CI: Try a bash function instead
ericdill Apr 14, 2016
bf218a0
ENH: Updates to allow sequential processing
stuwilkins May 17, 2016
9c81555
CI: fix source of packages
tacaswell Jul 20, 2016
131150b
Merge pull request #451 from tacaswell/ci_fix_conda_source
danielballan Jul 20, 2016
1ed49b3
Merge pull request #445 from stuwilkins/gridder_update
licode Aug 12, 2016
17005ba
ENH: fill out the bin_grid function
CJ-Wright Aug 18, 2016
c7188cc
FIX/TST: added test for bin_grid, and fixed an error
CJ-Wright Aug 24, 2016
5a6ee28
STY: fixed a typo in an error message
CJ-Wright Aug 24, 2016
21ad0a9
STY/FIX: pep8 and add a known fail if no pyFAI
CJ-Wright Aug 24, 2016
d8464bd
BLD: add pyFAI to build
CJ-Wright Aug 24, 2016
1222d34
STY: fix pep8
CJ-Wright Aug 24, 2016
2e9755f
Merge pull request #459 from CJ-Wright/circ_ave
danielballan Aug 25, 2016
3078731
Merge pull request #453 from tacaswell/binstat_cp
tacaswell Aug 25, 2016
ff27c8d
Merge pull request #450 from tacaswell/hist_cp
tacaswell Aug 25, 2016
cdb6ac1
add mask option
dchabot Mar 16, 2016
05066ee
Update circular_average func
yugangzhang Aug 2, 2016
86f3075
modified masking code (removed extra else statement), added test
Aug 26, 2016
901822f
flake8
jrmlhermitte Aug 27, 2016
30c8f90
one more pep8 change
jrmlhermitte Aug 27, 2016
3bb1de5
more pep8, modified description linking circular_average and bin_grid
jrmlhermitte Aug 27, 2016
1a8b1e1
Merge pull request #462 from ordirules/ygcircavg
tacaswell Aug 27, 2016
8fc18f6
added an interpolated image return feature to circular_average
jrmlhermitte Aug 28, 2016
da1ea07
simplified logic
jrmlhermitte Aug 28, 2016
71aa3e7
PEP8
jrmlhermitte Aug 28, 2016
a43668b
added a test
jrmlhermitte Aug 28, 2016
16406e1
pep8 fix
jrmlhermitte Aug 28, 2016
c8945be
moved circavg to a new function
jrmlhermitte Aug 31, 2016
0b90498
don't interpolate values outside boundary
jrmlhermitte Aug 31, 2016
31fbc7d
modified circavg fixed test
Aug 31, 2016
7c886d9
pep8
Aug 31, 2016
a3e6efa
modified API for the way it handles dims and center
jrmlhermitte Sep 2, 2016
435822f
added test for anisotropic pixels
jrmlhermitte Sep 2, 2016
deccf38
fixed bad logic for circavg test, also added nosetest
jrmlhermitte Sep 2, 2016
818fc83
added option for interpolation customization (also changed default in…
jrmlhermitte Sep 6, 2016
0f36891
Moved construct_circ_avg_image to core.image
jrmlhermitte Sep 6, 2016
e8699a2
DOC/WIP: yet more changes
tacaswell Sep 1, 2016
e6071e9
DOC: work on getting sphinx to run cleanly
tacaswell Sep 2, 2016
c68d6a5
CI: fix travis
tacaswell Sep 8, 2016
b5608b8
removed tiny edits in out of scope files
jrmlhermitte Sep 10, 2016
7408682
Merge pull request #463 from ordirules/circavgSIMG
Sep 10, 2016
9723950
Merge pull request #373 from tacaswell/doc_rewrite
danielballan Sep 13, 2016
708ce44
CI: Fix doc-building and doc-pushing script coordination.
danielballan Sep 15, 2016
c3ccf5f
CI: Update docs-pushing strategy.
danielballan Sep 15, 2016
9af2c1e
change to use radial_grid, angle_grid, mask call modification
jrmlhermitte Sep 18, 2016
651ca97
moved default values out of angle_grid, radial_grid
jrmlhermitte Sep 18, 2016
5af523a
adding blank line
jrmlhermitte Sep 18, 2016
3c23e35
ENH: add margin and ring blur masks with tests
CJ-Wright Aug 26, 2016
7a6a25b
STY: don't redefine a dummy variable
CJ-Wright Aug 26, 2016
3840105
DOC: rename things and fix documentation
CJ-Wright Sep 8, 2016
0de2d98
ENH/TST: fix margin masking, test margin masking, and fix up array mu…
CJ-Wright Sep 9, 2016
eb9a575
FIX: PEP8 and a bug
CJ-Wright Sep 9, 2016
d3640e8
FIX: remove ones_like which was causing errors
CJ-Wright Sep 9, 2016
bb981ce
Merge pull request #2 from ordirules/chrisbinnedstat
chrisvam Sep 19, 2016
47be6b1
Merge pull request #466 from chrisvam/binstat_binfix
danielballan Sep 21, 2016
772226b
Merge pull request #435 from CJ-Wright/mask2
danielballan Sep 21, 2016
cdeb43e
Use explicit condarc for travis
ericdill Sep 23, 2016
2e755a1
Just install miniconda latest
ericdill Sep 23, 2016
8595e1f
CI: need to make miniconda executable
ericdill Sep 23, 2016
4da6a9c
CI: Need that darn --yes flag
ericdill Sep 23, 2016
33fb143
Matrix in numpy 1.10/1.11 too
ericdill Sep 23, 2016
75cd2f3
Merge pull request #474 from ericdill/enhance-travis
licode Oct 4, 2016
bfd9718
forced mask to be bool
Oct 4, 2016
96c646e
Merge pull request #476 from ordirules/auto_masking
tacaswell Oct 4, 2016
f101cf5
Merge pull request #479 from danielballan/doc-core
ericdill Jan 6, 2017
3c5c358
Merge remote-tracking branch 'upstream/master' into binned_stat
CJ-Wright Jan 9, 2017
c22a7f8
Merge pull request #482 from CJ-Wright/bin_stat
ericdill Jan 9, 2017
e296659
WIP: Automatically find the center of the ring and the most intense r…
sameera2004 Jan 12, 2017
b2527ba
added first prototype of spatial correlations
Jan 17, 2017
f009b56
TST: added test for automatically find the center and the rings
sameera2004 Jan 18, 2017
dc1401f
ENH: function to automatically find the center and the rings
sameera2004 Jan 18, 2017
3e1b9d8
better docstrings, added 2img correlation, removed extraneous params
jrmlhermitte Jan 20, 2017
f7f1731
removed two comments
jrmlhermitte Jan 20, 2017
6ac3dec
updated docstrings
Jan 20, 2017
28d1259
changed to use fftconvol (removed axes parameter)
jrmlhermitte Jan 21, 2017
4aee6ec
added error string to ValueError
jrmlhermitte Jan 21, 2017
8bfbd3b
elaboration on docstring
jrmlhermitte Jan 22, 2017
38b90d6
DOC: more explanation in documentation
jrmlhermitte Jan 23, 2017
4452026
DOC: added Note to documentation about skimage ransac method
sameera2004 Jan 23, 2017
7ddc72c
DOC: added max_trails to parameters
sameera2004 Jan 23, 2017
a6ba8a6
TST: fixed the test to check radii of the rings
sameera2004 Jan 23, 2017
703320f
TST: fixed the test_auto_find_center
sameera2004 Jan 23, 2017
4bc1688
Merge pull request #488 from sameera2004/auto_rings_find
licode Jan 24, 2017
4054763
fixed divide by zero potential bug
jrmlhermitte Jan 24, 2017
d6bceb4
TST: Added unit tests for CrossCorrelator
jrmlhermitte Jan 26, 2017
dac1f27
ENH : added definition of centers
Feb 3, 2017
fde0335
Merge pull request #487 from ordirules/CrossCorrelator
licode Feb 7, 2017
7a002d5
changed interpolation method, mask turned to np.nan, changed dims par…
jrmlhermitte Feb 20, 2017
aca39f2
added test for bilinear_interpolate. changed edge effect for bilinear…
jrmlhermitte Feb 21, 2017
8803c4f
pep8
jrmlhermitte Feb 21, 2017
a4eeac9
text modification
jrmlhermitte Feb 21, 2017
4407d2f
pep8
jrmlhermitte Feb 21, 2017
95a1163
modified to use RegularGridInterpolator
jrmlhermitte Feb 26, 2017
1961c36
added a test more doc
jrmlhermitte Feb 26, 2017
a9c28e3
Oops, removed some residual comments...
jrmlhermitte Feb 26, 2017
bd9afbb
remove the wrap term (fftconvol ignores what wrap would do)
jrmlhermitte Mar 12, 2017
58fa4ea
Added Mark's changes, still need to test...
jrmlhermitte Mar 13, 2017
b7f7e58
Incorporated Mark Sutton's changes. Code is about 40% faster.
jrmlhermitte Mar 14, 2017
e20d984
nomenclature change, better commenting
jrmlhermitte Mar 14, 2017
f2642f6
Non-overlapping regions now get np.nan since undefined, not 0
jrmlhermitte Mar 14, 2017
a92962f
formatting changes
jrmlhermitte Mar 14, 2017
70ae620
PEP8
jrmlhermitte Mar 15, 2017
aede0c4
comment edit
jrmlhermitte Mar 15, 2017
50d9437
Added 1D capability. Had to modify numbers in tests
jrmlhermitte Mar 15, 2017
8b64ec6
Added tests for ValueError exceptions
jrmlhermitte Mar 15, 2017
1ab3d2e
PEP8
jrmlhermitte Mar 15, 2017
cd51f2c
changed invalid pixels in maskcorrs to np.nan
Mar 24, 2017
fb1766f
Merge pull request #494 from ordirules/CrossCorrelator
licode Mar 24, 2017
e78616a
Merge pull request #489 from ordirules/construct_rphi_image
tacaswell Apr 6, 2017
922eb9e
Merge pull request #495 from ordirules/binnedstat-tuple
licode Apr 7, 2017
844af33
DOC: python/number version change in ci
Jun 27, 2017
f3dbd71
TST: ci issue, fixed errors in cdi part
Jun 28, 2017
603236d
TST: remove if condition
Jun 28, 2017
a51e3ed
add pytest in travis
Jun 28, 2017
4eb09b9
added See Also to segmented_rings
Jun 30, 2017
1fa32cc
Merge pull request #505 from ordirules/add-seealso
danielballan Jul 11, 2017
09f3a1a
BUG: fixed bugs on test, not detected before with old run_test.py
Jul 11, 2017
89d3450
BUG: index needs to be int; py3 issue; tests recovered to original va…
Jul 11, 2017
e32cb03
DEV: numpy113 with ~
Jul 12, 2017
015eb02
Merge pull request #504 from licode/ci
danielballan Jul 12, 2017
7de1000
Merge pull request #508 from ordirules/add-rpix
licode Jul 15, 2017
1823d11
CI: conda install pyFAI
CJ-Wright Jul 21, 2017
26aac93
CI: add backport of tempdir
CJ-Wright Jul 21, 2017
eb33bed
CI: space
CJ-Wright Jul 21, 2017
fe091a6
CI: ''
CJ-Wright Jul 21, 2017
b8e172c
TST: add changes from @ericdill
CJ-Wright Jul 21, 2017
1da6706
CI: no py36 and np10
CJ-Wright Jul 21, 2017
3588158
CI: move to matrix
CJ-Wright Jul 21, 2017
c4d5863
Merge pull request #486 from CJ-Wright/fix_fit2d
licode Jul 21, 2017
1850777
WIP: twotheta in degrees
CJ-Wright Sep 1, 2017
dbd4815
DOC: document the units for the conversion utils
CJ-Wright Sep 1, 2017
80b2b87
CI/TST: cover tests
CJ-Wright Jul 13, 2017
3365b3c
TST: remove .codecov.yml
CJ-Wright Sep 2, 2017
f93dfcf
DOC : added parenthesis
jrmlhermitte Oct 6, 2017
b900a3d
DOC : fixed math in docstrings
jrmlhermitte Oct 6, 2017
05e3b25
Merge pull request #520 from ordirules/docstrings-latex
ericdill Oct 9, 2017
ebae50d
Merge pull request #518 from jrmlhermitte/rmap-rphibinstat
licode Oct 11, 2017
c630296
Merge pull request #500 from CJ-Wright/parallel
jrmlhermitte Nov 20, 2017
ff5d4bb
Merge pull request #510 from CJ-Wright/cover_tests
ericdill Nov 30, 2017
a7048f0
Merge pull request #524 from CJ-Wright/speed_bs2
tacaswell Dec 1, 2017
cf21ea3
Merge pull request #515 from CJ-Wright/twotheta_deg
jrmlhermitte Feb 24, 2018
a01a689
Merge pull request #535 from jrmlhermitte/doc-binstat-binmap
jrmlhermitte May 29, 2018
4b7f301
Fix format string
ksunden Aug 2, 2018
6701a9a
Merge pull request #536 from ksunden/patch-1
ericdill Aug 3, 2018
a4d8cc0
TST: Skip test for numerical unstalbe reason
Jun 6, 2019
bbcc7e6
Merge pull request #540 from ke-zhang-rd/numpy-support-update
danielballan Jun 6, 2019
5f9c333
DOC: release
ke-zhang-rd Jun 5, 2019
04aa359
Merge pull request #539 from ke-zhang-rd/what_is_new
awalter-bnl Jun 6, 2019
d5123f8
Various updates to get docs building again
ericdill Jul 4, 2019
7a1425e
Merge pull request #544 from ericdill/fix-docs-and-setup
tacaswell Jul 4, 2019
a1cf012
Removed Python 2.7 tests
dmgav Aug 20, 2019
68c7893
Merge pull request #547 from dmgav/migrate_lmfit_9
tacaswell Aug 21, 2019
0a09a7f
Better tests in TravisCI
mrakitin Aug 28, 2019
a9911be
Fixing the docs building
mrakitin Aug 28, 2019
0733e64
Remove accidentally committed files; use .gitignore from scientific-c…
mrakitin Aug 28, 2019
a5f69f8
Do not run tests for the docs matrix
mrakitin Aug 28, 2019
56f74a6
Fix the misleading "RUN_TESTS" variable name
mrakitin Aug 28, 2019
cba8778
Merge pull request #552 from mrakitin/better-tests
dmgav Aug 28, 2019
09ecb0f
Specify numpy version during the installation; support OSX builds
mrakitin Aug 30, 2019
808dde1
Fix versions of Python for OSX
mrakitin Aug 30, 2019
da0194b
Try a new style
mrakitin Aug 30, 2019
f9b8f68
Add more diagnostics
mrakitin Aug 30, 2019
4b9813c
Use latest numpy for OSX builds
mrakitin Aug 30, 2019
908b9d5
Revert the config for OSX
mrakitin Aug 30, 2019
b0c4c38
Fix OSX build; remove NumPy 1.13 and 1.14
mrakitin Oct 11, 2019
b767f42
Try to fix pushd/popd
mrakitin Oct 11, 2019
3a39221
More fixes and cleanups
mrakitin Oct 11, 2019
bca4f70
Merge pull request #554 from mrakitin/numpy-version-and-osx-builds
dmgav Dec 2, 2019
1c3f3c9
Fix: deprecated importing of ABCs from collections
dmgav Nov 27, 2019
f819d9d
Fix: deprecated code
dmgav Nov 28, 2019
39918e7
Fix: deprecated code
dmgav Nov 28, 2019
7785ad8
Fix: XFAIL due to deprecated 'yield' tests
dmgav Nov 28, 2019
ed3f0e1
Fix: unnecessary warnings during CI builds
dmgav Nov 29, 2019
9f9131e
Switch from 'nose' to 'pytest'
dmgav Nov 29, 2019
77a0728
Update tests from 'nose' to 'pytest'
dmgav Nov 30, 2019
70899e3
Update tests from 'nose' to 'pytest'
dmgav Nov 30, 2019
d5d4ac0
Update tests from 'nose' to 'pytest'
dmgav Nov 30, 2019
cd174ec
Update tests from 'nose' to 'pytest'
dmgav Nov 30, 2019
7f5d658
Added flake8 configuration file (from PyXRF project)
dmgav Dec 1, 2019
b945a71
Removed 'nose' configuration file
dmgav Dec 1, 2019
a7fa5c2
Removed usage of 'nose' libraries
dmgav Dec 1, 2019
4979b4c
Code formatting issues
dmgav Dec 1, 2019
f745225
Code formatting
dmgav Dec 1, 2019
3aa964b
Run 'flake8' before tests
dmgav Dec 1, 2019
acd2b99
Travis configuration
dmgav Dec 1, 2019
bb0efa3
Renamed test for consistency
dmgav Dec 1, 2019
3dceecd
Changes to Travis configuration
dmgav Dec 2, 2019
a13c8c6
Corrections after code review
dmgav Dec 2, 2019
f726b41
Merge pull request #557 from dmgav/deprecation_fix
mrakitin Dec 2, 2019
a048e60
Removed testing with NumPy 1.15 (not supported by latest Lmfit)
dmgav Jan 28, 2020
026426a
Add Numpy 1.18 to Travis builds
dmgav Jan 28, 2020
cf44e65
Merge pull request #558 from dmgav/testing_compton
danielballan Jan 28, 2020
f92e107
Merge pull request #560 from ronpandolfi/pip-compat
mrakitin Jan 29, 2020
f311230
Add 'skbeam_copied/' from commit 'f92e107a897ffdab568d6391a81e5b8a194…
danielballan Jan 30, 2020
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
13 changes: 13 additions & 0 deletions skbeam_copied/.coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[run]
source=skbeam
[report]
omit =
*/python?.?/*
*/site-packages/nose/*
skbeam/__init__.py
# ignore _version.py and versioneer.py
.*version.*
*_version.py

exclude_lines =
def set_default
11 changes: 11 additions & 0 deletions skbeam_copied/.flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[flake8]
exclude =
.git,
__pycache__,
build,
dist,
versioneer.py,
pyxrf/_version.py,
doc/conf.py,
doc/sphinxext/*
max-line-length = 115
1 change: 1 addition & 0 deletions skbeam_copied/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
skbeam/_version.py export-subst
82 changes: 82 additions & 0 deletions skbeam_copied/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
venv/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
coverage.xml
*,cover
.hypothesis/

# Translations
*.mo
*.pot

# Django stuff:
*.log

# Sphinx documentation
doc/_build/
doc/resource/api/core/_as_gen/

# pytest
.pytest_cache/

# PyBuilder
target/

# Editor files
#mac
.DS_Store
*~

#vim
*.swp
*.swo

#pycharm
.idea/*


#Ipython Notebook
.ipynb_checkpoints

# Project-specific ignores:
skbeam/core/accumulators/histogram.c
145 changes: 145 additions & 0 deletions skbeam_copied/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
language: python
sudo: false

addons:
apt_packages:
- pandoc
env:
global:
- SUBMIT_CODECOV: false
- BUILD_DOCS: false
- GH_REF: github.com/scikit-beam/scikit-beam.git
- secure: "KzntGlmLDUZlAB8ZiSRBtONJypv4atrnFxl+THCW8kg6YbiODcCxG9cez7mfmh63wpJ54+zeGvgGljeVvjb7bjB2p+4hZy+mLoP9xoE1w5qF4XaQ5YTOYaSQqCeWa5cEIi+854gFX7gOfW5qL+EJf7h3HtmndI15zaU5gOPjSDU="

matrix:
include:
- python: 3.7
env: BUILD_DOCS=true SUBMIT_CODECOV=true NUMPY=1.17
- os: osx
language: generic
env: TRAVIS_PYTHON_VERSION=3.6 NUMPY=1.17
- os: osx
language: generic
env: TRAVIS_PYTHON_VERSION=3.7 NUMPY=1.17

python:
- 3.6
- 3.7

env:
- NUMPY=1.16
- NUMPY=1.17
- NUMPY=1.18

before_install:
- |
set -e
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
arch="Linux"
elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
arch="MacOSX"
else
echo "Unknown arch $TRAVIS_OS_NAME"
exit 1
fi
wget https://repo.continuum.io/miniconda/Miniconda3-latest-${arch}-x86_64.sh -O miniconda.sh
chmod +x miniconda.sh
./miniconda.sh -b -p ~/mc
source ~/mc/etc/profile.d/conda.sh
conda update conda --yes
export CONDARC=ci/condarc

install:
- export GIT_FULL_HASH=`git rev-parse HEAD`
- conda create -n testenv python=$TRAVIS_PYTHON_VERSION numpy=$NUMPY
- conda activate testenv
- conda install xraylib # this is the only package not available on PyPI
- pip install -r requirements.txt
- pip install -r requirements-dev.txt
# # need to build_ext -i for the tests so that the .so is local to the source
# # code. We could also setup.py develop, but I'm not sure if that is any
# # better
- python setup.py install build_ext -i
- pip install codecov
- conda list
- pip list

before_script:
# define a merge size check function that ensures no huge file was committed
# to the repo by accident
- |
size_check() {
GIT_TARGET_EXTRA="+refs/heads/${TRAVIS_BRANCH}"
GIT_SOURCE_EXTRA="+refs/pull/${TRAVIS_PULL_REQUEST}/merge"
echo TRAVIS_BRANCH=$TRAVIS_BRANCH
echo TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST
echo TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG
echo GIT_TARGET_EXTRA=$GIT_TARGET_EXTRA
echo GIT_SOURCE_EXTRA=$GIT_SOURCE_EXTRA
mkdir ~/repo-clone
pushd ~/repo-clone
git init && git remote add -t ${TRAVIS_BRANCH} origin git://github.com/${TRAVIS_REPO_SLUG}.git
git fetch origin ${GIT_TARGET_EXTRA}
git checkout -qf FETCH_HEAD
git tag travis-merge-target
git gc --aggressive
TARGET_SIZE=`du -s . | sed -e "s/\t.*//"`
echo TARGET_SIZE=$TARGET_SIZE
git pull origin ${GIT_SOURCE_EXTRA}
git gc --aggressive
MERGE_SIZE=`du -s . | sed -e "s/\t.*//"`
popd
echo MERGE_SIZE=$MERGE_SIZE
if [ "${MERGE_SIZE}" != "${TARGET_SIZE}" ]; then
SIZE_DIFF=`expr \( ${MERGE_SIZE} - ${TARGET_SIZE} \)`
else
SIZE_DIFF=0
fi

echo SIZE_DIFF=$SIZE_DIFF

echo -e "Estimated content size difference = ${SIZE_DIFF} kB"

if test ${SIZE_DIFF} -lt $1; then
echo "Size check passed"
return 0
else
echo "Size check failed"
return 1
fi
}

script:
- flake8
- coverage run run_tests.py
- coverage report -m
# Check the merge size to make sure nothing huge was committed, but only do
# it on one of the branches
- if [ $BUILD_DOCS == 'true' ]; then
size_check 100;
fi;
- |
set -e
if [ $BUILD_DOCS == 'true' ]; then
pip install -r requirements-doc.txt
pushd ../
git clone https://github.com/scikit-beam/scikit-beam-examples.git
popd
cd doc
bash build_docs.sh
cd ..
fi

after_success:
- if [ $SUBMIT_CODECOV == 'true' ]; then codecov; fi;
- |
set -e
if [ $TRAVIS_BRANCH == 'master' ] && [ $TRAVIS_PULL_REQUEST == 'false' ] && [ $BUILD_DOCS ]; then
openssl aes-256-cbc -K $encrypted_b4ed46da4197_key -iv $encrypted_b4ed46da4197_iv -in skbeam-docs-deploy.enc -out skbeam-docs-deploy -d
eval `ssh-agent -s`
chmod 600 skbeam-docs-deploy
ssh-add skbeam-docs-deploy
cd doc
bash push_docs.sh
cd ..
fi
Empty file.
Loading