From fc2c049bd2186758aae5987743585bbf1bb677ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCth?= Date: Fri, 21 Jun 2024 01:52:53 +0300 Subject: [PATCH 1/2] Fix environment.yml to setup development environment also relax pin on ipymuvue due to accidental release of 0.3.0 as 0.6.0. --- binder/environment.yml | 2 +- environment.yml | 22 +++++++++++++++------- news/environment.rst | 3 +++ setup.py | 2 +- 4 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 news/environment.rst diff --git a/binder/environment.yml b/binder/environment.yml index d2e5676..d2c2afe 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -22,5 +22,5 @@ dependencies: - pip: - flipper - jupyter_ui_poll >=0.2.1,<0.3 - - ipymuvue >=0.3.0,<0.4.0 + - ipymuvue >=0.3.0,<0.7.0 - ipyvue-flatsurf==0.6.0 diff --git a/environment.yml b/environment.yml index 5f98b32..cc7ae8d 100644 --- a/environment.yml +++ b/environment.yml @@ -5,13 +5,21 @@ name: ipyvue-flatsurf-build channels: - conda-forge dependencies: - - pyflatsurf >=3.9.2,<4 - - pytest + # functools.cache requires Python 3.9 + - python=3.9 + - sagelib + - sympy + - scipy + - ipywidgets + - jupyterlab + - pyflatsurf>=3.9.2,<4 + - matplotlib-base + - surface-dynamics>=0.4.7 + - sage-flatsurf >=0.5,<0.6 + - jupytext - ruamel.yaml - # ipyvue-flatsurf relies on the availability of Decomposition in - # flatsurf.geometry.gl2r_orbit_closure which was dropped in 0.4.4 - - sage-flatsurf >=0.4.4,<0.5 + - pip - pip: - - ipyvue-async >=0.1.0,<0.2 - - ipyvue >=1.5.0,<2 + - flipper - jupyter_ui_poll >=0.2.1,<0.3 + - ipymuvue >=0.3.0,<0.7.0 diff --git a/news/environment.rst b/news/environment.rst new file mode 100644 index 0000000..2832c25 --- /dev/null +++ b/news/environment.rst @@ -0,0 +1,3 @@ +**Fixed:** + +* Fixed package dependencies in `environment.yml` for development. diff --git a/setup.py b/setup.py index 37cbfe9..f5cfa47 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ 'sage-flatsurf>=0.5,<0.6', 'pyflatsurf>=3.9.0,<4', 'jupyter-ui-poll>=0.2.1,<0.3', - 'ipymuvue>=0.3.0,<0.4.0', + 'ipymuvue>=0.3.0,<0.7.0', ], packages=find_packages(), zip_safe=False, From 78d358f0aabcd864401f3ea17622e21a8ce56c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCth?= Date: Fri, 21 Jun 2024 02:00:58 +0300 Subject: [PATCH 2/2] Update Python dependency and install pytest for testing --- environment.yml | 20 +++++++++++--------- setup.py | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/environment.yml b/environment.yml index cc7ae8d..23fba4c 100644 --- a/environment.yml +++ b/environment.yml @@ -5,19 +5,21 @@ name: ipyvue-flatsurf-build channels: - conda-forge dependencies: - # functools.cache requires Python 3.9 - - python=3.9 - - sagelib - - sympy - - scipy - ipywidgets - jupyterlab - - pyflatsurf>=3.9.2,<4 - - matplotlib-base - - surface-dynamics>=0.4.7 - - sage-flatsurf >=0.5,<0.6 - jupytext + - matplotlib-base + - pyflatsurf >=3.9.2,<4 + # functools.cache requires Python 3.9 + - python >=3.9 + - pytest + - pytest-xdist - ruamel.yaml + - sage-flatsurf >=0.5,<0.6 + - sagelib + - scipy + - surface-dynamics >=0.4.7 + - sympy - pip - pip: - flipper diff --git a/setup.py b/setup.py index f5cfa47..b2a3910 100644 --- a/setup.py +++ b/setup.py @@ -65,9 +65,10 @@ 'Intended Audience :: Developers', 'Intended Audience :: Science/Research', 'Topic :: Multimedia :: Graphics', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ], )