Merge pull request #119 from solarwindscloud/NH-35046-adjust-platform…

…-var-usage NH-35046 No longer need PLATFORM env var for sdist installation, tests
solarwinds · Mar 8, 2023 · 125d750 · 125d750
2 parents 47b0e06 + 9de5cd4
commit 125d750
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 97 deletions.
diff --git a/.github/actions/package_solarwinds_apm_x86_64/action.yaml b/.github/actions/package_solarwinds_apm_x86_64/action.yaml
@@ -11,8 +11,6 @@ description: Package solarwinds_apm for x86_64
 runs:
   using: 'docker'
   image: quay.io/pypa/manylinux_2_28_x86_64:latest
-  env:
-    PLATFORM: x86_64
   entrypoint: 'make'
   args:
     - 'package'
diff --git a/.github/workflows/run_tox_lint_format.yaml b/.github/workflows/run_tox_lint_format.yaml
@@ -31,5 +31,3 @@ jobs:
       run: make wrapper
     - name: Run tox lint
       run: tox -e lint -- --check-only
-      env:
-        PLATFORM: x86_64
diff --git a/.github/workflows/run_tox_tests.yaml b/.github/workflows/run_tox_tests.yaml
@@ -35,5 +35,3 @@ jobs:
       run: make wrapper
     - name: Run tox
       run: tox -e py3${{ matrix.python-minor }}-${{ matrix.apm-env }}
-      env:
-        PLATFORM: x86_64
diff --git a/.github/workflows/verify_install.yaml b/.github/workflows/verify_install.yaml
@@ -46,7 +46,6 @@ jobs:
       run: |
         sudo docker run \
         --platform linux/arm64 \
-        -e PLATFORM=aarch64 \
         -e MODE=${{ github.event.inputs.install-registry }} \
         -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
         -e SW_APM_COLLECTOR_AO_PROD=${{ secrets.SW_APM_COLLECTOR_AO_PROD }} \
@@ -71,7 +70,6 @@ jobs:
       run: |
         sudo docker run \
         --platform linux/arm64 \
-        -e PLATFORM=aarch64 \
         -e MODE=${{ github.event.inputs.install-registry }} \
         -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
         -e SW_APM_COLLECTOR_AO_PROD=${{ secrets.SW_APM_COLLECTOR_AO_PROD }} \
@@ -96,7 +94,6 @@ jobs:
       run: |
         sudo docker run \
         --platform linux/arm64 \
-        -e PLATFORM=aarch64 \
         -e MODE=${{ github.event.inputs.install-registry }} \
         -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
         -e SW_APM_COLLECTOR_AO_PROD=${{ secrets.SW_APM_COLLECTOR_AO_PROD }} \
@@ -121,7 +118,6 @@ jobs:
       run: |
         sudo docker run \
         --platform linux/arm64 \
-        -e PLATFORM=aarch64 \
         -e MODE=${{ github.event.inputs.install-registry }} \
         -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
         -e SW_APM_COLLECTOR_AO_PROD=${{ secrets.SW_APM_COLLECTOR_AO_PROD }} \
@@ -146,7 +142,6 @@ jobs:
       run: |
         sudo docker run \
         --platform linux/arm64 \
-        -e PLATFORM=aarch64 \
         -e MODE=${{ github.event.inputs.install-registry }} \
         -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
         -e SW_APM_COLLECTOR_AO_PROD=${{ secrets.SW_APM_COLLECTOR_AO_PROD }} \
@@ -171,7 +166,6 @@ jobs:
       run: |
         sudo docker run \
         --platform linux/arm64 \
-        -e PLATFORM=aarch64 \
         -e MODE=${{ github.event.inputs.install-registry }} \
         -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
         -e SW_APM_COLLECTOR_AO_PROD=${{ secrets.SW_APM_COLLECTOR_AO_PROD }} \
@@ -196,7 +190,6 @@ jobs:
       run: |
         sudo docker run \
         --platform linux/arm64 \
-        -e PLATFORM=aarch64 \
         -e MODE=${{ github.event.inputs.install-registry }} \
         -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
         -e SW_APM_COLLECTOR_AO_PROD=${{ secrets.SW_APM_COLLECTOR_AO_PROD }} \
@@ -221,7 +214,6 @@ jobs:
       run: |
         sudo docker run \
         --platform linux/arm64 \
