diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ce3008e4..6e4dffe0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -236,6 +236,8 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install build + - name: Copy LICENSE into build directory + run: cp ../LICENSE . - name: Create source and wheel dist run: | python -m build @@ -339,6 +341,8 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install build + - name: Copy LICENSE into build directory + run: cp ../LICENSE . - name: Create source and wheel dist run: | python -m build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36c0a04b..38aeffce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,8 @@ jobs: run: | python -m pip install --upgrade pip pip install build + - name: Copy LICENSE into build directory + run: cp ../LICENSE . - name: Create source and wheel dist # (2024-12-11, s-heppner) # The PyPI Action expects the dist files in a toplevel `/dist` directory, @@ -54,6 +56,8 @@ jobs: run: | python -m pip install --upgrade pip pip install build + - name: Copy LICENSE into build directory + run: cp ../LICENSE . - name: Create source and wheel dist # (2024-12-11, s-heppner) # The PyPI Action expects the dist files in a toplevel `/dist` directory, diff --git a/compliance_tool/LICENSE b/compliance_tool/LICENSE deleted file mode 100644 index ead7d5c4..00000000 --- a/compliance_tool/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2024 IAT, RWTH Aachen University - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/compliance_tool/pyproject.toml b/compliance_tool/pyproject.toml index a26b85a5..35afda8d 100644 --- a/compliance_tool/pyproject.toml +++ b/compliance_tool/pyproject.toml @@ -27,10 +27,10 @@ authors = [ { name = "The AAS Compliance Tool authors", email = "admins@iat.rwth-aachen.de" } ] readme = "README.md" -license = { file = "LICENSE" } +license = "MIT" +license-files = ["LICENSE"] classifiers = [ "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Development Status :: 5 - Production/Stable" ] diff --git a/sdk/pyproject.toml b/sdk/pyproject.toml index ba010aa4..611bed25 100644 --- a/sdk/pyproject.toml +++ b/sdk/pyproject.toml @@ -27,10 +27,10 @@ authors = [ { name = "The Eclipse BaSyx Authors", email = "admins@iat.rwth-aachen.de" } ] readme = "README.md" -license = { file = "LICENSE" } +license = "MIT" +license-files = ["LICENSE"] classifiers = [ "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Development Status :: 5 - Production/Stable" ] diff --git a/server/docker/discovery/Dockerfile b/server/docker/discovery/Dockerfile index 66c9618e..43ab3314 100644 --- a/server/docker/discovery/Dockerfile +++ b/server/docker/discovery/Dockerfile @@ -15,6 +15,7 @@ RUN apk update && \ pip install uwsgi && \ apk del git bash +COPY ./LICENSE /LICENSE COPY ./sdk /sdk COPY ./server/app /server/app COPY ./server/pyproject.toml /server/pyproject.toml diff --git a/server/docker/registry/Dockerfile b/server/docker/registry/Dockerfile index df367f2d..6e6f13a1 100644 --- a/server/docker/registry/Dockerfile +++ b/server/docker/registry/Dockerfile @@ -15,7 +15,7 @@ RUN apk update && \ pip install uwsgi && \ apk del git bash - +COPY ./LICENSE /LICENSE COPY ./sdk /sdk COPY ./server/app /server/app COPY ./server/pyproject.toml /server/pyproject.toml diff --git a/server/docker/repository/Dockerfile b/server/docker/repository/Dockerfile index bc58e3e6..82cd80e2 100644 --- a/server/docker/repository/Dockerfile +++ b/server/docker/repository/Dockerfile @@ -17,6 +17,7 @@ RUN apk update && \ # Copy only the files we need to run the container # The argumentation for this is to keep the containers as slim as possible. +COPY ./LICENSE /LICENSE COPY ./sdk /sdk COPY ./server/app /server/app COPY ./server/pyproject.toml /server/pyproject.toml diff --git a/server/pyproject.toml b/server/pyproject.toml index e8799039..ead8092e 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -27,10 +27,10 @@ authors = [ { name = "The Eclipse BaSyx Authors", email = "admins@iat.rwth-aachen.de" } ] readme = "README.md" -license = { file = "LICENSE" } +license = "MIT" +license-files = ["LICENSE"] classifiers = [ "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Development Status :: 5 - Production/Stable" ]