Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
CCampJr committed Aug 3, 2022
2 parents 8534b44 + 21688c4 commit 64f26c6
Show file tree
Hide file tree
Showing 281 changed files with 16,888 additions and 7,422 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ This document records all notable changes to
This project adheres to `PEP 440 -- Version Identification
and Dependency Specification <https://www.python.org/dev/peps/pep-0440/>`_.

0.4.3 (22-08-03)
----------------
- Spectrum and Hsi now moved to **data.spectra**. **This could break your fork if you have custom code.**
- LazyHDF5 now within CRIkit2 instead of external library
- Import macrostage raster images (NIST) from multiple datasets

0.4.2 (22-03-24)
----------------
- Changes to Phase Error Correction UI and some quality of life improvements
Expand Down
2 changes: 0 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ packages may work.
- PyQT5
- CVXOPT

- LazyHDF5 >= 0.2.2

- Requires H5Py (>= 2.6)

- SciPlot-PyQt >= 0.2.2
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ environment:
MINICONDA_VERSION: "latest"
PYTHON_ARCH: "64"
CONDA_DEPENDENCIES: "numpy scipy pyqt matplotlib h5py cvxopt"
PIP_DEPENDENCIES: "pytest pytest-cov codecov lazyhdf5"
PIP_DEPENDENCIES: "pytest pytest-cov codecov"

matrix:
- PYTHON_VERSION: "3.7"
Expand Down
Loading

0 comments on commit 64f26c6

Please sign in to comment.