Skip to content

Commit

Permalink
chore(deps): update lmfit dependencies to include >1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kmnhan committed Apr 22, 2024
1 parent 550c800 commit 942a810
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 52 deletions.
39 changes: 20 additions & 19 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,29 @@ name: erlabrtd
channels:
- conda-forge
dependencies:
- python>=3.11
- pip>=19.3
- ipykernel
- h5netcdf>=1.2.0
- igor2>=0.5.6
- numpy>=1.22.0
- iminuit>=2.25.2
- ipykernel
- joblib>=1.3.2
- lmfit>=1.2.0,!=1.3.0
- matplotlib>=3.8.0
- hvplot
- xarray
- h5netcdf
- varname
- numba>=0.56.2
- numbagg
- numba-progress
- joblib
- lmfit>=1.2.0
- numba>=0.59.0
- numbagg>=0.8.1
- numpy>=1.26.0
- pip>=19.3
- pyperclip>=1.8.2
- pyqtgraph>=0.13.1
- tqdm
- python>=3.11
- qtawesome>=1.3.1
- qtpy>=2.4.1
- scipy>=1.12.0
- superqt>=0.6.2
- tqdm>=4.66.2
- uncertainties>=3.0.1
- qtawesome
- superqt
- qtpy
- varname>=0.13.0
- xarray>=2024.02.0
- hvplot
- sphinx
- sphinx-autodoc-typehints
- sphinx-copybutton
Expand All @@ -33,9 +35,8 @@ dependencies:
- sphinx-design
- pyperclip
- ipywidgets
- ipython
- pip:
- pyqt6>=6.2.2
- csaps
- -e git+https://github.com/kmnhan/erlabpy.git#egg=erlab
- sphinx-qt-documentation
- -e .
44 changes: 22 additions & 22 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
ipykernel
dask>=2024.4.1
h5netcdf>=1.2.0
igor2>=0.5.6
iminuit>=2.25.2
joblib>=1.3.2
lmfit>=1.2.0,!=1.3.0
matplotlib>=3.8.0
numba>=0.59.0
numbagg>=0.8.1
numpy>=1.26.0
pyperclip>=1.8.2
pyqt6>=6.2.2
pyqtgraph>=0.13.1
qtawesome>=1.3.1
qtpy>=2.4.1
scipy>=1.12.0
superqt>=0.6.2
tqdm>=4.66.2
uncertainties>=3.0.1
varname>=0.13.0
xarray>=2024.02.0
sphinx
sphinx-autodoc-typehints
setuptools
Expand All @@ -9,28 +29,8 @@ sphinx-qt-documentation
sphinx-copybutton
sphinxcontrib-bibtex
pybtex
numpy>=1.22.0
matplotlib>=3.8.0
hvplot
xarray
h5netcdf
varname
numba>=0.56.2
numbagg
numba-progress
joblib
lmfit<1.3.0
iminuit>=2.25.2
pyqtgraph>=0.13.1
tqdm
uncertainties>=3.0.1
pyperclip
pyqt6>=6.2.2
qtawesome
superqt
csaps
qtpy
igor2>=0.5.6
ipykernel
ipywidgets
ipython
-e .
10 changes: 5 additions & 5 deletions docs/source/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,11 @@ Commit and push your changes
Open a pull request
-------------------

When you're ready or need feedback on your code, open a Pull Request (PR) so that the
xarray developers can give feedback and eventually include your suggested code into the
``main`` branch. `Pull requests (PRs) on GitHub
When you're ready or need feedback on your code, open a Pull Request (PR) so that we can
give feedback and eventually include your suggested code into the ``main`` branch. `Pull
requests (PRs) on GitHub
<https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests>`_
are the mechanism for contributing to xarray's code and documentation.
are the mechanism for contributing to the code and documentation.

Enter a title for the set of changes with some explanation of what you've done. Mention
anything you'd like particular attention for - such as a complicated change or some code
Expand Down Expand Up @@ -287,7 +287,7 @@ Code standards
from qtpy import QtWidgets, QtCore, QtGui

* Use fully qualified enum names from Qt6 instead of the short-form enums from Qt5, i.
e., ``QtCore.Qt.CheckState.Checked`` instead of ``QtCore.Qt.Checked``.
e., `QtCore.Qt.CheckState.Checked` instead of `QtCore.Qt.Checked`.

* Use the signal and slot syntax from PySide6 (``QtCore.Signal`` and ``QtCore.Slot``
instead of ``QtCore.pyqtSignal`` and ``QtCore.pyqtSlot``)
Expand Down
3 changes: 1 addition & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ dependencies:
- iminuit>=2.25.2
- ipykernel
- joblib>=1.3.2
- lmfit>=1.2.0
- lmfit>=1.2.0,!=1.3.0
- matplotlib>=3.8.0
- numba-progress>=1.0.0
- numba>=0.59.0
- numbagg>=0.8.1
- numpy>=1.26.0
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ dependencies = [
"igor2>=0.5.6",
"iminuit>=2.25.2",
"joblib>=1.3.2",
"lmfit>=1.2.0, <1.3.0",
"lmfit>=1.2.0,!=1.3.0",
"matplotlib>=3.8.0",
"numba-progress>=1.0.0",
"numba>=0.59.0",
"numbagg>=0.8.1",
"numpy>=1.26.0",
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ h5netcdf>=1.2.0
igor2>=0.5.6
iminuit>=2.25.2
joblib>=1.3.2
lmfit>=1.2.0
lmfit>=1.2.0,!=1.3.0
matplotlib>=3.8.0
numba-progress>=1.0.0
numba>=0.59.0
numbagg>=0.8.1
numpy>=1.26.0
Expand Down

0 comments on commit 942a810

Please sign in to comment.