Skip to content

Commit

Permalink
Merge pull request #436 from carbonblack/release-1.5.0
Browse files Browse the repository at this point in the history
CBAPI-4818: Release 1.5.0 Merge to Master
  • Loading branch information
abowersox-cb authored Oct 24, 2023
2 parents c4baafb + 7dcdcfc commit cbdf4d5
Show file tree
Hide file tree
Showing 118 changed files with 14,062 additions and 4,369 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ repos:
hooks:
- id: flake8
additional_dependencies: [flake8-docstrings]
args: ["--docstring-convention", "google"]
args: [ "--docstring-convention", "google"]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
hooks:
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.8"
python: "3.11"
# You can also specify other tool versions:
# nodejs: "19"
# rust: "1.64"
Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# VMware Carbon Black Cloud Python SDK

**Latest Version:** 1.4.3
**Latest Version:** 1.5.0
<br>
**Release Date:** June 26, 2023
**Release Date:** October 24, 2023

[![Coverage Status](https://coveralls.io/repos/github/carbonblack/carbon-black-cloud-sdk-python/badge.svg?t=Id6Baf)](https://coveralls.io/github/carbonblack/carbon-black-cloud-sdk-python)
[![Codeship Status for carbonblack/carbon-black-cloud-sdk-python](https://app.codeship.com/projects/9e55a370-a772-0138-aae4-129773225755/status?branch=develop)](https://app.codeship.com/projects/402767)
Expand Down Expand Up @@ -30,7 +30,7 @@ Visit [ReadTheDocs](https://carbon-black-cloud-python-sdk.readthedocs.io/en/late

## Requirements

The Carbon Black Cloud Python SDK is design to work on Python 3.7 and above.
The Carbon Black Cloud Python SDK is design to work on Python 3.8 and above.

All requirements are installed as part of `pip install carbon-black-cloud-sdk`. If you're planning on pushing changes to the Carbon Black Cloud Python SDK, the following can be used after cloning the repo `pip install -r requirements.txt`

Expand Down Expand Up @@ -116,11 +116,17 @@ pip install sphinxcontrib-apidoc sphinx_rtd_theme sphinx-copybutton
Then, build the docs locally with the following commands:

```
sphinx-apidoc -f -o docs src/cbc_sdk
cd docs
make html
```

Note that the module rst files such as ```docs/cbc_sdk.platform.rst ``` are handcrafted to control layout.
* This command will generate new version, but it is not necessary and changes should not be added to the repository.
* All pull requests will trigger a build of the documentation which can be viewed from Read The Docs --> Builds.
```
sphinx-apidoc -f -o docs src/cbc_sdk
```

The documentation is built in `docs/_build/html`.

**N.B.:** If your documentation pages appear to generate incorrectly, check to see if you received the warning message
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.3
1.5.0
8 changes: 4 additions & 4 deletions codeship-services.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
testingpython37:
build:
dockerfile: ./docker/python3.7/Dockerfile

testingpython38:
build:
dockerfile: ./docker/python3.8/Dockerfile
Expand All @@ -20,6 +16,10 @@ testingpython311:
build:
dockerfile: ./docker/python3.11/Dockerfile

testingpython312:
build:
dockerfile: ./docker/python3.12/Dockerfile

testingrhel:
build:
dockerfile: ./docker/rhel/Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions codeship-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
- name: Tests
type: parallel
steps:
- name: testing python 3.7
service: testingpython37
command: pytest
- name: testing python 3.8
service: testingpython38
command: bin/tests_n_reports.sh
Expand All @@ -20,6 +17,9 @@
- name: testing python 3.11
service: testingpython311
command: pytest
- name: testing python 3.12
service: testingpython312
command: pytest
- name: testing red hat
service: testingrhel
command: pytest
Expand All @@ -31,4 +31,4 @@
command: pytest
- name: testing suse
service: testingsuse
command: pytest
command: env/bin/python3 -m pytest
4 changes: 2 additions & 2 deletions docker/amazon/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from amazonlinux:latest
MAINTAINER [email protected]
FROM amazonlinux:latest
LABEL org.opencontainers.image.authors="[email protected]"

COPY . /app
WORKDIR /app
Expand Down
4 changes: 2 additions & 2 deletions docker/python3.10/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from python:3.10
MAINTAINER [email protected]
FROM python:3.10
LABEL org.opencontainers.image.authors="[email protected]"

COPY . /app
WORKDIR /app
Expand Down
4 changes: 2 additions & 2 deletions docker/python3.11/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from python:3.11
MAINTAINER [email protected]
FROM python:3.11
LABEL org.opencontainers.image.authors="[email protected]"

COPY . /app
WORKDIR /app
Expand Down
7 changes: 7 additions & 0 deletions docker/python3.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM python:3.12
LABEL org.opencontainers.image.authors="[email protected]"

COPY . /app
WORKDIR /app

RUN pip3 install -r requirements.txt
7 changes: 0 additions & 7 deletions docker/python3.7/Dockerfile

This file was deleted.

4 changes: 2 additions & 2 deletions docker/python3.8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from python:3.8
MAINTAINER [email protected]
FROM python:3.8
LABEL org.opencontainers.image.authors="[email protected]"

COPY . /app
WORKDIR /app
Expand Down
4 changes: 2 additions & 2 deletions docker/python3.9/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from python:3.9
MAINTAINER [email protected]
FROM python:3.9
LABEL org.opencontainers.image.authors="[email protected]"

COPY . /app
WORKDIR /app
Expand Down
4 changes: 2 additions & 2 deletions docker/rhel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from registry.access.redhat.com/ubi8/ubi:latest
MAINTAINER [email protected]
FROM registry.access.redhat.com/ubi8/ubi:latest
LABEL org.opencontainers.image.authors="[email protected]"

COPY . /app
WORKDIR /app
Expand Down
12 changes: 8 additions & 4 deletions docker/suse/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
from opensuse/tumbleweed
MAINTAINER [email protected]
FROM opensuse/tumbleweed
LABEL org.opencontainers.image.authors="[email protected]"

COPY . /app
WORKDIR /app

RUN zypper --non-interactive install python3-devel
RUN zypper --non-interactive install python3-pip
RUN zypper --non-interactive install gcc
RUN pip3 install -r requirements.txt
RUN pip3 install .

RUN python3 -m venv env
RUN source env/bin/activate

RUN env/bin/pip3 install --break-system-packages -r requirements.txt
RUN env/bin/pip3 install --break-system-packages .
4 changes: 2 additions & 2 deletions docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from ubuntu:20.04
MAINTAINER [email protected]
FROM ubuntu:20.04
LABEL org.opencontainers.image.authors="[email protected]"

COPY . /app
WORKDIR /app
Expand Down
Binary file modified docs/_static/cbc_platform_notification_edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit cbdf4d5

Please sign in to comment.