Commits · 282a197e1916565d0bc527f3d02bc97d9e4059ae · Teresa Weßels / empyre

Jul 18, 2017
- Merge branch 'deployment_improvements' into 'master' · 282a197e
  Jan Caron authored 7 years ago
  
  Deployment improvements See merge request !7
  282a197e
- Merge branch 'deployment_improvements' · a49662fe
  Jan Caron authored 7 years ago
  
  # Conflicts: # .gitlab-ci.yml
  a49662fe
- Merge branch 'master' into 'deployment_improvements' · b5399857
  Jan Caron authored 7 years ago
  
  # Conflicts: # .gitlab-ci.yml
  b5399857
- Configured requirements.txt to work with conda (pyfftw still does not). · 8bff682a
  Jan Caron authored 7 years ago
  
  8bff682a
- Added requirements.txt · 500f8c8e
  Jan Caron authored 7 years ago
  
  500f8c8e
- Got rid of nose in all tests. Finished environment.yml. · 352242ae
  Jan Caron authored 7 years ago
  
  352242ae
Jul 16, 2017
- Small changes to deployment files. · 618b728d
  Jan Caron authored 7 years ago
  
  Added environment.yml and requirement.txt. GitLab should now produce html coverage artifacts. io_vectordata: now warns if grid spacing is not equal in all directions.
  618b728d
- Update .gitlab-ci.yml · 03c8566e
  Jan Caron authored 7 years ago
  
  03c8566e
- Update .gitlab-ci.yml · 1cb9e77c
  Jan Caron authored 7 years ago
  
  1cb9e77c
Jul 14, 2017
- Merge branch 'Fix_OVF_Reader' into 'master' · 8d8fafaa
  Jan Caron authored 7 years ago
  
  Fix ovf reader See merge request !6
  8d8fafaa
- Updated the OVF reader to work with binary files. · b8e6c191
  Jan Caron authored 7 years ago
  
  b8e6c191
Jul 12, 2017
- Cleanup of gitlab-ci.yaml file. · ab034725
  Jan Caron authored 7 years ago
  
  ab034725
- Cleanup of gitlab-ci.yaml file. · 8542875b
  Jan Caron authored 7 years ago
  
  8542875b
- Deleted .hgignore · 3f4d114e
  Jan Caron authored 7 years ago
  
  3f4d114e
- Merge branch 'CI_implementation' into 'master' · c0094985
  Jan Caron authored 7 years ago
  
  CI implementation See merge request !5
  c0094985
- PEP8 checking via pytest-flake8 disabled, temporarily! · bc4c7dc6
  Jan Caron authored 7 years ago
  
  bc4c7dc6
- Trying to get iffgit into known_host file! Part2 · 47a45770
  Jan Caron authored 7 years ago
  
  47a45770
- Trying to get iffgit into known_host file! · c5eb9c34
  Jan Caron authored 7 years ago
  
  c5eb9c34
- Added setup.cfg for coverage! · 102451d9
  Jan Caron authored 7 years ago
  
  102451d9
- Using setup.py develop for the installation of required packages! · 45a6ff1a
  Jan Caron authored 7 years ago
  
  And deleted/ignored pyramid.egg-info
  45a6ff1a
- Using setup.py develop for the installation of required packages! · 75269507
  Jan Caron authored 7 years ago
  
  And deleted/ignored pyramid.egg-info
  75269507
- Added numpy, scipy, nose, h5py, matplotlib, Pillow scikit-image, · 0ea60362
  Jan Caron authored 7 years ago
  
  cmocean, hyperspy to yml file.
  0ea60362
- Added numpy, scipy, nose, h5py, matplotlib, Pillow scikit-image, · 5b942f74
  Jan Caron authored 7 years ago
  
  cmocean, hyperspy to yml file.
  5b942f74
- Merge remote-tracking branch 'origin/CI_implementation' into CI_implementation · 9f103bf4
  Jan Caron authored 7 years ago
  
  # Conflicts: # .gitlab-ci.yml
  9f103bf4
- Use ~/.ssh/jutil_key when installing JUtil during CI · fb433f7e
  Florian Rhiem authored 7 years ago
  
  fb433f7e
Jul 11, 2017
- Added yml line to install jutil (probably does not work...) · 43463196
  Jan Caron authored 7 years ago
  
  43463196
- Added yml line to install jutil (probably does not work...) · 9746daf8
  Jan Caron authored 7 years ago
  
  9746daf8
- Trying to fix binary reader for ovf files... · 3798ea25
  Jan Caron authored 7 years ago
  
  3798ea25
- Disable Host key checking to try to get jutil deploy key to work. · 918b2457
  Jan Caron authored 7 years ago
  
  918b2457
- First try to get jutil deploy key to work. · 1921dd84
  Jan Caron authored 7 years ago
  
  1921dd84
- Merge remote-tracking branch 'origin/master' · 2cf07954
  Jan Caron authored 7 years ago
  
  # Conflicts: # README.md
  2cf07954
- Added README.md with GitLab badges for build status and coverage. · 297390f3
  Jan Caron authored 7 years ago
  
  297390f3
- Added README.md with GitLab badges for build status and coverage. · 7b3c720f
  Jan Caron authored 7 years ago
  
  7b3c720f
Jul 07, 2017
- Added .pyc files to .gitignore · 2952001c
  Jan Caron authored 7 years ago
  
  Signed-off-by: Jan Caron <j.caron@fz-juelich.de>
  2952001c
- Merge remote-tracking branch 'origin/master' · 6c6c9232
  Jan Caron authored 7 years ago
  
  # Conflicts: # pyramid/tests/test_phasemapper.py
  6c6c9232
- Merge remote-tracking branch 'origin/master' · 6eaa81c0
  Jan Caron authored 7 years ago
  
  # Conflicts: # pyramid/tests/test_phasemapper.py
  6eaa81c0
- A lot of small changes... (too lazy to list all) · dfef09f9
  Jan Caron authored 7 years ago
  
  Smooth_vortex now can have a homogeneous core with radius larger 1. Hacky solution for PyQt4/5, change later! Changed ignore files.
  dfef09f9
- Merge branch 'PhaseChargeMapper' into 'master' · 71612458
  Jan Caron authored 7 years ago
  
  The PhaseMapperCharge was updated See merge request !4
  71612458
Jul 05, 2017
- exclude some files · f3a957a1
  Fengshan Zheng authored 7 years ago
  
  f3a957a1
Jul 04, 2017
- The PhaseMapperCharge was updated · 58be7768
  Fengshan Zheng authored 7 years ago
  
  58be7768