Skip to content

Commit 5c774b5

Browse files
meraki-release-bot[bot]GitHub ActionTKIPisalegacycipher
authored
Release v4.1.0b1 (API v1.70.0-beta.1) (#354)
* Auto-generated library v4.1.0b1 for API v1.70.0-beta.1. * Expand testing environments. --------- Co-authored-by: GitHub Action <support@meraki.com> Co-authored-by: John M. Kuchta <git@chir.us>
1 parent 8aa6e4f commit 5c774b5

10 files changed

Lines changed: 37 additions & 10 deletions

File tree

‎.github/workflows/regenerate-library.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
LIBRARY_VERSION: ${{ github.event.inputs.library_version }}
6666
API_VERSION: ${{ github.event.inputs.api_version }}
6767
MERAKI_DASHBOARD_API_KEY: ${{ github.event.inputs.release_stage == 'beta' && secrets.TEST_ORG_API_KEY || '' }}
68-
BETA_ORG_ID: ${{ github.event.inputs.release_stage == 'beta' && secrets.BETA_ORG_1_ID || '' }}
68+
BETA_ORG_ID: ${{ github.event.inputs.release_stage == 'beta' && secrets.TEST_ORG_BETA_00_ID || '' }}
6969
run: |
7070
ARGS="-g true -v $LIBRARY_VERSION -a $API_VERSION"
7171
if [ "${{ github.event.inputs.release_stage }}" = "dev" ]; then

‎.github/workflows/test-library.yml‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,28 @@ jobs:
9292

9393
- name: Integration tests
9494
env:
95-
ORG_0: ${{ secrets.TEST_ORG_ID }}
96-
ORG_1: ${{ secrets.TEST_ORG_ID_1 }}
97-
ORG_2: ${{ secrets.TEST_ORG_ID_2 }}
98-
ORG_3: ${{ secrets.TEST_ORG_ID_3 }}
95+
ORG_GA_0: ${{ secrets.TEST_ORG_GA_00_ID }}
96+
ORG_GA_1: ${{ secrets.TEST_ORG_GA_01_ID }}
97+
ORG_GA_2: ${{ secrets.TEST_ORG_GA_02_ID }}
98+
ORG_GA_3: ${{ secrets.TEST_ORG_GA_03_ID }}
99+
ORG_BETA_0: ${{ secrets.TEST_ORG_BETA_00_ID }}
100+
ORG_BETA_1: ${{ secrets.TEST_ORG_BETA_01_ID }}
101+
ORG_BETA_2: ${{ secrets.TEST_ORG_BETA_02_ID }}
102+
ORG_BETA_3: ${{ secrets.TEST_ORG_BETA_03_ID }}
103+
ORG_DEV_0: ${{ secrets.TEST_ORG_DEV_00_ID }}
104+
ORG_DEV_1: ${{ secrets.TEST_ORG_DEV_01_ID }}
105+
ORG_DEV_2: ${{ secrets.TEST_ORG_DEV_02_ID }}
106+
ORG_DEV_3: ${{ secrets.TEST_ORG_DEV_03_ID }}
99107
run: |
108+
BRANCH="${{ github.head_ref || github.ref_name }}"
109+
case "$BRANCH" in
110+
main|release) PREFIX="GA" ;;
111+
beta|beta-release) PREFIX="BETA" ;;
112+
httpx|httpx-release) PREFIX="DEV" ;;
113+
*) echo "Unknown branch: $BRANCH" && exit 1 ;;
114+
esac
100115
INDEX=$(echo '${{ needs.assign-orgs.outputs.assignments }}' | jq -r '.["${{ matrix.python-version }}"]')
101-
VAR_NAME="ORG_${INDEX}"
116+
VAR_NAME="ORG_${PREFIX}_${INDEX}"
102117
ORG_ID="${!VAR_NAME}"
103118
uv run pytest tests/integration -v --tb=short --apikey ${{ secrets.TEST_ORG_API_KEY }} --o "$ORG_ID"
104119

‎docs/generation-report.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Generation Report
22

