Skip to content

Commit

Permalink
Merge branch 'main' of github.com:CycloneDX/cyclonedx-python-lib
Browse files Browse the repository at this point in the history
  • Loading branch information
madpah committed Jan 7, 2022
2 parents 6799e63 + 42f7952 commit d26970b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/poetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ jobs:
uses: Gr1N/setup-poetry@v7
with:
poetry-version: ${{ env.POETRY_VERSION }}
- uses: actions/cache@v2
with:
path: ~/.cache/pypoetry/virtualenvs
key: ${{ runner.os }}-${{ env.PYTHON_VERISON_DEFAULT }}-poetry${{ env.POETRY_VERSION }}-${{ hashFiles('poetry.lock') }}
- name: Install dependencies
run: poetry install --no-root
- name: Run tox
Expand Down Expand Up @@ -73,10 +69,6 @@ jobs:
uses: Gr1N/setup-poetry@v7
with:
poetry-version: ${{ env.POETRY_VERSION }}
- uses: actions/cache@v2
with:
path: ~/.cache/pypoetry/virtualenvs
key: ${{ runner.os }}-${{ matrix.python-version }}-poetry${{ env.POETRY_VERSION }}-${{ hashFiles('poetry.lock') }}
- name: Install dependencies
run: poetry install --no-root
- name: Run tox
Expand Down Expand Up @@ -127,10 +119,6 @@ jobs:
uses: Gr1N/setup-poetry@v7
with:
poetry-version: ${{ env.POETRY_VERSION }}
- uses: actions/cache@v2
with:
path: ~/.cache/pypoetry/virtualenvs
key: ${{ runner.os }}}-${{ matrix.python-version }}-poetry${{ env.POETRY_VERSION }}-${{ hashFiles('poetry.lock') }}
- name: Install dependencies
run: poetry install --no-root
- name: Ensure build successful
Expand Down
5 changes: 4 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Contributing

Feel free to open pull requests.
Pull requests are welcome.
But please read the
[CycloneDX contributing guidelines](https://github.com/CycloneDX/.github/blob/master/CONTRIBUTING.md)
first.

## Setup

Expand Down

0 comments on commit d26970b

Please sign in to comment.