diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6eea2606..1163df56 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -31,9 +31,7 @@ jobs: name: wheels path: | packages/*/dist/*.whl - packages/*/dist/*.gz packages/*/meta_dist/*.whl - packages/*/meta_dist/*.gz upload-test: name: PyPI Upload diff --git a/CHANGELOG.md b/CHANGELOG.md index e83bd7ba..ad463819 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,9 @@ ## Changelog -### 1.0.0-dev +### 0.9.19-dev +* Fixes packaging of `bmw-lobster`. ### 0.9.18 diff --git a/lobster/version.py b/lobster/version.py index 152883b5..b3d1603a 100644 --- a/lobster/version.py +++ b/lobster/version.py @@ -17,10 +17,11 @@ # License along with this program. If not, see # . -VERSION_TUPLE = (1, 0, 0) +VERSION_TUPLE = (0, 9, 19) VERSION_SUFFIX = "dev" -LOBSTER_VERSION = ("%u.%u.%u" % VERSION_TUPLE) + \ - ("-%s" % VERSION_SUFFIX if VERSION_SUFFIX else "") +LOBSTER_VERSION = ("%u.%u.%u" % VERSION_TUPLE) + ( + "-%s" % VERSION_SUFFIX if VERSION_SUFFIX else "" +) FULL_NAME = "LOBSTER %s" % LOBSTER_VERSION diff --git a/packages/lobster-core/Makefile b/packages/lobster-core/Makefile index 15c3a7ff..324da0e6 100644 --- a/packages/lobster-core/Makefile +++ b/packages/lobster-core/Makefile @@ -6,4 +6,4 @@ package: cp -Rv $(LOBSTER_ROOT)/lobster/html lobster cp $(LOBSTER_ROOT)/lobster/tools/*.py lobster/tools cp -Rv $(LOBSTER_ROOT)/lobster/tools/core lobster/tools - @python3 -m build + @python3 -m build --wheel diff --git a/packages/lobster-metapackage/Makefile b/packages/lobster-metapackage/Makefile index 8173277b..3a89d36b 100644 --- a/packages/lobster-metapackage/Makefile +++ b/packages/lobster-metapackage/Makefile @@ -1,2 +1,2 @@ package: - @python3 -m build + @python3 -m build --wheel diff --git a/packages/lobster-monolithic/Makefile b/packages/lobster-monolithic/Makefile index 55030c70..26c9c9ff 100644 --- a/packages/lobster-monolithic/Makefile +++ b/packages/lobster-monolithic/Makefile @@ -1,5 +1,5 @@ package: rm -rf lobster dist meta_dist cp -Rv $(LOBSTER_ROOT)/lobster lobster - @python3 -m build + @python3 -m build --wheel mv dist meta_dist diff --git a/packages/lobster-tool-codebeamer/Makefile b/packages/lobster-tool-codebeamer/Makefile index a018b801..ca5e2eb3 100644 --- a/packages/lobster-tool-codebeamer/Makefile +++ b/packages/lobster-tool-codebeamer/Makefile @@ -2,4 +2,4 @@ package: rm -rf lobster mkdir -p lobster/tools cp -Rv $(LOBSTER_ROOT)/lobster/tools/codebeamer lobster/tools - @python3 -m build + @python3 -m build --wheel diff --git a/packages/lobster-tool-cpp/Makefile b/packages/lobster-tool-cpp/Makefile index 6bee7d0b..3bbd8a77 100644 --- a/packages/lobster-tool-cpp/Makefile +++ b/packages/lobster-tool-cpp/Makefile @@ -2,4 +2,4 @@ package: rm -rf lobster mkdir -p lobster/tools cp -Rv $(LOBSTER_ROOT)/lobster/tools/cpp lobster/tools - @python3 -m build + @python3 -m build --wheel diff --git a/packages/lobster-tool-cpptest/Makefile b/packages/lobster-tool-cpptest/Makefile index 29c612dc..0e44de82 100644 --- a/packages/lobster-tool-cpptest/Makefile +++ b/packages/lobster-tool-cpptest/Makefile @@ -2,4 +2,4 @@ package: rm -rf lobster mkdir -p lobster/tools cp -Rv $(LOBSTER_ROOT)/lobster/tools/cpptest lobster/tools - @python3 -m build + @python3 -m build --wheel diff --git a/packages/lobster-tool-gtest/Makefile b/packages/lobster-tool-gtest/Makefile index ce3ff551..4df97028 100644 --- a/packages/lobster-tool-gtest/Makefile +++ b/packages/lobster-tool-gtest/Makefile @@ -2,4 +2,4 @@ package: rm -rf lobster mkdir -p lobster/tools cp -Rv $(LOBSTER_ROOT)/lobster/tools/gtest lobster/tools - @python3 -m build + @python3 -m build --wheel diff --git a/packages/lobster-tool-json/Makefile b/packages/lobster-tool-json/Makefile index e3c3fd47..b21950be 100644 --- a/packages/lobster-tool-json/Makefile +++ b/packages/lobster-tool-json/Makefile @@ -2,4 +2,4 @@ package: rm -rf lobster mkdir -p lobster/tools cp -Rv $(LOBSTER_ROOT)/lobster/tools/json lobster/tools - @python3 -m build + @python3 -m build --wheel diff --git a/packages/lobster-tool-python/Makefile b/packages/lobster-tool-python/Makefile index 44038c66..d3df0fe1 100644 --- a/packages/lobster-tool-python/Makefile +++ b/packages/lobster-tool-python/Makefile @@ -2,4 +2,4 @@ package: rm -rf lobster mkdir -p lobster/tools cp -Rv $(LOBSTER_ROOT)/lobster/tools/python lobster/tools - @python3 -m build + @python3 -m build --wheel diff --git a/packages/lobster-tool-python/README.md b/packages/lobster-tool-python/README.md index addfd374..151fb15a 100644 --- a/packages/lobster-tool-python/README.md +++ b/packages/lobster-tool-python/README.md @@ -71,7 +71,7 @@ Please note that the generated output json files always use `PyTest` as framewor The resulting lobster file does not use the method names, but instead uses the class name together with an integer counter for consecutive methods. This only affects methods in a class. It does not affect functions. -For details see see [issue 89](https://github.com/bmw-software-engineering/lobster/issues/89). +For details see [issue 89](https://github.com/bmw-software-engineering/lobster/issues/89). It will be fixed with the next release. ## Copyright & License information diff --git a/packages/lobster-tool-trlc/Makefile b/packages/lobster-tool-trlc/Makefile index 1ec3d5ee..7a4401b3 100644 --- a/packages/lobster-tool-trlc/Makefile +++ b/packages/lobster-tool-trlc/Makefile @@ -2,4 +2,4 @@ package: rm -rf lobster mkdir -p lobster/tools cp -Rv $(LOBSTER_ROOT)/lobster/tools/trlc lobster/tools - @python3 -m build + @python3 -m build --wheel