Skip to content

Commit ffd90a4

Browse files
chore: bump 2.10.0 release
1 parent 8e7ff17 commit ffd90a4

20 files changed

+124
-76
lines changed

.github/workflows/tidy3d-python-client-tests.yml

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,10 @@ jobs:
434434
git remote add upstream "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${BASE_REPO}.git" || true
435435
git fetch --no-tags --prune --depth=1 upstream "+refs/heads/${BASE_REF}:refs/remotes/upstream/${BASE_REF}"
436436
437+
# Store base repo/ref for use in subsequent steps
438+
echo "base_repo=${BASE_REPO}" >> "$GITHUB_OUTPUT"
439+
echo "base_ref=${BASE_REF}" >> "$GITHUB_OUTPUT"
440+
437441
# Name-status diff between base and head limited to schemas/
438442
DIFF_OUTPUT=$(git diff --name-status "upstream/${BASE_REF}...HEAD" -- schemas || true)
439443
@@ -465,17 +469,61 @@ jobs:
465469
echo "| $label | \`$file\` |" >> "$GITHUB_STEP_SUMMARY"
466470
done <<< "$DIFF_OUTPUT"
467471
468-
- name: verify-allowed-changes
472+
- name: compare-versions
473+
id: compare-versions
469474
if: steps.schema-diff.outputs.changed == 'true'
470475
env:
471-
STEPS_GET_VERSION_OUTPUTS_VERSION: ${{ steps.get-version.outputs.version }}
476+
PR_VERSION: ${{ steps.get-version.outputs.version }}
477+
BASE_REPO: ${{ steps.schema-diff.outputs.base_repo }}
478+
BASE_REF: ${{ steps.schema-diff.outputs.base_ref }}
479+
run: |
480+
set -euo pipefail
481+
cd "$GITHUB_WORKSPACE"
482+
483+
PR_VERSION="${PR_VERSION}"
484+
BASE_REPO="${BASE_REPO}"
485+
BASE_REF="${BASE_REF}"
486+
487+
echo "PR branch version: $PR_VERSION"
488+
489+
# Checkout base branch temporarily to get its version
490+
echo "Checking out base branch ${BASE_REF} to get version..."
491+
git checkout -q "refs/remotes/upstream/${BASE_REF}"
492+
493+
# Install dependencies and get version from base branch
494+
source $GITHUB_WORKSPACE/.venv/bin/activate
495+
uv pip install -e "$GITHUB_WORKSPACE" --quiet
496+
BASE_VERSION=$(python -c "import tidy3d; print(tidy3d.__version__)")
497+
echo "Base branch (${BASE_REF}) version: $BASE_VERSION"
498+
echo "base_version=${BASE_VERSION}" >> "$GITHUB_OUTPUT"
499+
500+
# Return to HEAD branch
501+
git checkout -q HEAD
502+
503+
# Compare versions
504+
if [[ "$PR_VERSION" != "$BASE_VERSION" ]]; then
505+
echo "⚠️ Version mismatch detected: PR branch ($PR_VERSION) != base branch ($BASE_VERSION)"
506+
echo "This appears to be a version bump PR. Skipping schema change verification."
507+
echo "is_version_bump=true" >> "$GITHUB_OUTPUT"
508+
else
509+
echo "✅ Versions match: PR branch ($PR_VERSION) == base branch ($BASE_VERSION)"
510+
echo "Proceeding with schema change verification."
511+
echo "is_version_bump=false" >> "$GITHUB_OUTPUT"
512+
fi
513+
514+
- name: verify-allowed-changes
515+
if: steps.schema-diff.outputs.changed == 'true' && steps.compare-versions.outputs.is_version_bump == 'false'
516+
env:
517+
BASE_VERSION: ${{ steps.compare-versions.outputs.base_version }}
518+
BASE_REF: ${{ steps.schema-diff.outputs.base_ref }}
472519
run: |
473520
set -e
474-
version="${STEPS_GET_VERSION_OUTPUTS_VERSION}"
475-
if [[ "$version" == *rc* ]]; then
476-
echo "✅ Passing: Schema changed on a release candidate version ($version), which is permitted."
521+
base_version="${BASE_VERSION}"
522+
base_ref="${BASE_REF}"
523+
if [[ "$base_version" == *rc* ]]; then
524+
echo "✅ Passing: Schema changed on a release candidate version ($base_version) in base branch '${base_ref}', which is permitted."
477525
else
478-
echo "❌ Failing: Schema changed on a non-rc release version ($version)."
526+
echo "❌ Failing: Schema changed on a non-rc release version ($base_version) in base branch '${base_ref}'."
479527
exit 1
480528
fi
481529

poetry.lock

Lines changed: 56 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "tidy3d"
3-
version = "2.10.0rc3"
3+
version = "2.10.0"
44
description = "A fast FDTD solver"
55
authors = ["Tyler Hughes <tyler@flexcompute.com>"]
66
license = "LGPLv2+"
@@ -120,7 +120,7 @@ sphinxemoji = { version = "*", optional = true }
120120
devsim = { version = "*", optional = true }
121121
cma = { version = "*", optional = true }
122122
openpyxl = { version = "*", optional = true }
123-
tidy3d-extras = { version = "2.10.0rc3", optional = true }
123+
tidy3d-extras = { version = "2.10.0", optional = true }
124124

125125
[tool.poetry.extras]
126126
dev = [

schemas/EMESimulation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12996,7 +12996,7 @@
1299612996
"type": "string"
1299712997
},
1299812998
"version": {
12999-
"default": "2.10.0rc3",
12999+
"default": "2.10.0",
1300013000
"type": "string"
1300113001
}
1300213002
},

schemas/HeatChargeSimulation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10146,7 +10146,7 @@
1014610146
"type": "string"
1014710147
},
1014810148
"version": {
10149-
"default": "2.10.0rc3",
10149+
"default": "2.10.0",
1015010150
"type": "string"
1015110151
}
1015210152
},

schemas/HeatSimulation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10146,7 +10146,7 @@
1014610146
"type": "string"
1014710147
},
1014810148
"version": {
10149-
"default": "2.10.0rc3",
10149+
"default": "2.10.0",
1015010150
"type": "string"
1015110151
}
1015210152
},

schemas/ModeSimulation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12815,7 +12815,7 @@
1281512815
"type": "string"
1281612816
},
1281712817
"version": {
12818-
"default": "2.10.0rc3",
12818+
"default": "2.10.0",
1281912819
"type": "string"
1282012820
}
1282112821
},

schemas/Simulation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17566,7 +17566,7 @@
1756617566
"type": "string"
1756717567
},
1756817568
"version": {
17569-
"default": "2.10.0rc3",
17569+
"default": "2.10.0",
1757017570
"type": "string"
1757117571
}
1757217572
},

schemas/TerminalComponentModeler.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16177,7 +16177,7 @@
1617716177
"type": "string"
1617816178
},
1617916179
"version": {
16180-
"default": "2.10.0rc3",
16180+
"default": "2.10.0",
1618116181
"type": "string"
1618216182
}
1618316183
},

tests/sims/full_charge.h5

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)