Merge remote-tracking branch 'cyclonedx/main'

Nitro · Mar 28, 2024 · 3ac0055 · 3ac0055
2 parents 55a3c4f + 6779a05
commit 3ac0055
Show file tree

Hide file tree

Showing 7 changed files with 393 additions and 180 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,47 +25,54 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
+  PYTHON_VERSION_DEFAULT: "3.9"
+  POETRY_VERSION: "1.1.15"
   REPORTS_DIR: CI_reports
 
 jobs:
   coding-standards:
+    # disabled, unless there are proper rules and configs for flake8 and mypy
+    if: false
     name: Linting & Coding Standards
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         # see https://github.com/actions/checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Python Environment
         # see https://github.com/actions/setup-python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
           architecture: 'x64'
       - name: Install poetry
         # see https://github.com/marketplace/actions/setup-poetry
-        uses: Gr1N/setup-poetry@v7
-        with:
-          poetry-version: 1.1.8
-      - uses: actions/cache@v2
+        uses: Gr1N/setup-poetry@v8
         with:
-          path: ~/.cache/pypoetry/virtualenvs
-          key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}
+          poetry-version: ${{ env.POETRY_VERSION }}
       - name: Install dependencies
-        run: poetry install
+        run: poetry install --no-root
 #      - name: Run tox
 #        run: poetry run tox -e flake8
 
   build-and-test:
