Skip to content
Snippets Groups Projects
Commit ebcb5150 authored by Karim Ahmed's avatar Karim Ahmed
Browse files

Merge branch 'update_dep_calParrot_extradata' into 'master'

update CalParrot and EXtra-data

See merge request !928
parents 4b0eb541 7f2b668f
No related branches found
No related tags found
Loading
...@@ -63,7 +63,7 @@ install_requires = [ ...@@ -63,7 +63,7 @@ install_requires = [
"docutils==0.17.1", "docutils==0.17.1",
"dynaconf==3.1.4", "dynaconf==3.1.4",
"env_cache==0.1", "env_cache==0.1",
"extra_data==1.12.0", "extra_data==1.15.1",
"extra_geom==1.10.0", "extra_geom==1.10.0",
"gitpython==3.1.0", "gitpython==3.1.0",
"h5py==3.5.0", "h5py==3.5.0",
...@@ -110,7 +110,7 @@ if "readthedocs.org" not in sys.executable: ...@@ -110,7 +110,7 @@ if "readthedocs.org" not in sys.executable:
install_requires += [ install_requires += [
"iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@2.4.1", # noqa "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@2.4.1", # noqa
"XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.7.0", # noqa "XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.7.0", # noqa
"CalParrot @ git+ssh://git@git.xfel.eu:10022/calibration/calparrot.git@0.2", # noqa "CalParrot @ git+ssh://git@git.xfel.eu:10022/calibration/calparrot.git@0.3", # noqa
] ]
setup( setup(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment