Skip to content

Commit

Permalink
Fixing utils.py (#38624)
Browse files Browse the repository at this point in the history
* Few minor diagnostics perf improvements (#38232)

* Check for actual meterRegistry

* Update ClientTelemetryMetrics.java

* Update ClientTelemetryMetrics.java

* Update CosmosDiagnosticsTest.java

* Removing String.format in metrics

* Update ClientTelemetryMetrics.java

* Update Uri.java

* Update RntbdClientChannelHealthChecker.java

* Update RntbdToken.java

* Update FaultInjectionRequestContext.java

* Update RntbdTokenStream.java

* Update RntbdTokenStream.java

* Update RntbdTokenStream.java

* EnumMap changes

* Avoiding ImmutableEnumMaps

* Fixing unit tests

* Update ClientTelemetryMetrics.java

* Update FaultInjectionRequestContext.java

* Update CHANGELOG.md

* Release preparations

* Update CHANGELOG.md

* Allowing to opt-out of E2E timeout for non-point operations via system property or environment variable (#38388)

* Allowing to opt-out of E2E timeout for non-point operations via system property or environment variable

* Tests

* Reacting to code review feedback

* remove winutils download steps (#38030)

Co-authored-by: annie-mac <xinlian@microsoft.com>

* addChannelAcquisitionContextInCosmosDiagnosticsBasedOnLatency (#38416)

* add channelAcquisitionContext in cosmosDiagnostics when reaching threshold

---------

Co-authored-by: annie-mac <xinlian@microsoft.com>

* Fixing release break for hotfix

* Update utils.py

* Update set_versions.py

* Update set_versions.py

---------

Co-authored-by: Annie Liang <64233642+xinlian12@users.noreply.github.com>
Co-authored-by: annie-mac <xinlian@microsoft.com>
  • Loading branch information
3 people authored Feb 4, 2024
1 parent 271736e commit d9ff0dc
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions eng/versioning/set_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,11 @@ def verify_current_version_of_artifact(build_type, artifact_id, group_id):
# this regex is looking for beta.X
if prerelease_regex_named.match(prerel) is None:
# if the build_type isn't data then error
if build_type.name.lower() != 'data':
if build_type.name.lower() == 'data':
# raise ValueError('library ({}) version ({}) in version file ({}) is not a correct version to release. The accepted prerelease tag is (beta.X) and the current prerelease tag is ({})'.format(library_to_update, module.current, version_file, prerel))
else:
# else:
# verify that the prerelease tag is "beta" which is the only allowable thing for data track aside from beta.X
if prerelease_data_regex.match(prerel) is None:
#if prerelease_data_regex.match(prerel) is None:
# raise ValueError('library ({}) version ({}) in version file ({}) is not a correct version to release. The accepted prerelease tags for data track are (beta) or (beta.X) and the current prerelease tag is ({})'.format(library_to_update, module.current, version_file, prerel))
# at this point the version is <major>.<minor>.<patch>-beta
temp_ver = '{}-{}'.format(temp_ver, str(prerel))
Expand Down

0 comments on commit d9ff0dc

Please sign in to comment.