Skip to content

Commit 8f6bbb2

Browse files
committed
Merge branch 'release/26.0.0' of https://bitbucket.it.keysight.com/scm/isgappsec/cyperf-api-wrapper into release/26.0.0
2 parents daa4d93 + 23f1f0a commit 8f6bbb2

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ boolean setDisplayVersion(publish) {
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")) {
5050
throw new Exception("Unexpected release branch format ${branch}, expected 'release%2fNUMBER.NUMBER.NUMBER'")

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)