update

Dockerfile

@@ -1,8 +1,9 @@
 # syntax=docker/dockerfile:1.4
 ARG BASE_IMAGE=debian:bookworm-slim
+ARG SCC_OPT=/root/opt
 FROM ${BASE_IMAGE} as builder
-COPY . /root/opt/sysu-scc-spack-repo-latest
-ENV SCC_SETUP_ENV=/root/opt/sysu-scc-spack-repo-latest/share/sysu-scc-spack-repo/setup-env.sh
+COPY . ${SCC_OPT}/sysu-scc-spack-repo-latest
+ENV SCC_SETUP_ENV=${SCC_OPT}/sysu-scc-spack-repo-latest/share/sysu-scc-spack-repo/setup-env.sh
 RUN <<EOF
 apt-get update -y
 apt-get upgrade -y
@@ -14,13 +15,11 @@ apt-get clean -y
 rm -rf /var/lib/apt/lists/*
 $(dirname $SCC_SETUP_ENV)/init-env.sh v0.21.2
 . ${SCC_SETUP_ENV}
-$(dirname $SCC_SETUP_ENV)/init-default-compiler.sh "builtin.gcc@12.3.0 target=x86_64_v3 os=ubuntu22.04" "gcc@12.3.0%gcc@12.3.0+binutils target=$(arch)" "gcc@12.3.0"
-spack install --fail-fast -y python && spack gc -y && spack clean -ab
-cp -r $(spack location -i python)/* /root/opt/python
+$(dirname $SCC_SETUP_ENV)/init-default-compiler.sh "builtin.gcc@12.3.0 target=x86_64_v3 os=ubuntu22.04" "gcc@12.3.0%gcc@12.3.0+binutils target=$(arch) python gmake ca-certificates-mozilla" "gcc@12.3.0"
+cp -r $(spack location -i --first python) ${SCC_OPT}
+mv ${SCC_OPT}/python-* ${SCC_OPT}/python
 EOF
 FROM ${BASE_IMAGE}
-ENV SCC_SETUP_ENV=/root/opt/sysu-scc-spack-repo-latest/share/sysu-scc-spack-repo/setup-env.sh
-ENV SPACK_PYTHON=/root/opt/python/bin/python
 RUN <<EOF
 apt-get update -y
 apt-get upgrade -y
@@ -30,4 +29,6 @@ apt-get autoremove -y
 apt-get clean -y
 rm -rf /var/lib/apt/lists/*
 EOF
-COPY --from=builder /root/opt /root/opt
+ENV SCC_SETUP_ENV=${SCC_OPT}/sysu-scc-spack-repo-latest/share/sysu-scc-spack-repo/setup-env.sh
+ENV SPACK_PYTHON=${SCC_OPT}/python/bin/python
+COPY --from=builder ${SCC_OPT} ${SCC_OPT}

packages/py-vl-convert-python/package.py

@@ -7,7 +7,7 @@
 
 
 class PyVlConvertPython(PythonPackage):
-    """Convert Vega-Lite chart specifications to SVG, PNG, or Vega"""
+    """Convert Vega-Lite chart specifications to SVG, PNG, PDF, or Vega"""
 
     homepage = "https://github.com/vega/vl-convert"
     pypi = "vl_convert_python/vl_convert_python-0.13.1.tar.gz"