diff --git a/projects/control-service/cicd/.gitlab-ci.yml b/projects/control-service/cicd/.gitlab-ci.yml index 1dbfe7eed3..8f2e089811 100644 --- a/projects/control-service/cicd/.gitlab-ci.yml +++ b/projects/control-service/cicd/.gitlab-ci.yml @@ -271,12 +271,12 @@ control_service_publish_api_client: stage: publish_artifacts script: - apk add --no-cache py-pip openjdk17-jdk git - - pip install -U pip setuptools wheel twine + - pip install -U pip build twine - ./projects/control-service/projects/gradlew -p ./projects/control-service/projects/model buildPython - cd projects/control-service/projects/model/apidefs/datajob-api/build - rm -rf dist/ && cd ./python - - python setup.py sdist --formats=gztar - - twine upload --repository-url $PIP_REPO_UPLOAD_URL -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/*tar.gz --verbose + - python -m build + - twine upload --repository-url $PIP_REPO_UPLOAD_URL -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/* --verbose retry: !reference [.control_service_retry, retry_options] rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' diff --git a/projects/control-service/projects/model/apidefs/datajob-api/publish-python.sh b/projects/control-service/projects/model/apidefs/datajob-api/publish-python.sh index ab5a9c3580..5efbf5991f 100755 --- a/projects/control-service/projects/model/apidefs/datajob-api/publish-python.sh +++ b/projects/control-service/projects/model/apidefs/datajob-api/publish-python.sh @@ -9,9 +9,9 @@ cd build/python python3.7 -m venv venv source venv/bin/activate -pip install -U pip setuptools wheel twine +pip install -U pip build twine pip install -r requirements.txt rm -rf dist/ -python setup.py sdist --formats=gztar -twine upload --repository-url "$PIP_REPO_UPLOAD_URL" -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/*tar.gz +python -m build +twine upload --repository-url "$PIP_REPO_UPLOAD_URL" -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/* diff --git a/projects/vdk-control-cli/.gitlab-ci.yml b/projects/vdk-control-cli/.gitlab-ci.yml index fc9167808f..a456d63738 100644 --- a/projects/vdk-control-cli/.gitlab-ci.yml +++ b/projects/vdk-control-cli/.gitlab-ci.yml @@ -72,9 +72,9 @@ vdk-control-cli-release: - echo "GIT_BRANCH='$CI_COMMIT_REF_NAME'" >> $build_info_file - echo "GITLAB_CI_JOB_ID='$CI_JOB_ID'" >> $build_info_file - echo "BUILD_DATE='$(date -u)'" >> $build_info_file - - pip install -U pip setuptools wheel twine - - python setup.py sdist --formats=gztar - - twine upload --repository-url "$PIP_REPO_UPLOAD_URL" -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/*tar.gz --verbose + - pip install -U pip build twine + - python -m build + - twine upload --repository-url "$PIP_REPO_UPLOAD_URL" -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/* --verbose rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' when: never diff --git a/projects/vdk-core/cicd/release-vdk-core.sh b/projects/vdk-core/cicd/release-vdk-core.sh index cc98919382..80bab3a334 100755 --- a/projects/vdk-core/cicd/release-vdk-core.sh +++ b/projects/vdk-core/cicd/release-vdk-core.sh @@ -24,7 +24,7 @@ else echo "GIT_BRANCH='$CI_COMMIT_REF_NAME'" >> $build_info_file fi -pip install -U pip setuptools wheel twine -python setup.py sdist --formats=gztar +pip install -U pip build twine +python -m build # provide credentials as Gitlab variables -twine upload --repository-url $PIP_REPO_UPLOAD_URL -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/*tar.gz --verbose +twine upload --repository-url $PIP_REPO_UPLOAD_URL -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/* --verbose diff --git a/projects/vdk-heartbeat/.gitlab-ci.yml b/projects/vdk-heartbeat/.gitlab-ci.yml index ff3a29ed0b..7388253db7 100644 --- a/projects/vdk-heartbeat/.gitlab-ci.yml +++ b/projects/vdk-heartbeat/.gitlab-ci.yml @@ -55,9 +55,9 @@ vdk-heartbeat-release: stage: release script: - echo "$(cat version.txt | grep -o '[0-9]\.[0-9]').$CI_PIPELINE_ID" > version.txt - - pip install -U pip setuptools wheel twine - - python setup.py sdist --formats=gztar - - twine upload --repository-url $PIP_REPO_UPLOAD_URL -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/*tar.gz --verbose + - pip install -U pip build twine + - python -m build + - twine upload --repository-url $PIP_REPO_UPLOAD_URL -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/* --verbose rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' when: never diff --git a/projects/vdk-plugins/.plugin-common.yml b/projects/vdk-plugins/.plugin-common.yml index c5cda3e6ac..a497c828a7 100644 --- a/projects/vdk-plugins/.plugin-common.yml +++ b/projects/vdk-plugins/.plugin-common.yml @@ -63,10 +63,10 @@ - echo "Release plugin $PLUGIN_NAME" - cd $PLUGIN_NAME/ || exit 1 - sed -ri "s/__version__ = \"([[:digit:]]\.[[:digit:]]\.).*\"$/__version__ = \"\1${VDK_PATCH_VERSION}\"/g" setup.py - - pip install -U pip setuptools wheel twine - - python setup.py sdist --formats=gztar + - pip install -U pip build twine + - python -m build # provide the credentials as Gitlab variables - - twine upload --repository-url $PIP_REPO_UPLOAD_URL -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/*tar.gz --verbose + - twine upload --repository-url $PIP_REPO_UPLOAD_URL -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/* --verbose retry: !reference [.retry, retry_options] rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' diff --git a/projects/vdk-plugins/airflow-provider-vdk/.airflow-ci.yml b/projects/vdk-plugins/airflow-provider-vdk/.airflow-ci.yml index f4b9ea4165..7d91e89dba 100644 --- a/projects/vdk-plugins/airflow-provider-vdk/.airflow-ci.yml +++ b/projects/vdk-plugins/airflow-provider-vdk/.airflow-ci.yml @@ -41,10 +41,10 @@ release-airflow-provider-vdk: - echo "Releasing airflow-provider-vdk..." - cd airflow-provider-vdk/ || exit 1 - sed -ri "s/__version__ = \"([[:digit:]]\.[[:digit:]]\.).*\"$/__version__ = \"\1${VDK_PATCH_VERSION}\"/g" setup.py - - pip install -U pip setuptools wheel twine - - python setup.py sdist --formats=gztar + - pip install -U pip build twine + - python -m build # provide the credentials as Gitlab variables - - twine upload --repository-url $PIP_REPO_UPLOAD_URL -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/*tar.gz --verbose + - twine upload --repository-url $PIP_REPO_UPLOAD_URL -u "$PIP_REPO_UPLOAD_USER_NAME" -p "$PIP_REPO_UPLOAD_USER_PASSWORD" dist/* --verbose retry: !reference [.retry, retry_options] rules: - if: '$CI_PIPELINE_SOURCE == "schedule"'