From 818622ca863bf1618269910eaef47fe061e2c925 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sat, 22 Oct 2022 13:24:48 -0500 Subject: [PATCH] Update dependencies Also change desktop file to give feedback to users while our subrepos and Spyder are being installed on editable mode. --- binder/Desktop/Spyder.desktop | 2 +- binder/environment.yml | 46 +++++++++++++++++------------------ 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/binder/Desktop/Spyder.desktop b/binder/Desktop/Spyder.desktop index 26fff3a..64ff969 100755 --- a/binder/Desktop/Spyder.desktop +++ b/binder/Desktop/Spyder.desktop @@ -2,7 +2,7 @@ Version=1.0 Type=Application Name=Spyder master -Exec=/bin/bash -c "exec ${HOME}/spyder/bootstrap.py" +Exec=gnome-terminal --geometry 120x24 -e "/bin/bash -c 'exec ${HOME}/spyder/bootstrap.py'" # FIXME: Don't hardcode Path? Icon=/home/jovyan/spyder/img_src/spyder.svg Path=/home/jovyan/Desktop diff --git a/binder/environment.yml b/binder/environment.yml index b508f6a..0a5a85a 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -1,44 +1,41 @@ dependencies: # Main dependencies -- applaunchservices >=0.1.7 - atomicwrites >=1.2.0 - chardet >=2.0.0 - cloudpickle >=0.5.0 - cookiecutter >=1.6.0 - diff-match-patch >=20181111 - intervaltree >=3.0.2 -- ipython >=7.6.0 -- jedi =0.17.2 +- ipython >=7.31.1,<8.0.0 +- jedi >=0.17.2,<0.19.0 +- jellyfish >=0.7 - jsonschema >=3.2.0 - keyring >=17.0.0 - nbconvert >=4.0 - numpydoc >=0.6.0 -- paramiko >=2.4.0 -- parso =0.7.0 +- parso >=0.7.0,<0.9.0 - pexpect >=4.4.0 - pickleshare >=0.4 - psutil >=5.3 - pygments >=2.0 -- pylint >=1.0 -- pyls-black >=0.4.6 -- pyls-spyder >=0.3.2,<0.4.0 -- pyqt <5.13 -# NOTE: There's no need to set constraints for python-language-server -# here because Spyder uses the subrepo for it when started in Binder. -- python-language-server +- pylint >=2.5.0,<3.0 +- pylint-venv >=2.1.1 +- pyls-spyder >=0.4.0 +- pyqt <5.16 +- pyqtwebengine <5.16 +- python-lsp-black >=1.2.0 +- python-lsp-server >=1.5.0,<1.6.0 - pyxdg >=0.26 -- pyzmq >=17 -- qdarkstyle =3.0.2 -- qstylizer >=0.1.10 +- pyzmq >=22.1.0 +- qdarkstyle >=3.0.2,<3.1.0 +- qstylizer >=0.2.2 - qtawesome >=1.0.2 -- qtconsole >=5.1.0 -- qtpy >=1.5.0 +- qtconsole >=5.3.2,<5.4.0 +- qtpy >=2.1.0 - rtree >=0.9.7 -- setuptools >=39.0.0 +- setuptools >=49.6.0 - sphinx >=0.6.6 -# NOTE: There's no need to set constraints for spyder-kernels here -# because Spyder uses the subrepo for it when started in Binder. -- spyder-kernels +- spyder-kernels >=2.3.3,<2.4.0 - textdistance >=4.2.0 - three-merge >=0.1.1 - watchdog >=0.10.3 @@ -50,12 +47,13 @@ dependencies: - matplotlib - pandas - pillow -- pytest <6.0 +- pytest <7.0 - pytest-cov - pytest-lazy-fixture -- pytest-ordering +- pytest-mock +- pytest-order - pytest-qt -- pytest-xvfb +- pytest-timeout - pyyaml - scipy - sympy