Skip to content

Commit 3701c3d

Browse files
Merge pull request #185 from respec/conda_tweaks
Fixed versions in develop mode; Module docstrings; More Env Improvements
2 parents 2080d59 + 9c1608c commit 3701c3d

File tree

8 files changed

+542
-238
lines changed

8 files changed

+542
-238
lines changed

_version.py

Lines changed: 0 additions & 6 deletions
This file was deleted.

environment.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
---
2-
name: hsp2_py310
2+
name: hsp2
33
channels:
44
- conda-forge
55
- nodefaults # Speeds solving env, by limiting the number of options
66

77
dependencies:
8-
# Python 3.10 was default for Anaconda 2023.03-0 (Mar 20, 2023)
9-
# https://docs.anaconda.com/free/anaconda/release-notes/#anaconda-2023-03-0-mar-20-2023
10-
# package management
11-
- conda
12-
- conda-build
13-
- conda-libmamba-solver
14-
- pip
8+
- python >=3.10
159

1610
# Running HSP2
17-
- python =3.10
1811
- scipy # Scipy also installs numpy
1912
# Pandas installs most scientific Python modules, such as Numpy, etc.
2013
- pandas
@@ -29,21 +22,27 @@ dependencies:
2922
# Operational Model (om)
3023
- pyparsing
3124

32-
# Interactivity & Visualization via Jupyter Notebooks (optional,
33-
# but required for tutorials)
25+
# Interactivity via Jupyter Notebooks (optional, but required for tutorials)
3426
- jupyterlab # also installs classic Jupyter notbook
35-
- ipympl # jupyter-matplotlib, https://github.com/matplotlib/ipympl
3627
- nodejs # required for many JupyterLab extensions
37-
# HoloViz, https://holoviz.org
28+
29+
# Visualization (optional)
3830
- hvplot # hvPlot installs most HoloViz libs, including matplotlib
31+
- ipympl # jupyter-matplotlib, https://github.com/matplotlib/ipympl
3932
- ipywidgets # Required for HoloViz interactivity in Jupyter notebooks
4033
- ipywidgets_bokeh
41-
- jupyter_bokeh # for VSCode
34+
- jupyter_bokeh # Renders Holviz / Bokeh objects in Jupyter
35+
- pyviz_comms # bidirectional communication between Python & JavaScript for Jupyter
4236

4337
# Dev tools (optional)
44-
- python-lsp-server # Language Server Protocol (LSP) extension for Python (pylsp)
38+
# Language Server Protocol (LSP) extension for Python (pylsp)
39+
- python-lsp-server
4540
- jupyterlab-lsp # Provides both server extension and lab extension
4641

42+
# Environment and package management
43+
- conda
44+
- conda-libmamba-solver
45+
- pip
4746
# PIP install requirements only if it is not possible with conda
4847
# https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#using-pip-in-an-environment
4948
- pip:

environment_dev.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,10 @@ channels:
66

77
dependencies:
88
# Python 3.11 was default for Anaconda 2023.07-0 (Jul 11, 2023)
9-
# https://docs.anaconda.com/free/anaconda/release-notes/#anaconda-2023-03-0-mar-20-2023
10-
# package management
11-
- conda
12-
- conda-build
13-
- conda-libmamba-solver
14-
- pip
9+
# https://docs.anaconda.com/anaconda/release-notes/#anaconda-2023-07-0-jul-11-2023
10+
- python =3.11
1511

1612
# Running HSP2
17-
- python =3.11
1813
- scipy # Scipy also installs numpy
1914
# Pandas installs most scientific Python modules, such as Numpy, etc.
2015
- pandas >=2.0
@@ -30,16 +25,17 @@ dependencies:
3025
# Operational Model (om)
3126
- pyparsing
3227

33-
# Interactivity & Visualization via Jupyter Notebooks (optional,
34-
# but required for tutorials)
28+
# Interactivity via Jupyter Notebooks (optional, but required for tutorials)
3529
- jupyterlab # also installs classic Jupyter notbook
36-
- ipympl # jupyter-matplotlib, https://github.com/matplotlib/ipympl
3730
- nodejs # required for many JupyterLab extensions
38-
# HoloViz, https://holoviz.org
31+
32+
# Visualization (optional)
3933
- hvplot # hvPlot installs most HoloViz libs, including matplotlib
34+
- ipympl # jupyter-matplotlib, https://github.com/matplotlib/ipympl
4035
- ipywidgets # Required for HoloViz interactivity in Jupyter notebooks
4136
- ipywidgets_bokeh
42-
- jupyter_bokeh # for VSCode
37+
- jupyter_bokeh # Renders Holviz / Bokeh objects in Jupyter
38+
- pyviz_comms # bidirectional communication between Python & JavaScript for Jupyter
4339

4440
# Dev tools (optional)
4541
# Language Server Protocol (LSP) extension for Python (pylsp)
@@ -53,10 +49,14 @@ dependencies:
5349
# YAPF for code formatting (preferred over autopep8)
5450
# flake8 for error checking (disabled by default)
5551
# pylint for code linting (disabled by default)
56-
- jupyterlab-lsp # Provides both server extension and lab extension
57-
52+
- jupyterlab-lsp # Provides both server extension and lab extension
5853

54+
# Environment and package management
55+
- conda
56+
- conda-build
57+
- conda-libmamba-solver
58+
- pip
5959
# PIP install requirements only if it is not possible with conda
6060
# https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#using-pip-in-an-environment
6161
- pip:
62-
# For Dev environment, we recommend using the `conda build` command to install
62+
# For developing HPS2, we recommend using the `conda build` command to "install"

0 commit comments

Comments
 (0)