Merge branch 'remove-generation-of-python2-packages' into 'develop'

build: remove support of Python 2 See merge request asapo/asapo!224

Merge branch 'remove-generation-of-python2-packages' into 'develop'
244b0816 · Marc-Olivier Andrez · 421717ef · a158a035 · 244b0816 · 244b0816
Commit 244b0816 authored 10 months ago by Marc-Olivier Andrez
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,17 +35,11 @@ include:
      else
        ENABLE_LIBFABRIC="ON"
      fi
-    - >
-      if [ -z "$WITH_PYTHON2" ]; then
-        BUILD_PYTHON2="OFF"
-      else
-        BUILD_PYTHON2="ON"
-      fi
    - cmake -DCMAKE_BUILD_TYPE="Release" -DENABLE_LIBFABRIC=$ENABLE_LIBFABRIC -DINSTALL_EXAMPLES=ON -DBUILD_CLIENTS_ONLY=ON -DPACKAGE_RELEASE_SUFFIX=$OS_SUFFIX -DBUILD_PYTHON=OFF -DCPACK_PACKAGE_NAME="asapo-devel" -DCPACK_GENERATOR=$PACKAGE_UP ..
    - make -j 4
    - make package
    - rm -f CMakeCache.txt
-    - cmake -DCMAKE_BUILD_TYPE="Release" -DENABLE_LIBFABRIC=$ENABLE_LIBFABRIC -DBUILD_CLIENTS_ONLY=ON -DNUMPY_VERSION=0 -DBUILD_PYTHON=ON -DPACKAGE_RELEASE_SUFFIX=$OS_SUFFIX -DBUILD_PYTHON_PACKAGES="source;${PACKAGE_LOW}" -DBUILD_PYTHON2_PACKAGES=$BUILD_PYTHON2 -DBUILD_PYTHON_DOCS=OFF ..
+    - cmake -DCMAKE_BUILD_TYPE="Release" -DENABLE_LIBFABRIC=$ENABLE_LIBFABRIC -DBUILD_CLIENTS_ONLY=ON -DNUMPY_VERSION=0 -DBUILD_PYTHON=ON -DPACKAGE_RELEASE_SUFFIX=$OS_SUFFIX -DBUILD_PYTHON_PACKAGES="source;${PACKAGE_LOW}" -DBUILD_PYTHON_DOCS=OFF ..
    - make -j 1
    - mkdir -p $CI_PROJECT_DIR/linux_packages/$PACKAGE_FOLDER
    - cp $CI_PROJECT_DIR/build/asapo-devel* $CI_PROJECT_DIR/linux_packages/$PACKAGE_FOLDER
@@ -70,7 +64,7 @@ include:
    - $pip_bin install cython numpy==$NUMPY_VERSION
    - mkdir $CI_PROJECT_DIR/build
    - cd $CI_PROJECT_DIR/build
-    - cmake -DENABLE_LIBFABRIC=ON -DCMAKE_BUILD_TYPE="Release" -DBUILD_CLIENTS_ONLY=ON -DPython_EXECUTABLE=$python_bin -DBUILD_PYTHON_PACKAGES=source -DBUILD_PYTHON2_PACKAGES=OFF -DNUMPY_VERSION=$NUMPY_VERSION ..
+    - cmake -DENABLE_LIBFABRIC=ON -DCMAKE_BUILD_TYPE="Release" -DBUILD_CLIENTS_ONLY=ON -DPython_EXECUTABLE=$python_bin -DBUILD_PYTHON_PACKAGES=source  -DNUMPY_VERSION=$NUMPY_VERSION ..
    - cd $CI_PROJECT_DIR/build/consumer/api/python/dist_linux
    - make python-dist-consumer
    - $pip_bin wheel dist/*.tar.gz --no-deps
@@ -273,7 +267,6 @@ build-packages-centos7:
  variables:
    PACKAGE_TYPE: "RPM"
    WITH_LIBFABRIC: "YES"
-    WITH_PYTHON2: "YES"
    OS_SUFFIX: "1.el7"
    PACKAGE_FOLDER: "centos7.9.2009"

@@ -295,7 +288,6 @@ build-packages-debian9:
    entrypoint: [""]
  variables:
    PACKAGE_TYPE: "DEB"
-    WITH_PYTHON2: "YES"
    OS_SUFFIX: "debian9.13"
    PACKAGE_FOLDER: "debian9.13"

@@ -307,7 +299,6 @@ build-packages-debian10:
  variables:
    PACKAGE_TYPE: "DEB"
    WITH_LIBFABRIC: "YES"
-    WITH_PYTHON2: "YES"
    OS_SUFFIX: "debian10.11"
    PACKAGE_FOLDER: "debian10.11"


--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,6 @@ set(ConfigPackageLocation lib/cmake/Asapo)
 # options

 option(BUILD_PYTHON "Build python libs" ON)
-option(BUILD_PYTHON2_PACKAGES "Build python2 packages" OFF)

 option(BUILD_CLIENTS_ONLY "Build clients only" OFF)


--- a/consumer/api/python/dist_linux/CMakeLists.txt
+++ b/consumer/api/python/dist_linux/CMakeLists.txt
@@ -9,14 +9,6 @@ if ("source" IN_LIST BUILD_PYTHON_PACKAGES )
 endif()

 if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
-    if (BUILD_PYTHON2_PACKAGES)
-        ADD_CUSTOM_TARGET(python-rpm-consumer ALL
-            COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
-            --requires=numpy --binary-only
-            COMMAND rm -f dist/python*.gz dist/*debuginfo* dist/*debugsource*
-            )
-        ADD_DEPENDENCIES(python-rpm-consumer python3-rpm-consumer)
-    endif()
    ADD_CUSTOM_TARGET(python3-rpm-consumer ALL
            COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
            --requires=python3-numpy --binary-only
@@ -26,16 +18,6 @@ if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
 endif()

 if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
-    if (BUILD_PYTHON2_PACKAGES)
-        ADD_CUSTOM_TARGET(python-deb-consumer ALL
-            COMMAND rm -rf deb_dist/*/
-            COMMAND PACKAGE_PREFIX= python setup.py --command-packages=stdeb.command
-            sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends=python-numpy bdist_deb
-            COMMAND rm -f deb_dist/*dbgsym*
-            COMMAND cp deb_dist/*.deb dist/
-            )
-        ADD_DEPENDENCIES(python-deb-consumer python3-deb-consumer)
-    endif()
    ADD_CUSTOM_TARGET(python3-deb-consumer ALL
            COMMAND rm -rf deb_dist/*/
            COMMAND PACKAGE_PREFIX= python3 setup.py --command-packages=stdeb.command

