diff --git a/.github/workflows/Package.yml b/.github/workflows/Package.yml index b70739c..365c4ee 100644 --- a/.github/workflows/Package.yml +++ b/.github/workflows/Package.yml @@ -49,7 +49,8 @@ jobs: Package: name: 📦 Package in Source and Wheel Format runs-on: "ubuntu-${{ inputs.ubuntu_image_version }}" - + env: + artifact: ${{ inputs.artifact }} steps: - name: ⏬ Checkout repository uses: actions/checkout@v5 diff --git a/.github/workflows/Parameters.yml b/.github/workflows/Parameters.yml index b3d6b8d..4489c74 100644 --- a/.github/workflows/Parameters.yml +++ b/.github/workflows/Parameters.yml @@ -251,7 +251,7 @@ jobs: from typing import Iterable python_version = "${{ steps.variables.outputs.python_version }}" - name = "${{ steps.artifacts.outputs.artifact_base }}" + name = "${{ steps.variables.outputs.artifact_basename }}" systems = "${{ inputs.system_list }}".strip() versions = "${{ inputs.python_version_list }}".strip() include_list = "${{ inputs.include_list }}".strip() diff --git a/setup.py b/setup.py index 6b3865a..7dccdd0 100644 --- a/setup.py +++ b/setup.py @@ -28,21 +28,22 @@ # SPDX-License-Identifier: Apache-2.0 # # ==================================================================================================================== # # -"""Package installer for 'myPackage'.""" +"""Package installer for 'myPackage' or 'myFramework.Extension'.""" +from os import environ +from pathlib import Path from setuptools import setup -from pathlib import Path from pyTooling.Packaging import DescribePythonPackageHostedOnGitHub gitHubNamespace = "pyTooling" -packageName = "myPackage" -packageDirectory = packageName +packageName = "myPackage" if "." not in environ["artifact"] else "myFramework.Extension" +packageDirectory = packageName.replace(".", "/") packageInformationFile = Path(f"{packageDirectory}/__init__.py") setup( **DescribePythonPackageHostedOnGitHub( packageName=packageName, - description="myPackage is a test package to verify GitHub actions for Python projects.", + description=f"{packageName} is a test package to verify GitHub actions for Python projects.", gitHubNamespace=gitHubNamespace, unittestRequirementsFile=Path("tests/unit/requirements.txt"), sourceFileWithVersion=packageInformationFile,