Merge pull request #221 from tmaeno/master

to install panda-common before panda-client
PanDAWMS · May 26, 2023 · f8ebbbf · f8ebbbf
2 parents dd8c5c0 + f2c3661
commit f8ebbbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -19,6 +19,8 @@ RUN usermod -a -G zp atlpan
 RUN mkdir /tmp/src
 WORKDIR /tmp/src
 COPY . .
+# install panda-common first to prevent panda-client from installing redundant files
+RUN /opt/panda/bin/pip install --no-cache-dir panda-common
 RUN /opt/panda/bin/python setup.py sdist; /opt/panda/bin/pip install --no-cache-dir `ls dist/p*.tar.gz`[postgres]
 RUN /opt/panda/bin/pip install --no-cache-dir rucio-clients
 RUN /opt/panda/bin/pip install --no-cache-dir "git+https://github.com/PanDAWMS/panda-cacheschedconfig.git"

diff --git a/PandaPkgInfo.py b/PandaPkgInfo.py
@@ -1 +1 @@
-release_version = "0.0.55"
+release_version = "0.0.56"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		release_version = "0.0.55"
		release_version = "0.0.56"