-        -e PLATFORM=aarch64 \
         -e MODE=${{ github.event.inputs.install-registry }} \
         -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
         -e SW_APM_COLLECTOR_AO_PROD=${{ secrets.SW_APM_COLLECTOR_AO_PROD }} \
@@ -246,7 +238,6 @@ jobs:
       run: |
         sudo docker run \
         --platform linux/arm64 \
-        -e PLATFORM=aarch64 \
         -e MODE=${{ github.event.inputs.install-registry }} \
         -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
         -e SW_APM_COLLECTOR_AO_PROD=${{ secrets.SW_APM_COLLECTOR_AO_PROD }} \
@@ -271,7 +262,6 @@ jobs:
       run: |
         sudo docker run \
         --platform linux/arm64 \
-        -e PLATFORM=aarch64 \
         -e MODE=${{ github.event.inputs.install-registry }} \
         -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
         -e SW_APM_COLLECTOR_AO_PROD=${{ secrets.SW_APM_COLLECTOR_AO_PROD }} \
@@ -302,7 +292,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py37_install_ubuntu1804:
@@ -317,7 +306,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py37_install_amazon2:
@@ -336,7 +324,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py37_install_alpine312:
@@ -351,7 +338,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py37_install_alpine313:
@@ -366,7 +352,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py37_install_alpine317:
@@ -381,7 +366,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   #--------------------------------------------------------------------
@@ -400,7 +384,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py38_install_ubuntu1804:
@@ -415,7 +398,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py38_install_ubuntu2004:
@@ -430,7 +412,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py38_install_alpine312:
@@ -445,7 +426,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py38_install_alpine313:
@@ -460,7 +440,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   #--------------------------------------------------------------------
@@ -479,7 +458,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py39_install_ubuntu2004:
@@ -494,7 +472,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py39_install_centos8:
@@ -509,7 +486,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py39_install_alpine312:
@@ -524,7 +500,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py39_install_alpine313:
@@ -539,7 +514,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py39_install_alpine316:
@@ -554,7 +528,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py39_install_alpine317:
@@ -569,7 +542,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py39_install_rhel8:
@@ -584,7 +556,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   #--------------------------------------------------------------------
@@ -603,7 +574,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py310_install_ubuntu2004:
@@ -618,7 +588,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py310_install_alpine313:
@@ -633,7 +602,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py310_install_alpine316:
@@ -648,7 +616,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py310_install_alpine317:
@@ -663,7 +630,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   #--------------------------------------------------------------------
@@ -682,7 +648,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py311_install_ubuntu2004:
@@ -697,7 +662,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py311_install_alpine316:
@@ -712,7 +676,6 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
 
   py311_install_alpine317:
@@ -727,5 +690,4 @@ jobs:
       run: ./_helper_run_install_tests.sh
       shell: sh
       env:
-        PLATFORM: x86_64
         MODE: ${{ github.event.inputs.install-registry }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased](https://github.com/solarwindscloud/solarwinds-apm-python/compare/rel-0.8.0...HEAD)
+### Changed
+- Fixed installation from source distribution ([#119](https://github.com/solarwindscloud/solarwinds-apm-python/pull/119))
 
 ## [0.8.0](https://github.com/solarwindscloud/solarwinds-apm-python/releases/tag/rel-0.8.0) - 2023-02-28
 

diff --git a/Makefile b/Makefile
@@ -32,11 +32,12 @@ nothing:
 # variable definitions and recipes for downloading of required header and library files
 #----------------------------------------------------------------------------------------------------------------------#
 
-# Platform for builds and install testing: x86_64 or aarch64
+# Platform for wheel tagging: x86_64 or aarch64
 platform := ${PLATFORM}
 ifeq (${platform},aarch64)
     wheel_tag := manylinux_2_28_aarch64
 else
+    platform := x86_64
     wheel_tag := manylinux_2_28_x86_64
 endif
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,8 +28,6 @@ services:
        # tox for automated tests
        python3.8 -m pip install boto3 twine tox
        /bin/bash
-    environment:
-      - PLATFORM=x86_64
 
   aarch64:
     image: quay.io/pypa/manylinux_2_28_aarch64
@@ -50,5 +48,3 @@ services:
        # tox for automated tests
        python3.8 -m pip install boto3 twine tox
        /bin/bash
-    environment:
-      - PLATFORM=aarch64