--- a/deploy/build_env/centos/build.sh
+++ b/deploy/build_env/centos/build.sh
@@ -21,12 +21,6 @@ cmake \
 make -j 4
 make package

-if [ $OS == "el7" ]; then
-  BUILD_PYTHON2_PACKAGES=ON
-else
-  BUILD_PYTHON2_PACKAGES=OFF
-fi
-
 #switch to static curl for Python packages
 rm CMakeCache.txt
 cmake \
@@ -38,7 +32,6 @@ cmake \
    -DBUILD_PYTHON=ON   \
    -DPACKAGE_RELEASE_SUFFIX=1.$OS \
    -DBUILD_PYTHON_PACKAGES="source;rpm"   \
-    -DBUILD_PYTHON2_PACKAGES=$BUILD_PYTHON2_PACKAGES \
    -DBUILD_PYTHON_DOCS=$BUILD_PYTHON_DOCS \
    ..
 make -j 1

--- a/deploy/build_env/debians/build.sh
+++ b/deploy/build_env/debians/build.sh
@@ -29,12 +29,6 @@ else
  BUILD_PYTHON_DOCS=OFF
 fi

-if [ $OS == "debian9.13" -o $OS == "debian10.7" -o $OS == "ubuntu16.04" -o $OS == "ubuntu18.04" ]; then
-  BUILD_PYTHON2_PACKAGES=ON
-else
-  BUILD_PYTHON2_PACKAGES=OFF
-fi
-
 #switch to static curl for Python packages
 rm CMakeCache.txt
 cmake \
@@ -45,7 +39,6 @@ cmake \
    -DNUMPY_VERSION=0   \
    -DBUILD_PYTHON=ON   \
    -DPACKAGE_RELEASE_SUFFIX=$OS \
-    -DBUILD_PYTHON2_PACKAGES=$BUILD_PYTHON2_PACKAGES \
    -DBUILD_PYTHON_PACKAGES="source;deb"   \
    -DBUILD_PYTHON_DOCS=$BUILD_PYTHON_DOCS \
    ..

--- a/deploy/build_env/manylinux2010/build.sh
+++ b/deploy/build_env/manylinux2010/build.sh
@@ -23,7 +23,6 @@ for python_path in /opt/python/cp{35,36,37,38,39}*; do
          -DBUILD_CLIENTS_ONLY=ON \
          -DLIBCURL_DIR=/curl -DPython_EXECUTABLE=$python \
          -DBUILD_PYTHON_PACKAGES=source \
-          -DBUILD_PYTHON2_PACKAGES=OFF \
          -DNUMPY_VERSION=$numpy_version ..
    cd /asapo/build/consumer/api/python/dist_linux \
        && $pip install -r ../dev-requirements.txt \

--- a/producer/api/python/dist_linux/CMakeLists.txt
+++ b/producer/api/python/dist_linux/CMakeLists.txt
@@ -4,14 +4,6 @@ configure_file(MANIFEST.in MANIFEST.in @ONLY)
 file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py INPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py)

 if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
-	if (BUILD_PYTHON2_PACKAGES)
-		ADD_CUSTOM_TARGET(python-rpm-producer ALL
-		COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
-			--requires=numpy --binary-only
-			COMMAND rm -f dist/python*.gz dist/*debuginfo* dist/*debugsource*
-		)
-		ADD_DEPENDENCIES(python-rpm-producer python3-rpm-producer)
-	endif()
 	ADD_CUSTOM_TARGET(python3-rpm-producer ALL
 		COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
 			--requires=python3-numpy --binary-only
@@ -21,16 +13,6 @@ if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
 endif()

 if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
-	if (BUILD_PYTHON2_PACKAGES)
-		ADD_CUSTOM_TARGET(python-deb-producer ALL
-			COMMAND rm -rf deb_dist/*/
-			COMMAND PACKAGE_PREFIX= python setup.py --command-packages=stdeb.command
-			sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends=python-numpy bdist_deb
-			COMMAND rm -f deb_dist/*dbgsym*
-			COMMAND cp deb_dist/*.deb dist/
-			)
-		ADD_DEPENDENCIES(python-deb-producer python3-deb-producer)
-	endif()
 	ADD_CUSTOM_TARGET(python3-deb-producer ALL
 			COMMAND rm -rf deb_dist/*/
 			COMMAND PACKAGE_PREFIX= python3 setup.py --command-packages=stdeb.command