From f869464e659cf6bc0a75b01726710136a67fa039 Mon Sep 17 00:00:00 2001 From: Eldad Uzman Date: Sun, 9 Apr 2023 15:29:23 +0300 Subject: [PATCH 1/3] udpate Meter DSL version --- README.md | 2 +- java-dependencies/pom.xml | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7f5770b..95aa591 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Simple JMeter performance tests API for python ![](https://raw.githubusercontent.com/eldaduzman/pymeter/main/docs/badges/pylint.svg) ![](https://raw.githubusercontent.com/eldaduzman/pymeter/main/docs/badges/mutscore.svg) [![Generic badge](https://img.shields.io/badge/python-3.8|3.9|3.10|3.11-blue.svg)](https://python.org/) -[![Generic badge](https://img.shields.io/badge/JMeterDsl-1.4-blue.svg)](https://abstracta.github.io/jmeter-java-dsl/) +[![Generic badge](https://img.shields.io/badge/JMeterDsl-1.9-blue.svg)](https://abstracta.github.io/jmeter-java-dsl/) [![Documentation Status](https://readthedocs.org/projects/pymeter/badge/?version=latest)](https://pymeter.readthedocs.io/en/latest/?badge=latest) diff --git a/java-dependencies/pom.xml b/java-dependencies/pom.xml index d50ef8d..f46e4a5 100644 --- a/java-dependencies/pom.xml +++ b/java-dependencies/pom.xml @@ -27,7 +27,7 @@ us.abstracta.jmeter jmeter-java-dsl - 1.6 + 1.9 test diff --git a/pyproject.toml b/pyproject.toml index d37bf2c..bd3b405 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pymeter" -version = "1.1.0" +version = "1.2.0" description = "Simple JMeter performance tests API for python" authors = ["Eldad Uzman "] license = "Apache License 2.0" From 5773682c0a2a2afbf9319e5fe1f34969812dd44d Mon Sep 17 00:00:00 2001 From: Eldad Uzman Date: Sun, 9 Apr 2023 15:32:59 +0300 Subject: [PATCH 2/3] upgrade poetry core --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bd3b405..8d6b8d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,6 +37,6 @@ sphinx-tabs = "^3.4.1" parameterized = "^0.8.1" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core>=1.2.0"] build-backend = "poetry.core.masonry.api" From 058fc8180c1efda94a81c703aa61c9d2ca616f81 Mon Sep 17 00:00:00 2001 From: Eldad Uzman Date: Mon, 10 Apr 2023 07:13:18 +0300 Subject: [PATCH 3/3] update poetry in gh action --- .github/workflows/build.yaml | 2 +- .github/workflows/publish-pypi.yaml | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e066711..9d8c01e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,7 +27,7 @@ jobs: - name: install python dependencies run: | python -m pip install --upgrade pip - pip install tox tox-gh-actions poetry + pip install tox tox-gh-actions poetry==1.2.0 - name: make jars dir run: mkdir -p src/pymeter/resources/jars - name: copy jars diff --git a/.github/workflows/publish-pypi.yaml b/.github/workflows/publish-pypi.yaml index 6ff1b27..c61f6d9 100644 --- a/.github/workflows/publish-pypi.yaml +++ b/.github/workflows/publish-pypi.yaml @@ -40,7 +40,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==1.2.0 poetry install --only-root - name: Build package run: poetry build -f sdist diff --git a/pyproject.toml b/pyproject.toml index 8d6b8d3..bd3b405 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,6 +37,6 @@ sphinx-tabs = "^3.4.1" parameterized = "^0.8.1" [build-system] -requires = ["poetry-core>=1.2.0"] +requires = ["poetry-core"] build-backend = "poetry.core.masonry.api"