3+
## 2026-05-14 | Library v4.1.0b1 | API 1.70.0-beta.1
4+
5+
6+
No Python keyword parameter conflicts detected.
7+
8+
39
## 2026-05-08 | Library v4.1.0b0 | API 1.70.0-beta.0
410

511

‎meraki/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
from meraki._version import __version__ # noqa: F401
5353
from datetime import datetime
5454

55-
__api_version__ = "1.70.0-beta.0"
55+
__api_version__ = "1.70.0-beta.1"
5656

5757
__all__ = [
5858
"APIError",

‎meraki/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "4.1.0b0"
1+
__version__ = "4.1.0b1"

‎meraki/aio/api/wireless.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3103,6 +3103,7 @@ def updateNetworkWirelessSsidSplashSettings(self, networkId: str, number: str, *
31033103
- redirectUrl (string): The custom redirect URL where the users will go after the splash page.
31043104
- useRedirectUrl (boolean): The Boolean indicating whether the the user will be redirected to the custom redirect URL after the splash page. A custom redirect URL must be set if this is true.
31053105
- welcomeMessage (string): The welcome message for the users on the splash page.
3106+
- userConsent (object): User consent settings
31063107
- themeId (string): The id of the selected splash theme.
31073108
- splashLogo (object): The logo used in the splash page.
31083109
- splashImage (object): The image used in the splash page.
@@ -3144,6 +3145,7 @@ def updateNetworkWirelessSsidSplashSettings(self, networkId: str, number: str, *
31443145
"redirectUrl",
31453146
"useRedirectUrl",
31463147
"welcomeMessage",
3148+
"userConsent",
31473149
"themeId",
31483150
"splashLogo",
31493151
"splashImage",

‎meraki/api/batch/wireless.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,6 +1288,7 @@ def updateNetworkWirelessSsidSplashSettings(self, networkId: str, number: str, *
12881288
- redirectUrl (string): The custom redirect URL where the users will go after the splash page.
12891289
- useRedirectUrl (boolean): The Boolean indicating whether the the user will be redirected to the custom redirect URL after the splash page. A custom redirect URL must be set if this is true.
12901290
- welcomeMessage (string): The welcome message for the users on the splash page.
1291+
- userConsent (object): User consent settings
12911292
- themeId (string): The id of the selected splash theme.
12921293
- splashLogo (object): The logo used in the splash page.
12931294
- splashImage (object): The image used in the splash page.
@@ -1325,6 +1326,7 @@ def updateNetworkWirelessSsidSplashSettings(self, networkId: str, number: str, *
13251326
"redirectUrl",
13261327
"useRedirectUrl",
13271328
"welcomeMessage",
1329+
"userConsent",
13281330
"themeId",
13291331
"splashLogo",
13301332
"splashImage",

‎meraki/api/wireless.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3103,6 +3103,7 @@ def updateNetworkWirelessSsidSplashSettings(self, networkId: str, number: str, *
31033103
- redirectUrl (string): The custom redirect URL where the users will go after the splash page.
31043104
- useRedirectUrl (boolean): The Boolean indicating whether the the user will be redirected to the custom redirect URL after the splash page. A custom redirect URL must be set if this is true.
31053105
- welcomeMessage (string): The welcome message for the users on the splash page.
3106+
- userConsent (object): User consent settings
31063107
- themeId (string): The id of the selected splash theme.
31073108
- splashLogo (object): The logo used in the splash page.
31083109
- splashImage (object): The image used in the splash page.
@@ -3144,6 +3145,7 @@ def updateNetworkWirelessSsidSplashSettings(self, networkId: str, number: str, *
31443145
"redirectUrl",
31453146
"useRedirectUrl",
31463147
"welcomeMessage",
3148+
"userConsent",
31473149
"themeId",
31483150
"splashLogo",
31493151
"splashImage",

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "meraki"
3-
version = "4.1.0b0"
3+
version = "4.1.0b1"
44
description = "Cisco Meraki Dashboard API library"
55
authors = [
66
{name = "Cisco Meraki", email = "api-feedback@meraki.net"}

‎uv.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)