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

Updated package dependencies #296

Draft
wants to merge 28 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3be218c
Added importlib-metadata as an explicity dependency
tieneupin May 31, 2024
4a926fa
Added defusedxml to list of dependencies
tieneupin Jun 3, 2024
8176bb2
Merged recent changes from main branch
tieneupin Jun 12, 2024
acf8d0f
Merge remote-tracking branch 'origin' into pkg-updates
tieneupin Jun 17, 2024
ff9f57c
Locked numpy to <2 for now while dependencies catch up
tieneupin Jun 17, 2024
c12a6f2
Added importlib-metadata as an explicity dependency
tieneupin May 31, 2024
e32b04a
Locked NumPy to <2 for now
tieneupin Aug 5, 2024
abafbc4
Fixed merge conflicts
tieneupin Aug 5, 2024
daf1638
Removed duplicate dependencies and added accidentally removed depende…
tieneupin Aug 5, 2024
240f1dd
Added '# type: ignore' comment to ispyb-derivced Base objects
tieneupin Aug 5, 2024
3891efc
Removed 'importlib-metadata' dependency, as it appears to no longer b…
tieneupin Aug 5, 2024
a9dcaaa
Re-added 'importlib-metadata'; it needs to be installed explicityly f…
tieneupin Aug 5, 2024
f60030e
Added caught missing dependency
tieneupin Aug 7, 2024
2c4baa2
Added importlib-metadata as an explicity dependency
tieneupin May 31, 2024
0fc9449
Added importlib-metadata as an explicity dependency
tieneupin May 31, 2024
db1756d
Added defusedxml to list of dependencies
tieneupin Jun 3, 2024
b2c3bba
Locked numpy to <2 for now while dependencies catch up
tieneupin Jun 17, 2024
4275ce9
Added '# type: ignore' comment to ispyb-derivced Base objects
tieneupin Aug 5, 2024
dd86db7
Retained importlib-metadata; it is neede for Python >3.9
tieneupin Aug 5, 2024
4ca4f31
Re-added 'importlib-metadata'; it needs to be installed explicityly f…
tieneupin Aug 5, 2024
2d8d962
Added caught missing dependency
tieneupin Aug 7, 2024
35371ec
Muted problematic type hinting flag
tieneupin Aug 7, 2024
65a1b4a
Resolved merge conflicts with upstream branch
tieneupin Aug 7, 2024
49c194b
Updated pre-commit hook versions
tieneupin Aug 14, 2024
e7005f4
Merged recent changes from main branch
tieneupin Aug 14, 2024
05b088f
Made corrections to 'pyproject-fmt' configuration
tieneupin Aug 14, 2024
c6a3f32
Added model CLI arguments for 'pyproject-fmt' for future reference
tieneupin Aug 15, 2024
86d06e2
Removed 'pyproject-fmt' keys that have been verified to not work
tieneupin Aug 15, 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
Prev Previous commit
Next Next commit
Added importlib-metadata as an explicity dependency
tieneupin committed Aug 7, 2024
commit 0fc9449cfe347f3e7fd27ff8094f468b2fc0934f
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -31,7 +31,8 @@ classifiers = [
]
dependencies = [
"defusedxml", # For safely parsing XML files
"pydantic<2", # Locked to <2 by zocalo
"importlib-metadata", # Used in both client and server scripts
"pydantic<2", # pip hops between installing v2.7 or v1.10 depending on which of the additional dependencies are requested
"requests",
"rich",
"werkzeug",