Merge pull request #353 from tangkong/bld_unpin_line_profiler

BLD: line profiler no longer requires ipython, unpin needed for py3.12
pcdshub · Jan 23, 2025 · 3f83368 · 3f83368
2 parents 925c3ec + b746e70
commit 3f83368
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/envs/pcds/conda-packages.txt b/envs/pcds/conda-packages.txt
@@ -122,8 +122,6 @@ bluesky-base=1.10.0
 databroker=1.2.5
 # ipython changes make scientists upset and can break experiments
 ipython=8.4.0
-# newer line_profiler requires newer ipython
-line_profiler=4.1.1
 # matplotlib conda pin can be removed once all conda dependencies specify matplotlib-base
 matplotlib=3.8.4
 # most of the ecosystem is not ready for numpy 2.0

diff --git a/envs/pcds/pip-packages.txt b/envs/pcds/pip-packages.txt
@@ -2,6 +2,7 @@
 bloptools>=0.7.0
 grpcio-tools>=1.62.2
 laserbeamsize
+line_profiler>=4.1.2
 p4p
 pip-audit
 py-trees>=2.2.3

diff --git a/scripts/get_extras.py b/scripts/get_extras.py
@@ -28,7 +28,9 @@
 # Packages that are only available on Conda
 CONDA_ONLY = []
 # Packages that are only available on PYPI
-PYPI_ONLY = []
+# line_profiler must be installed with pip to allow desired ipython version
+# newer line_profiler needed for py3.12 support
+PYPI_ONLY = ["line_profiler"]
 # Packages that can't be put into the environment right now
 AVOID = ['python-ldap']