Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENH: pcds-5.9.0 #341

Merged
merged 24 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5b4038e
ENH: add requested packages and nitpick conda vs pypi and keep updated
ZLLentz Aug 22, 2024
a655445
BLD: update pins
ZLLentz Aug 22, 2024
e29d659
SEC: clear and update security pins to likely the minimum needed
ZLLentz Aug 22, 2024
cb917ae
FIX: switch get_extras to standard parsing for better robustness
ZLLentz Aug 23, 2024
4ed4bda
ENH: add py-trees!
ZLLentz Aug 23, 2024
f7da250
BLD: update pins
ZLLentz Aug 26, 2024
277a238
BLD: pin matplotlib back until dependencies all use matplotlib-base
ZLLentz Aug 26, 2024
30e82b8
WIP: temporary pins section
ZLLentz Aug 26, 2024
322bafe
BLD: avoid bluesky incompat
ZLLentz Aug 26, 2024
d331b29
BLD: force the qt5 opencv builds
ZLLentz Aug 26, 2024
f6a696f
TST: don't fail the build on too-noisy pip check for bad pkg metadata
ZLLentz Aug 27, 2024
7beae76
CI: try more intricate sequencing: only do certain steps when main bu…
ZLLentz Aug 27, 2024
8b94535
ENH/CI: include pip checking in the readiness builds too
ZLLentz Aug 27, 2024
2b515d9
BLD: update pinning
ZLLentz Aug 27, 2024
9366407
CI: typo in readiness checks for pypi
ZLLentz Aug 27, 2024
ca4c849
BLD: drop matplotlib pin, accept databroker pin for a bit longer
ZLLentz Aug 27, 2024
c39e3fe
TST: include security pins in the conda py compat checks to better te…
ZLLentz Aug 27, 2024
64751cb
BLD: pin matplotlib for consistency
ZLLentz Aug 27, 2024
f92cba1
CI: run env export through the script that includes the pip git installs
ZLLentz Aug 27, 2024
6fc4abd
DOC: see how the release notes look if we start with added packages (…
ZLLentz Aug 27, 2024
d443233
FIX: wrong order for inline spec + file spec
ZLLentz Aug 27, 2024
5466d88
BLD: build pcds-5.9.0 locally and export yaml
ZLLentz Aug 28, 2024
0a6366d
CI: try to fix ci versino of export env
ZLLentz Aug 28, 2024
6522242
DOC: typo in docstring
ZLLentz Aug 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions envs/pcds/conda-packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ atlassian-python-api>=3.41.14
black>=24.8.0
blark>=0.8.1
bluesky-live>=0.0.8
bluesky-queueserver>=0.0.18
bluesky-widgets>=0.0.14
bokeh>=1.0.1
botorch>=0.4.0
Expand All @@ -17,6 +16,7 @@ coloredlogs>=15.0.1
conda-pack>=0.8.0
conda-smithy>=3.38.0
cookiecutter>=2.1.1
coverage>=7.6.1
cython>=0.29.34
datashader>=0.14.4
elog>=1.2.3
Expand All @@ -25,9 +25,9 @@ flake8>=7.1.1
flask>=3.0.3
fzf>=0.54.3
gdb>=15.1
gh>=2.54.0
gh>=2.55.0
ghapi>=1.0.5
gpytorch>=1.4.2
grpcio-tools>=1.51.1
h5py>=3.3.0
happi>=2.5.0
hklpy>=1.1.1
Expand All @@ -39,11 +39,11 @@ jupyter>=1.0.0
krtc>=0.3.0
lightpath>=1.0.4
line_profiler>=4.1.1
lucid>=0.10.3
lucid>=0.11.0
lxml>=4.8.0
memray>=1.13.4
mysqlclient>=2.0.3
nabs>=1.5.4
nabs>=1.5.5
numpy>=1.14,<2.0.0
opencv>=4.5.1
openssl>=3.3.1
Expand All @@ -52,7 +52,7 @@ panel>=0.14.4
papermill>=2.3.4
paramiko>=3.1.0
pcaspy>=0.7.3
pcdscalc>=0.5.1
pcdscalc>=0.6.0
pcdsdaq>=2.4.3
pcdsdevices>=8.4.0
pcdsutils>=0.14.1
Expand All @@ -64,7 +64,7 @@ pmpsdb_client>=1.2.0
pre-commit>=3.8.0
psdaq-control-minimal>=3.3.38
psdm_qs_cli>=0.3.7
pswalker>=1.0.8
pswalker>=1.0.10
pyaudio>=0.2.13
pyca>=3.2.1
pycln>=2.4.0
Expand All @@ -90,8 +90,11 @@ scikit-image>=0.19.3
scikit-learn>=1.2.2
scipy>=1.10.1
seaborn>=0.12.2
shapely
shellcheck>=0.10.0
simplejson>=3.19.1
sphinx>=7
sphinx_rtd_theme>=2.0.0
spyder-kernels>=2.4.3
suitcase-csv>=0.3.0
suitcase-json-metadata>=0.2.1
Expand All @@ -114,19 +117,12 @@ pyqt=5.15.9
pyqtwebengine=5.15.9
# conda+pip regressive pins
# avoids bluesky v1.11.0 which breaks nabs
bluesky=1.10.0
# coverage 7.4.2 does not have a py39 build on conda
coverage=7.4.1
# avoids pre-releases of v2
databroker<2.0.0
bluesky-base=1.10.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also pins bluesky (non-base), which has a strict bluesky-base pin. So the comment here makes sense 👍

# ipython changes make scientists upset and can break experiments
ipython=8.4.0
# most of the ecosystem is not ready for numpy 2.0
numpy=1.26.4
# avoids ophyd v1.8.0 which I have not had time to test
ophyd=1.7.0
# force a newer perl build (temporary pin, can remove later if you read this line)
perl=5.32.1=7_hd590300_perl5
# pin for gui interface stability
qtpy=2.1.0
# sphinx 7.0.0 incompatible with rtd theme at 1.2.0, temporarily pin both
sphinx<7
sphinx_rtd_theme=1.2.0
12 changes: 9 additions & 3 deletions envs/pcds/keep-updated.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ whatrecord
# Collaboration packages
# - Packages developed by e.g. NSLS-II, APS
# - Frequently relevant features/fixes
bloptools
# bluesky (need to fix nabs and test v1.11.0)
# bluesky-live
# blueksy-queueserver
# bluesky-widgets
caproto
hklpy
# ophyd (need to test v1.8.0)
Expand All @@ -53,12 +57,14 @@ atlassian-python-api
black
conda-pack
conda-smithy
# coverage (v7.4.2 missing conda build, skip for now)
coverage
flake8
flask
fzf
gdb
gh
ghapi
grpcio-tools
isort
line_profiler
memray
Expand All @@ -72,9 +78,9 @@ pytest-repeat
pytest-xdist
pyupgrade
shellcheck
# sphinx and friends updates temporarily disabled due to incompatibilities at v7.0.0
# sphinx temporarily disabled due to incompatibilities at v8.0.0
# sphinx
# sphinx_rtd_theme
sphinx_rtd_theme

# Security
openssl
12 changes: 5 additions & 7 deletions envs/pcds/pip-packages.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# pypi as new as possible
bluesky-queueserver>=0.0.18
bloptools>=0.7.0
grpcio-tools>=1.62.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this wasn't specifically for BEAMS, but maybe we also install py_trees? Or is that putting the cart before the horse?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're totally right, let's do it

laserbeamsize
p4p
pip-audit
Expand All @@ -7,18 +10,13 @@ python-vxi11
slac-alarm-manager>=1.3.0
tc-release>=0.2.6
# conda+pip regressive pins
# coverage 7.4.2 does not have a py39 build on conda
coverage==7.4.1
# avoids bluesky v1.11.0 which breaks nabs
bluesky==1.10.0
# avoids pre-releases of v2
databroker<2.0.0
# ipython changes make scientists upset and can break experiments
ipython==8.4.0
# most of the ecosystem is not ready for numpy 2.0
numpy==1.26.4
# avoids ophyd v1.8.0 which I have not had time to test
ophyd==1.7.0
# pin for gui interface stability
qtpy==2.1.0
# sphinx 7.0.0 incompatible with rtd theme at 1.2.0, temporarily pin both
sphinx<7
sphinx_rtd_theme==1.2.0
17 changes: 1 addition & 16 deletions envs/pcds/security-packages.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
# Extra dependencies that must be updated to handle a CVE
# Apply this even in the incr environment
# This file can be periodically cleared after an env release
aiohttp>=3.9.2
dnspython>=2.6.1
cryptography>=42.0.0
fastapi>=0.109.1
gitpython>=3.1.41
idna>=3.7
jinja2>=3.1.3
jupyter-lsp>=2.2.2
jupyterlab>=4.0.11
notebook>=7.0.7
orjson>=3.9.15
pillow>=10.3.0
pymongo>=4.6.3
pyopenssl>=24
python-multipart>=0.0.7
starlette>=0.36.2
aiohttp>=3.10.2
Loading