Skip to content

Commit f9119d4

Browse files
committed
fix(build): removed artefacts associtated with non-poetry build
Tidied up project to remove items associated with non-Poetry build process. Also aligned a few references in README to new home of this project under CycloneDX. Signed-off-by: Paul Horton <[email protected]>
1 parent 245d809 commit f9119d4

File tree

10 files changed

+44
-86
lines changed

10 files changed

+44
-86
lines changed

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,4 @@ venv/*
1818

1919
# Exlude IDE related files
2020
.idea/*
21-
.vscode/*
22-
23-
# ci config for local ci build
24-
/.circleci/local-config.yml
21+
.vscode/*

MAINFEST.in

Lines changed: 0 additions & 3 deletions
This file was deleted.

README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Python Library for generating CycloneDX
22

3-
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/sonatype-nexus-community/cyclonedx-python-lib/Python%20CI)
3+
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/CycloneDX/cyclonedx-python-lib/Python%20CI)
44
![Python Version Support](https://img.shields.io/badge/python-3.6+-blue)
55
![PyPI Version](https://img.shields.io/pypi/v/cyclonedx-python-lib?label=PyPI&logo=pypi)
6-
[![GitHub license](https://img.shields.io/github/license/sonatype-nexus-community/cyclonedx-python-lib)](https://github.com/sonatype-nexus-community/cyclonedx-python-lib/blob/main/LICENSE)
7-
[![GitHub issues](https://img.shields.io/github/issues/sonatype-nexus-community/cyclonedx-python-lib)](https://github.com/sonatype-nexus-community/cyclonedx-python-lib/issues)
8-
[![GitHub forks](https://img.shields.io/github/forks/sonatype-nexus-community/cyclonedx-python-lib)](https://github.com/sonatype-nexus-community/cyclonedx-python-lib/network)
9-
[![GitHub stars](https://img.shields.io/github/stars/sonatype-nexus-community/cyclonedx-python-lib)](https://github.com/sonatype-nexus-community/cyclonedx-python-lib/stargazers)
6+
[![GitHub license](https://img.shields.io/github/license/CycloneDX/cyclonedx-python-lib)](https://github.com/CycloneDX/cyclonedx-python-lib/blob/main/LICENSE)
7+
[![GitHub issues](https://img.shields.io/github/issues/CycloneDX/cyclonedx-python-lib)](https://github.com/sCycloneDX/cyclonedx-python-lib/issues)
8+
[![GitHub forks](https://img.shields.io/github/forks/CycloneDX/cyclonedx-python-lib)](https://github.com/CycloneDX/cyclonedx-python-lib/network)
9+
[![GitHub stars](https://img.shields.io/github/stars/CycloneDX/cyclonedx-python-lib)](https://github.com/CycloneDX/cyclonedx-python-lib/stargazers)
1010

1111
----
1212

@@ -175,6 +175,10 @@ _Note: We refer throughout using XPath, but the same is true for both XML and JS
175175
We endeavour to support all functionality for all [current actively supported Python versions](https://www.python.org/downloads/).
176176
However, some features may not be possible/present in older Python versions due to their lack of support.
177177

178+
## Changelog
179+
180+
See our [CHANGELOG](./CHANGELOG.md).
181+
178182
## Copyright & License
179183
CycloneDX Python Lib is Copyright (c) OWASP Foundation. All Rights Reserved.
180184

VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

pyproject.toml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "cyclonedx-python-lib"
33
version = "0.0.10"
44
description = "A library for producing CycloneDX SBOM (Software Bill of Materials) files."
55
authors = ["Paul Horton <[email protected]>"]
6+
maintainers = ["Paul Horton <[email protected]>"]
67
license = "Apache-2.0"
78
readme = "README.md"
89
homepage = "https://github.com/CycloneDX/cyclonedx-python-lib"
@@ -13,6 +14,27 @@ packages = [
1314
include = [
1415
"LICENSE"
1516
]
17+
classifiers = [
18+
'Development Status :: 5 - Production/Stable',
19+
'Intended Audience :: Developers',
20+
'Intended Audience :: Information Technology',
21+
'Intended Audience :: Legal Industry',
22+
'Intended Audience :: System Administrators',
23+
'Topic :: Security',
24+
'Topic :: Software Development',
25+
'Topic :: System :: Software Distribution',
26+
'License :: OSI Approved :: Apache Software License',
27+
'Programming Language :: Python :: 3.6',
28+
'Programming Language :: Python :: 3.7',
29+
'Programming Language :: Python :: 3.8',
30+
'Programming Language :: Python :: 3.9'
31+
]
32+
keywords = [
33+
"BOM", "SBOM", "SCA", "OWASP"
34+
]
35+
36+
[tool.poetry.urls]
37+
"Bug Tracker" = "https://github.com/CycloneDX/cyclonedx-python-lib/issues"
1638

1739
[tool.poetry.dependencies]
1840
python = "^3.6"

requirements-test.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

requirements.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

setup.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

setup.py

Lines changed: 0 additions & 43 deletions
This file was deleted.

tox.ini

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
[tox]
2-
minversion=3.9.0
2+
basepython = python3.9
33
envlist = flake8,py3.9,py3.8,py3.7,py3.6
4+
isolated_build = True
45

56
[testenv]
6-
deps =
7-
-r{toxinidir}/requirements-test.txt
8-
commands = coverage run --source=cyclonedx -m unittest discover -s tests
7+
whitelist_externals = poetry
8+
commands =
9+
pip install poetry
10+
poetry install -v
11+
poetry run coverage run --source=cyclonedx -m unittest discover -s tests
912

1013
[testenv:flake8]
11-
basepython = python3
12-
skip_install = true
13-
deps =
14-
flake8
15-
-r{toxinidir}/requirements-test.txt
16-
commands = flake8 cyclonedx/ tests/ setup.py
14+
skip_install = True
15+
commands =
16+
pip install poetry
17+
poetry install -v
18+
poetry run flake8 cyclonedx/ tests/
1719

1820
[flake8]
1921
ignore = E305

0 commit comments

Comments
 (0)