diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index b6b21630d..d11593b52 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -36,7 +36,6 @@ jobs: needs-38-linux-runner: ${{ steps.set-matrix.outputs.needs-38-linux-runner }} needs-39-linux-runner: ${{ steps.set-matrix.outputs.needs-39-linux-runner }} needs-310-linux-runner: ${{ steps.set-matrix.outputs.needs-310-linux-runner }} - needs-311-linux-runner: ${{ steps.set-matrix.outputs.needs-311-linux-runner }} steps: - name: Checkout code uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b @@ -82,8 +81,6 @@ jobs: jq -rc '. | map(select(.os_kind=="linux" and .python_version=="3.9")) | length > 0') NEEDS_LINUX_310_RUNNER=$(echo "${LINUX_MATRIX}" | \ jq -rc '. | map(select(.os_kind=="linux" and .python_version=="3.10")) | length > 0') - NEEDS_LINUX_311_RUNNER=$(echo "${LINUX_MATRIX}" | \ - jq -rc '. | map(select(.os_kind=="linux" and .python_version=="3.11")) | length > 0') echo "Needs Linux 3.7 runner:" echo "${NEEDS_LINUX_37_RUNNER}" @@ -97,14 +94,10 @@ jobs: echo "Needs Linux 3.10 runner:" echo "${NEEDS_LINUX_310_RUNNER}" - echo "Needs Linux 3.11 runner:" - echo "${NEEDS_LINUX_311_RUNNER}" - echo "::set-output name=needs-37-linux-runner::${NEEDS_LINUX_37_RUNNER}" echo "::set-output name=needs-38-linux-runner::${NEEDS_LINUX_38_RUNNER}" echo "::set-output name=needs-39-linux-runner::${NEEDS_LINUX_39_RUNNER}" echo "::set-output name=needs-310-linux-runner::${NEEDS_LINUX_310_RUNNER}" - echo "::set-output name=needs-311-linux-runner::${NEEDS_LINUX_311_RUNNER}" start-runner-linux: needs: [matrix-preparation] @@ -119,8 +112,6 @@ jobs: ec2-instance-id-39: ${{ steps.start-ec2-runner-39.outputs.ec2-instance-id || '' }} label-310: ${{ steps.start-ec2-runner-310.outputs.label }} ec2-instance-id-310: ${{ steps.start-ec2-runner-310.outputs.ec2-instance-id || '' }} - label-311: ${{ steps.start-ec2-runner-311.outputs.label }} - ec2-instance-id-311: ${{ steps.start-ec2-runner-311.outputs.ec2-instance-id || '' }} matrix: ${{ steps.update-linux-matrix.outputs.linux-matrix }} steps: - name: Checkout Code @@ -181,18 +172,6 @@ jobs: subnet-id: ${{ secrets.AWS_EC2_SUBNET_ID }} security-group-id: ${{ secrets.AWS_EC2_SECURITY_GROUP_ID }} - - name: Start EC2 runner python 311 - id: start-ec2-runner-311 - if: ${{ !cancelled() && fromJSON(needs.matrix-preparation.outputs.needs-311-linux-runner) }} - uses: machulav/ec2-github-runner@4e0303de215db88e1c489e07a15ca4d867f488ea - with: - mode: start - github-token: ${{ secrets.EC2_RUNNER_BOT_TOKEN }} - ec2-image-id: ${{ secrets.AWS_EC2_AMI }} - ec2-instance-type: ${{ secrets.AWS_EC2_INSTANCE_TYPE }} - subnet-id: ${{ secrets.AWS_EC2_SUBNET_ID }} - security-group-id: ${{ secrets.AWS_EC2_SECURITY_GROUP_ID }} - - name: Update Linux runs_on Matrix id: update-linux-matrix env: @@ -206,8 +185,6 @@ jobs: '(. | map(select(.os_kind=="linux" and .python_version=="3.9") |= . + {"runs_on": "${{ steps.start-ec2-runner-39.outputs.label }}"}) )') MATRIX=$(echo "${MATRIX}" | jq -rc \ '(. | map(select(.os_kind=="linux" and .python_version=="3.10") |= . + {"runs_on": "${{ steps.start-ec2-runner-310.outputs.label }}"}) )') - MATRIX=$(echo "${MATRIX}" | jq -rc \ - '(. | map(select(.os_kind=="linux" and .python_version=="3.11") |= . + {"runs_on": "${{ steps.start-ec2-runner-311.outputs.label }}"}) )') echo "Updated matrix:" echo "${MATRIX}" @@ -457,15 +434,6 @@ jobs: ec2-instance-id: ${{ needs.start-runner-linux.outputs.ec2-instance-id-310 }} mode: stop - - name: Stop EC2 runner python 311 - uses: machulav/ec2-github-runner@4e0303de215db88e1c489e07a15ca4d867f488ea - if: ${{ always() && needs.start-runner-linux.outputs.ec2-instance-id-311 }} - with: - github-token: ${{ secrets.EC2_RUNNER_BOT_TOKEN }} - label: ${{ needs.start-runner-linux.outputs.label-311 }} - ec2-instance-id: ${{ needs.start-runner-linux.outputs.ec2-instance-id-311 }} - mode: stop - build-macos: needs: [matrix-preparation] if: ${{ needs.matrix-preparation.outputs.macos-matrix != '[]' }} diff --git a/poetry.lock b/poetry.lock index ee0cbb402..35c7b3fab 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3961,5 +3961,5 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" -python-versions = ">=3.7,<3.12" -content-hash = "c2bcc47c4079fe4f0271e1a45ca7dc9ac8de0a6b629b65070e4ef1ede8b5c43f" +python-versions = ">=3.7,<3.11" +content-hash = "6909a805bce2b77b4d8def5a9f8c5eeb20cd818716ef0c314878d5f2651623ce" diff --git a/pyproject.toml b/pyproject.toml index 57f125bfa..091f15e97 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ readme = "README.md" "Discourse" = "https://community.zama.ai/c/concrete-numpy/7" [tool.poetry.dependencies] -python = ">=3.7,<3.12" +python = ">=3.7,<3.11" networkx = "^2.6.3" matplotlib = "^3.5.1" numpy = [ diff --git a/script/actions_utils/generate_test_matrix.py b/script/actions_utils/generate_test_matrix.py index d996c420f..61bc26184 100644 --- a/script/actions_utils/generate_test_matrix.py +++ b/script/actions_utils/generate_test_matrix.py @@ -27,7 +27,7 @@ WEEKLY_OSES = { LINUX: "ubuntu-22.04", MACOS: "macos-11", } -WEEKLY_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"] +WEEKLY_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"] WEEKLY_CONF = {"os": WEEKLY_OSES, "python": WEEKLY_PYTHON_VERSIONS} # The OSes here are to indicate the OSes used for runners during release @@ -38,7 +38,7 @@ RELEASE_OSES = { # MACOS: "macos-10.15", } # The python versions will be used to build packages during release -RELEASE_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"] +RELEASE_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"] RELEASE_CONF = {"os": RELEASE_OSES, "python": RELEASE_PYTHON_VERSIONS} CONFIGURATIONS = {