-    name: Tests for Python ${{ matrix.python-version }} on ${{ matrix.os }}
+    name: Tests py${{ matrix.python-version }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
       REPORTS_ARTIFACT: tests-reports
     timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
         python-version: 
           - '3.11'  # highest supported
           - '3.10'
@@ -87,26 +94,22 @@ jobs:
     steps:
       - name: Checkout
         # see https://github.com/actions/checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Create reports directory
         run: mkdir ${{ env.REPORTS_DIR }}
       - name: Setup Python Environment
         # see https://github.com/actions/setup-python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
       - name: Install poetry
         # see https://github.com/marketplace/actions/setup-poetry
-        uses: Gr1N/setup-poetry@v7
-        with:
-          poetry-version: 1.1.8
-      - uses: actions/cache@v2
+        uses: Gr1N/setup-poetry@v8
         with:
-          path: ~/.cache/pypoetry/virtualenvs
-          key: ${{ runner.os }}-${{ matrix.python-version }}-poetry-${{ hashFiles('poetry.lock') }}
+          poetry-version: ${{ env.POETRY_VERSION }}
       - name: Install dependencies
-        run: poetry install
+        run: poetry install --no-root
       - name: Ensure build successful
         run: poetry build
 #      - name: Run tox

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,30 +22,50 @@ name: Release
 on:
   workflow_dispatch:
 
+concurrency:
+  group: release
+  cancel-in-progress: false
+
+
+env:
+  PYTHON_VERSION_DEFAULT: "3.9"
+  POETRY_VERSION: "1.1.15"
+
 jobs:
   release:
     # https://github.community/t/how-do-i-specify-job-dependency-running-in-another-workflow/16482
     # limit this to being run on regular commits, not the commits that semantic-release will create
     if: github.ref == 'refs/heads/main' && !contains(github.event.head_commit.message, 'chore(release):')
     runs-on: ubuntu-latest
-    concurrency: release
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v2
+      - name: Setup python
+        # see https://github.com/actions/setup-python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
+          architecture: 'x64'
+      - name: Install and configure Poetry
+        # See https://github.com/marketplace/actions/install-poetry-action
+        uses: snok/install-poetry@v1
         with:
-          python-version: 3.9
+          version: ${{ env.POETRY_VERSION }}
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          installer-parallel: true
       - name: Install dependencies
-        run: |
-          python -m pip install poetry --upgrade pip
-          poetry config virtualenvs.create false
-          poetry install
+        run: poetry install --no-root
       - name: View poetry version
         run: poetry --version
       - name: Python Semantic Release
-        uses: relekang/python-semantic-release@master
+        # see https://python-semantic-release.readthedocs.io/en/latest/automatic-releases/github-actions.html
+        # see https://github.com/python-semantic-release/python-semantic-release
+        uses: python-semantic-release/[email protected]
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          pypi_token: ${{ secrets.PYPI_TOKEN }}
+          repository_username: __token__
+          repository_password: ${{ secrets.PYPI_TOKEN }}
+          pypi_token:          ${{ secrets.PYPI_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,38 @@
 
 <!--next-version-placeholder-->
 
+## v0.4.1 (2023-09-27)
+
+### Fix
+
+* Retirement of this project ([`816542b`](https://github.com/CycloneDX/cyclonedx-conan/commit/816542bb14c3a5341dad978946ad120b20db66ce))
+
+### Documentation
+
+* Emphasize conan v1 support ([`88a1e5f`](https://github.com/CycloneDX/cyclonedx-conan/commit/88a1e5fd1c2efdc935fcb0ff417c0e0fd5f6fd79))
+* Hint to conan2 support ([`38a1987`](https://github.com/CycloneDX/cyclonedx-conan/commit/38a1987ca9f19faf7d0476ad4b9af591ed1dc243))
+
+## v0.4.0 (2023-08-02)
+
+### Feature
+
+* Add output file path argument ([#83](https://github.com/CycloneDX/cyclonedx-conan/issues/83)) ([`a816105`](https://github.com/CycloneDX/cyclonedx-conan/commit/a816105531b8c3457c3fa9b8dc3456b9f2e3471d))
+
+### Documentation
+
+* Adjust changelog ([#96](https://github.com/CycloneDX/cyclonedx-conan/issues/96)) ([`8a689f6`](https://github.com/CycloneDX/cyclonedx-conan/commit/8a689f66e8f8b0cce89e9ffdd67fa1c6a7d06bcf))
+* Update shields in readme ([#93](https://github.com/CycloneDX/cyclonedx-conan/issues/93)) ([`77ffe60`](https://github.com/CycloneDX/cyclonedx-conan/commit/77ffe60802e62d94bd321a4faaab6377effac248))
+
+## v0.3.0 (2023-08-01)
+### Feature
+* Allow `conan >=1.41.0, <2` ([#45](https://github.com/CycloneDX/cyclonedx-conan/issues/45)) ([`08ff414`](https://github.com/CycloneDX/cyclonedx-conan/commit/08ff4142e765ecd4c84c49fd7c38eeb9f6095c62))
+* Add an option to exclude development dependencies from the SBOM ([#86](https://github.com/CycloneDX/cyclonedx-conan/issues/86)) ([`c66421f`](https://github.com/CycloneDX/cyclonedx-conan/commit/c66421fa75b9389dfea9bf852dbec86b3de26204))
+### Documentation
+* update help page in README ([#92](https://github.com/CycloneDX/cyclonedx-conan/issues/92)) ([`c73e17d`](https://github.com/CycloneDX/cyclonedx-conan/commit/c73e17db43f8270663f251443e7511812735fb1d))
+* shellSession for help page in README ([`e05cdbb`](https://github.com/CycloneDX/cyclonedx-conan/commit/e05cdbbd57735716a7bb9e8cfcd7d138a1dc532b))
+* fix shields ([#67](https://github.com/CycloneDX/cyclonedx-conan/issues/67)) ([`bd89dce`](https://github.com/CycloneDX/cyclonedx-conan/commit/bd89dce3021328a5f18ba91c27919349f8bb7ea7))
+* fix shields ([#64](https://github.com/CycloneDX/cyclonedx-conan/issues/64)) ([`58b5ff4`](https://github.com/CycloneDX/cyclonedx-conan/commit/58b5ff42fdb058402339b59774450f864f54c1ef))
+
 ## v0.2.0 (2021-10-14)
 ### Feature
 * Initial release ([`1a14680`](https://github.com/CycloneDX/cyclonedx-conan/commit/1a14680171bb19bdc312d0e30277a54a713bdc17))