Skip to content

Commit 23f1f0a

Browse files
committed
Pull request #59: fix version format
Merge in ISGAPPSEC/cyperf-api-wrapper from fix-cyperf-new-version-format to release/26.0.0 Squashed commit of the following: commit d2bdad3c56c4101213e3b6a79be6671384eb8df1 Author: iustmitu <iustin.mitu@keysight.com> Date: Fri Mar 13 14:44:41 2026 +0200 deleted python 3.7 dependencies commit f254f9fa59cfa6b3f9ef167af999575d4ba142ab Author: iustmitu <iustin.mitu@keysight.com> Date: Fri Mar 13 14:29:36 2026 +0200 fix version format
1 parent 5d4d7ee commit 23f1f0a

4 files changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
16+
python-version: ["3.8", "3.9", "3.10", "3.11"]
1717

1818
steps:
1919
- uses: actions/checkout@v3

.gitlab-ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ stages:
1414
- pip install -r test-requirements.txt
1515
- pytest --cov=cyperf
1616

17-
pytest-3.7:
18-
extends: .pytest
19-
image: python:3.7-alpine
2017
pytest-3.8:
2118
extends: .pytest
2219
image: python:3.8-alpine

jenkins/JenkinsFile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ def do_publish = params.publish_pypi
3838
@NonCPS
3939
boolean setDisplayVersion(publish) {
4040
branch_sanitized = branch.replaceAll('-', '.').replaceAll('_', '.').replaceAll('%2F', '-')
41-
def matcher = Pattern.compile("^release%2F([0-9]+)\\.([0-9]+)\$").matcher(branch)
41+
def matcher = Pattern.compile("^release%2F([0-9]+)\\.([0-9]+)\\.([0-9]+)\$").matcher(branch)
4242
if (matcher.matches()) {
4343
build_number = "dev${env.BUILD_NUMBER}+${branch_sanitized}"
4444
if (publish) {
4545
build_number = "${env.BUILD_NUMBER}"
4646
}
47-
env.PIP_VERSION = "${matcher.group(1).toString()}.${matcher.group(2).toString()}.${build_number}"
47+
env.PIP_VERSION = "${matcher.group(1).toString()}.${matcher.group(2).toString()}.${build_number}"
4848
env.DOCKER_VERSION = env.PIP_VERSION.replaceAll('\\+', '-')
4949
} else if (branch.startsWith("release%2F")) {
50-
throw new Exception("Unexpected release branch format ${branch}, expected 'release%2fNUMBER.NUMBER'")
50+
throw new Exception("Unexpected release branch format ${branch}, expected 'release%2fNUMBER.NUMBER.NUMBER'")
5151
} else {
5252
env.PIP_VERSION = "0.0.dev${env.BUILD_NUMBER}+${branch_sanitized}"
5353
env.DOCKER_VERSION = env.PIP_VERSION.replaceAll('\\+', '-')

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ keywords = ["OpenAPI", "OpenAPI-Generator", "CyPerf Application API"]
1010
include = ["cyperf/py.typed"]
1111

1212
[tool.poetry.dependencies]
13-
python = "^3.7"
13+
python = "^3.8"
1414

1515
urllib3 = ">= 1.25.3"
1616
python-dateutil = ">=2.8.2"

0 commit comments

Comments
 (0)