From 2e62fd3b876bf937797327865e7ac49495a942c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordan=20Fr=C3=A9ry?= Date: Tue, 15 Oct 2024 17:35:36 +0200 Subject: [PATCH] chore: remove pip extra url (#921) --- .github/workflows/benchmarks.yaml | 1 - .github/workflows/cifar_benchmark.yaml | 1 - .github/workflows/continuous-integration.yaml | 3 --- .github/workflows/refresh-notebooks.yaml | 1 - .github/workflows/refresh-one-notebook.yaml | 1 - .github/workflows/release.yaml | 1 - .github/workflows/single_benchmark.yaml | 1 - .github/workflows/update_licenses.yaml | 1 - .github/workflows/weekly-pip-audit.yaml | 1 - Makefile | 2 -- 10 files changed, 13 deletions(-) diff --git a/.github/workflows/benchmarks.yaml b/.github/workflows/benchmarks.yaml index 6935b3ca9..4287e06a5 100644 --- a/.github/workflows/benchmarks.yaml +++ b/.github/workflows/benchmarks.yaml @@ -66,7 +66,6 @@ jobs: length: ${{ steps.prepare-commands.outputs.length }} env: PIP_INDEX_URL: ${{ secrets.PIP_INDEX_URL }} - PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }} steps: - name: Add masks run: | diff --git a/.github/workflows/cifar_benchmark.yaml b/.github/workflows/cifar_benchmark.yaml index 9f8a16e51..3b60316d0 100644 --- a/.github/workflows/cifar_benchmark.yaml +++ b/.github/workflows/cifar_benchmark.yaml @@ -72,7 +72,6 @@ jobs: runs-on: ${{ needs.setup-ec2.outputs.runner-name }} env: PIP_INDEX_URL: ${{ secrets.PIP_INDEX_URL }} - PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }} steps: - name: Add masks run: | diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 25a1401a1..fc6612b00 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -388,7 +388,6 @@ jobs: env: IS_REF_BUILD: ${{ matrix.python_version == '3.8' }} PIP_INDEX_URL: ${{ secrets.PIP_INDEX_URL }} - PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} outputs: @@ -1061,8 +1060,6 @@ jobs: fail-fast: false matrix: ${{ fromJSON(format('{{"include":{0}}}', needs.matrix-preparation.outputs.macos-matrix)) }} env: - PIP_INDEX_URL: ${{ secrets.PIP_INDEX_URL }} - PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} steps: diff --git a/.github/workflows/refresh-notebooks.yaml b/.github/workflows/refresh-notebooks.yaml index 3a7eb1408..f92480cfd 100644 --- a/.github/workflows/refresh-notebooks.yaml +++ b/.github/workflows/refresh-notebooks.yaml @@ -50,7 +50,6 @@ jobs: shell: bash env: PIP_INDEX_URL: ${{ secrets.PIP_INDEX_URL }} - PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }} KAGGLE_USERNAME: ${{ secrets.KAGGLE_USERNAME }} KAGGLE_KEY: ${{ secrets.KAGGLE_KEY }} diff --git a/.github/workflows/refresh-one-notebook.yaml b/.github/workflows/refresh-one-notebook.yaml index 957776eb8..b09f430e4 100644 --- a/.github/workflows/refresh-one-notebook.yaml +++ b/.github/workflows/refresh-one-notebook.yaml @@ -133,7 +133,6 @@ jobs: shell: bash env: PIP_INDEX_URL: ${{ secrets.PIP_INDEX_URL }} - PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }} NOTEBOOK_NAME: ${{ github.event.inputs.notebook }} KAGGLE_USERNAME: ${{ secrets.KAGGLE_USERNAME }} KAGGLE_KEY: ${{ secrets.KAGGLE_KEY }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1095b6e36..87b4c8241 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -305,7 +305,6 @@ jobs: PRIVATE_RELEASE_IMAGE_BASE: ghcr.io/zama-ai/concrete-ml PUBLIC_RELEASE_IMAGE_BASE: zamafhe/concrete-ml PIP_INDEX_URL: ${{ secrets.PIP_INDEX_URL }} - PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }} GIT_TAG: ${{ needs.release-checks.outputs.git_tag }} PROJECT_VERSION: ${{ needs.release-checks.outputs.project_version }} IS_RC: ${{needs.release-checks.outputs.is_rc}} diff --git a/.github/workflows/single_benchmark.yaml b/.github/workflows/single_benchmark.yaml index f84297582..74c7ac351 100644 --- a/.github/workflows/single_benchmark.yaml +++ b/.github/workflows/single_benchmark.yaml @@ -78,7 +78,6 @@ jobs: shell: bash env: PIP_INDEX_URL: ${{ secrets.PIP_INDEX_URL }} - PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }} steps: - name: Instance configuration used run: | diff --git a/.github/workflows/update_licenses.yaml b/.github/workflows/update_licenses.yaml index 7cf20bae7..2a7e2f4d9 100644 --- a/.github/workflows/update_licenses.yaml +++ b/.github/workflows/update_licenses.yaml @@ -60,7 +60,6 @@ jobs: shell: bash env: PIP_INDEX_URL: ${{ secrets.PIP_INDEX_URL }} - PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }} steps: # Mask internal URLs if logged diff --git a/.github/workflows/weekly-pip-audit.yaml b/.github/workflows/weekly-pip-audit.yaml index 6bc110208..66ee557ef 100644 --- a/.github/workflows/weekly-pip-audit.yaml +++ b/.github/workflows/weekly-pip-audit.yaml @@ -33,7 +33,6 @@ jobs: timeout-minutes: 5 env: PIP_INDEX_URL: ${{ secrets.PIP_INDEX_URL }} - PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }} steps: - name: Add masks run: | diff --git a/Makefile b/Makefile index c3c7833e7..5458b6ebf 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,6 @@ OPEN_PR="true" setup_env: @# The keyring install is to allow pip to fetch credentials for our internal repo if needed PIP_INDEX_URL=https://pypi.org/simple \ - PIP_EXTRA_INDEX_URL=https://pypi.org/simple \ poetry run python --version poetry run python -m pip install keyring poetry run python -m pip install -U pip wheel @@ -369,7 +368,6 @@ docker_start: -p 8888:8888 \ --env DISPLAY=host.docker.internal:0 \ $${PIP_INDEX_URL:+--env "PIP_INDEX_URL=$${PIP_INDEX_URL}"} \ - $${PIP_EXTRA_INDEX_URL:+--env "PIP_EXTRA_INDEX_URL=$${PIP_EXTRA_INDEX_URL}"} \ --volume /"$$(pwd)":/src \ --volume $(DEV_CONTAINER_VENV_VOLUME):/home/dev_user/dev_venv \ --volume $(DEV_CONTAINER_CACHE_VOLUME):/home/dev_user/.cache \