kaggle-environments 1.22.7__tar.gz → 1.22.9__tar.gz

{kaggle_environments-1.22.7 → kaggle_environments-1.22.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaggle-environments
-Version: 1.22.7
+Version: 1.22.9
 Summary: Kaggle Environments
 Author-email: Kaggle <support@kaggle.com>
 Requires-Python: >=3.10

{kaggle_environments-1.22.7 → kaggle_environments-1.22.9}/docker/cicd-publish-to-pypi.sh

@@ -9,27 +9,24 @@ apt-get update -y && apt-get install -y git --no-install-recommends
 pip install requests --quiet
 
 # Read version directly from pyproject.toml
+PACKAGE_NAME="kaggle-environments" # Define package name for reuse
 VERSION_FROM_PYPROJECT=$(grep -E "^version\s*=\s*\"[0-9]+\.[0-9]+\.[0-9]+\"$" pyproject.toml | cut -d '"' -f 2)
-
 CLOUD_RUN_REQS_PATH="docker/cloud-run-source/requirements.txt"
 
 if [ -z "$VERSION_FROM_PYPROJECT" ]; then
-  echo "Could not find version in pyproject.toml. Exiting."
+  echo "❌ Could not find version in pyproject.toml. Exiting."
   exit 1
 fi
 
 echo "Found version $VERSION_FROM_PYPROJECT in pyproject.toml. Checking against PyPI."
 
-# Write the Python script to a temporary file
+# (Your Python script to check for existing version remains the same)
 cat > /tmp/check_pypi.py << EOL
 import sys
 import requests
-
-package_name = 'kaggle-environments'
+package_name = '$PACKAGE_NAME'
 version_to_check = sys.argv[1]
-
 response = requests.get(f'https://pypi.org/pypi/{package_name}/json')
-
 if response.status_code == 200:
     data = response.json()
     if version_to_check in data.get('releases', {}):
@@ -43,20 +40,44 @@ else:
     sys.exit(1)
 EOL
 
-# Execute the script and capture the output
 VERSION_EXISTS=$(python3 /tmp/check_pypi.py "$VERSION_FROM_PYPROJECT")
 
 if [ "$VERSION_EXISTS" = "true" ]; then
-  echo "Version $VERSION_FROM_PYPROJECT already exists on PyPI. Skipping publish."
+  echo "⏩ Version $VERSION_FROM_PYPROJECT already exists on PyPI. Skipping publish."
 else
-  echo "Version $VERSION_FROM_PYPROJECT not found on PyPI. Publishing..."
+  echo "🚀 Version $VERSION_FROM_PYPROJECT not found on PyPI. Publishing..."
   pip install flit --quiet
   export FLIT_USERNAME=__token__
   export FLIT_PASSWORD=$PYPI_TOKEN
 
   flit publish
   
-  echo "Successfully published. Updating Cloud Run requirements at $CLOUD_RUN_REQS_PATH..."
+  # --- RETRY LOGIC START ---
+  echo "Verifying that package '$PACKAGE_NAME==$VERSION_FROM_PYPROJECT' is available from PyPI..."
+  MAX_RETRIES=10
+  RETRY_DELAY_SECONDS=30
+  SUCCESS=false
+
+  for i in $(seq 1 $MAX_RETRIES)
+  do
+    # Use 'pip install' with --no-cache-dir as the check. This is the most reliable method.
+    if python -m pip install --no-cache-dir "$PACKAGE_NAME==$VERSION_FROM_PYPROJECT" --quiet; then
+      echo "✅ Successfully found and installed package from PyPI."
+      SUCCESS=true
+      break
+    else
+      echo "Attempt $i/$MAX_RETRIES: Package not yet available. Waiting ${RETRY_DELAY_SECONDS}s..."
+      sleep $RETRY_DELAY_SECONDS
+    fi
+  done
+
+  if [ "$SUCCESS" != "true" ]; then
+    echo "❌ Failed to find package on PyPI after $MAX_RETRIES attempts. Aborting."
+    exit 1
+  fi
+  # --- RETRY LOGIC END ---
+
+  echo "Successfully published and verified. Updating Cloud Run requirements at $CLOUD_RUN_REQS_PATH..."
   
   # Use sed to replace the placeholder with the actual version
   sed -i "s/VERSION_FROM_CICD_DEPLOY/${VERSION_FROM_PYPROJECT}/" "$CLOUD_RUN_REQS_PATH"

kaggle_environments-1.22.9/docker/cloudbuild.cloudrun.yaml

@@ -0,0 +1,25 @@
+# docker/cloudbuild.cloudrun.yaml
+
+steps:
+  - name: "gcr.io/cloud-builders/docker"
+    args:
+      - "build"
+      - "-t"
+      - "us-central1-docker.pkg.dev/$PROJECT_ID/gcf-artifacts/kaggle-simulations-v2:$COMMIT_SHA"
+      - "./docker/cloud-run-source"
+
+  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    args:
+      - "gcloud"
+      - "run"
+      - "deploy"
+      - "kaggle-simulations-v2"
+      - "--image=us-central1-docker.pkg.dev/$PROJECT_ID/gcf-artifacts/kaggle-simulations-v2:$COMMIT_SHA"
+      - "--region=us-central1"
+      - "--project=kaggle-comps-prod-eval"
+
+images:
+  - "us-central1-docker.pkg.dev/$PROJECT_ID/gcf-artifacts/kaggle-simulations-v2:$COMMIT_SHA"
+
+options:
+  machineType: "E2_HIGHCPU_32"

{kaggle_environments-1.22.7 → kaggle_environments-1.22.9}/docker/cloudbuild.yaml

@@ -61,10 +61,11 @@ steps:
       - |
         if [ -f /workspace/published_new_version.flag ]; then
           echo "✅ New version was published. Deploying update to Cloud Run."
-          gcloud run deploy kaggle-simulations-v2\
+          gcloud run deploy kaggle-simulations-v2 \
             --source ./docker/cloud-run-source \
             --region us-central1 \
-            --project kaggle-comps-prod-eval
+            --project kaggle-comps-prod-eval \
+            --entry-point "functions-framework --target=main"
         else
           echo "⏩ No new version was published. Skipping Cloud Run deployment."
         fi

{kaggle_environments-1.22.7 → kaggle_environments-1.22.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kaggle-environments"
-version = "1.22.7"
+version = "1.22.9"
 description = "Kaggle Environments"
 authors = [
     {name = "Kaggle", email = "support@kaggle.com"},