diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 95941735..a2014ae7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.11" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/actions/build_deploy_python_executable/action.yml b/actions/build_deploy_python_executable/action.yml index 5fe88957..418f84d7 100644 --- a/actions/build_deploy_python_executable/action.yml +++ b/actions/build_deploy_python_executable/action.yml @@ -5,9 +5,9 @@ inputs: description: 'Path to dagster_cloud.yaml' required: true python_version: - description: 'Python version string, major.minor only, eg "3.8"' + description: 'Python version string, major.minor only, eg "3.11"' required: false - default: '3.8' + default: '3.11' deployment: required: false description: "The deployment to push to, defaults to 'prod'. Ignored for pull requests where the branch deployment is used." @@ -47,12 +47,12 @@ runs: run: echo "FLAG_DEPS_CACHE_TO=--deps-cache-to=${{ github.repository }}/${{ github.ref_name }}" >> $GITHUB_ENV shell: bash - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.11" - - if: ${{ inputs.python_version != '3.8' }} + - if: ${{ inputs.python_version != '3.11' }} name: Set up Python ${{ inputs.python_version }} for target uses: actions/setup-python@v4 with: diff --git a/github/serverless/branch_deployments.yml b/github/serverless/branch_deployments.yml index 6a0f6dcc..cd213180 100644 --- a/github/serverless/branch_deployments.yml +++ b/github/serverless/branch_deployments.yml @@ -11,7 +11,7 @@ env: DAGSTER_CLOUD_URL: ${{ secrets.DAGSTER_CLOUD_URL }} DAGSTER_CLOUD_API_TOKEN: ${{ secrets.DAGSTER_CLOUD_API_TOKEN }} ENABLE_FAST_DEPLOYS: 'true' - PYTHON_VERSION: '3.8' + PYTHON_VERSION: '3.11' DAGSTER_CLOUD_FILE: 'dagster_cloud.yaml' jobs: diff --git a/github/serverless/dbt/branch_deployments.yml b/github/serverless/dbt/branch_deployments.yml index 624b751d..f73c9741 100644 --- a/github/serverless/dbt/branch_deployments.yml +++ b/github/serverless/dbt/branch_deployments.yml @@ -11,7 +11,7 @@ env: DAGSTER_CLOUD_URL: ${{ secrets.DAGSTER_CLOUD_URL }} DAGSTER_CLOUD_API_TOKEN: ${{ secrets.DAGSTER_CLOUD_API_TOKEN }} ENABLE_FAST_DEPLOYS: 'true' - PYTHON_VERSION: '3.8' + PYTHON_VERSION: '3.11' DAGSTER_CLOUD_FILE: 'dagster_cloud.yaml' jobs: diff --git a/github/serverless/dbt/deploy.yml b/github/serverless/dbt/deploy.yml index fafb0d72..ca7c3501 100644 --- a/github/serverless/dbt/deploy.yml +++ b/github/serverless/dbt/deploy.yml @@ -13,7 +13,7 @@ env: DAGSTER_CLOUD_URL: ${{ secrets.DAGSTER_CLOUD_URL }} DAGSTER_CLOUD_API_TOKEN: ${{ secrets.DAGSTER_CLOUD_API_TOKEN }} ENABLE_FAST_DEPLOYS: 'true' - PYTHON_VERSION: '3.8' + PYTHON_VERSION: '3.11' DAGSTER_CLOUD_FILE: 'dagster_cloud.yaml' jobs: diff --git a/github/serverless/deploy.yml b/github/serverless/deploy.yml index ab419167..777a2269 100644 --- a/github/serverless/deploy.yml +++ b/github/serverless/deploy.yml @@ -13,7 +13,7 @@ env: DAGSTER_CLOUD_URL: ${{ secrets.DAGSTER_CLOUD_URL }} DAGSTER_CLOUD_API_TOKEN: ${{ secrets.DAGSTER_CLOUD_API_TOKEN }} ENABLE_FAST_DEPLOYS: 'true' - PYTHON_VERSION: '3.8' + PYTHON_VERSION: '3.11' DAGSTER_CLOUD_FILE: 'dagster_cloud.yaml' jobs: diff --git a/gitlab/serverless-legacy-ci.yml b/gitlab/serverless-legacy-ci.yml index 7746391d..b379079a 100644 --- a/gitlab/serverless-legacy-ci.yml +++ b/gitlab/serverless-legacy-ci.yml @@ -40,7 +40,7 @@ build-image: before_script: - echo $AWS_ECR_PASSWORD | docker login --username $AWS_ECR_USERNAME --password-stdin $REGISTRY_URL script: - - echo "FROM python:3.8-slim" > $DAGSTER_CLOUD_LOCATION_DIR/Dockerfile + - echo "FROM python:3.11-slim" > $DAGSTER_CLOUD_LOCATION_DIR/Dockerfile - cat Dockerfile.template >> $DAGSTER_CLOUD_LOCATION_DIR/Dockerfile - docker build $DAGSTER_CLOUD_LOCATION_DIR -t $REGISTRY_URL:prod-$DAGSTER_CLOUD_LOCATION_NAME-$CI_COMMIT_SHA - docker push $REGISTRY_URL:prod-$DAGSTER_CLOUD_LOCATION_NAME-$CI_COMMIT_SHA diff --git a/sample-repo/Dockerfile b/sample-repo/Dockerfile index 6eafdad5..3a491f7b 100644 --- a/sample-repo/Dockerfile +++ b/sample-repo/Dockerfile @@ -1,8 +1,8 @@ -FROM python:3.8-slim +FROM python:3.11-slim COPY requirements.txt /requirements.txt RUN pip install -r /requirements.txt WORKDIR /opt/dagster/app -COPY repo.py /opt/dagster/app \ No newline at end of file +COPY repo.py /opt/dagster/app diff --git a/src/Dockerfile b/src/Dockerfile index 6dd807cb..a7fda74c 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 python:3.8.16-slim +FROM --platform=linux/amd64 python:3.11-slim # Install deps RUN apt update && apt install git -y @@ -34,4 +34,4 @@ COPY src/get_branch_deployment.sh /get_branch_deployment.sh COPY src/gitlab_action gitlab_action # Use the venv python as the command -CMD venv-dagster-cloud/bin/python3 \ No newline at end of file +CMD venv-dagster-cloud/bin/python3 diff --git a/src/Dockerfile.dagster-manylinux-builder b/src/Dockerfile.dagster-manylinux-builder index 613d3be0..ac619d33 100644 --- a/src/Dockerfile.dagster-manylinux-builder +++ b/src/Dockerfile.dagster-manylinux-builder @@ -29,7 +29,7 @@ ENV PATH="/opt/python/cp38-cp38/bin:/opt/python/cp37-cp37m/bin:/opt/python/cp39- COPY wheels /wheels # Install dagster-cloud -RUN python3.8 -m pip install dagster-cloud --find-links file:///wheels/ +RUN python3.11 -m pip install dagster-cloud --find-links file:///wheels/ COPY generated/gha/builder.pex /builder.pex diff --git a/src/Dockerfile.template b/src/Dockerfile.template index 9346fc3b..f045a873 100644 --- a/src/Dockerfile.template +++ b/src/Dockerfile.template @@ -1,5 +1,5 @@ -# base image is templated in (default: python:3.8-slim) +# base image is templated in (default: python:3.11-slim) # Run the custom dagster cloud pre install script if available COPY *dagster_cloud_pre_install.sh *setup.py *requirements.txt / diff --git a/src/copy_template.sh b/src/copy_template.sh index e8583bd5..04042976 100755 --- a/src/copy_template.sh +++ b/src/copy_template.sh @@ -2,9 +2,9 @@ if [ -z $CUSTOM_BASE_IMAGE_ALLOWED ] || [ -z $INPUT_BASE_IMAGE ]; then if [ ! -z $INPUT_BASE_IMAGE ]; then - echo "Custom base images are not enabled for this organization, defaulting to python:3.8-slim." + echo "Custom base images are not enabled for this organization, defaulting to python:3.11-slim." fi - echo "FROM python:3.8-slim" > ${INPUT_TARGET_DIRECTORY}/Dockerfile + echo "FROM python:3.11-slim" > ${INPUT_TARGET_DIRECTORY}/Dockerfile else echo "FROM ${INPUT_BASE_IMAGE}" > ${INPUT_TARGET_DIRECTORY}/Dockerfile fi diff --git a/tests/conftest.py b/tests/conftest.py index ee96d99e..a0ece290 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -219,7 +219,7 @@ def builder_module(dagster_cloud_pex_path): ) except subprocess.CalledProcessError as exc: raise ValueError("Could not unpack builder:" + exc.output) - sys.path.insert(0, os.path.join(venv_dir, "lib/python3.8/site-packages")) + sys.path.insert(0, os.path.join(venv_dir, "lib/python3.11/site-packages")) try: yield importlib.import_module("dagster_cloud_cli.core.pex_builder") finally: