use exact PyQt version

scrapinghub · Jun 2, 2020 · e7e65e4 · e7e65e4
1 parent 54d5b4e
commit e7e65e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -137,9 +137,6 @@ ENV LD_LIBRARY_PATH="/opt/qt-${QT_SHORT_VERSION}/${QT_FULL_VERSION}/gcc_64/lib:$
 
 FROM splash-base as qt5-builder
 
-ARG QT_MAJOR_VERSION
-ENV QT_MAJOR_VERSION=${QT_MAJOR_VERSION}
-
 ARG SPLASH_BUILD_PARALLEL_JOBS
 ENV SPLASH_BUILD_PARALLEL_JOBS=${SPLASH_BUILD_PARALLEL_JOBS}
 

diff --git a/dockerfiles/splash/install-pyqt5.sh b/dockerfiles/splash/install-pyqt5.sh
@@ -8,7 +8,7 @@ pushd /tmp/builds && \
 # sip
 tar xzf "$1" --keep-newer-files -C sip --strip-components 1 && \
 pushd sip && \
-${_PYTHON} configure.py --sip-module PyQt${QT_MAJOR_VERSION}.sip && \
+${_PYTHON} configure.py --sip-module PyQt5.sip && \
 make -j ${SPLASH_BUILD_PARALLEL_JOBS} && \
 make install && \
 popd && \
@@ -34,7 +34,7 @@ ${_PYTHON} configure.py -c -j ${SPLASH_BUILD_PARALLEL_JOBS} \
 make -j ${SPLASH_BUILD_PARALLEL_JOBS} && \
 make install && \
 popd  && \
-${_PYTHON} -c "import PyQt${QT_MAJOR_VERSION}.QtCore; print(PyQt${QT_MAJOR_VERSION}.QtCore.__file__)"
+${_PYTHON} -c "import PyQt5.QtCore; print(PyQt5.QtCore.__file__)"
 
 # Builds Complete
 popd