Skip to content
This repository was archived by the owner on Dec 10, 2024. It is now read-only.

Commit e35bf39

Browse files
authored
Merge pull request #71 from rapidsai/branch-0.7
Merge `branch-0.7` changes into `branch-0.8`
2 parents 37f129b + f0832d3 commit e35bf39

File tree

7 files changed

+136
-12
lines changed

7 files changed

+136
-12
lines changed

.github/workflows/build.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches:
6+
- "branch-*"
7+
tags:
8+
- "v**"
9+
- "!v**a"
10+
11+
jobs:
12+
build_and_upload:
13+
name: Build Frigate Package
14+
secrets: inherit
15+
uses: ./.github/workflows/build_conda_and_pypi.yaml
16+
with:
17+
upload: true
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
on:
2+
workflow_call:
3+
inputs:
4+
upload:
5+
required: true
6+
type: boolean
7+
8+
defaults:
9+
run:
10+
shell: bash
11+
12+
jobs:
13+
conda-build:
14+
runs-on: ubuntu-latest
15+
container:
16+
image: condaforge/mambaforge
17+
steps:
18+
- name: Checkout code
19+
uses: actions/checkout@v3
20+
with:
21+
fetch-depth: 0
22+
- name: Install mambabuild
23+
run: mamba install -c conda-forge boa
24+
- name: Build Frigate package
25+
run: conda mambabuild conda/recipes/frigate --output-folder /tmp/frigate-bld
26+
- name: Upload to Anaconda
27+
if: inputs.upload == true
28+
run: |
29+
mamba install -c conda-forge anaconda-client
30+
RAPIDS_CONDA_TOKEN=${{ secrets.CONDA_RAPIDSAI_NIGHTLY_TOKEN }}
31+
if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
32+
RAPIDS_CONDA_TOKEN=${{ secrets.CONDA_RAPIDSAI_TOKEN }}
33+
fi
34+
anaconda -t "${RAPIDS_CONDA_TOKEN}" upload --skip-existing --no-progress /tmp/frigate-bld/noarch/*.tar.bz2
35+
wheel-build:
36+
runs-on: ubuntu-latest
37+
steps:
38+
- name: Checkout code
39+
uses: actions/checkout@v3
40+
with:
41+
fetch-depth: 0
42+
- name: Set up Python
43+
uses: actions/setup-python@v4
44+
with:
45+
python-version: "3.10"
46+
- name: Install dependencies
47+
run: |
48+
python -m pip install --upgrade pip
49+
pip install wheel setuptools twine
50+
- name: Build package
51+
run: python setup.py sdist bdist_wheel
52+
- name: Upload to PyPI
53+
if: inputs.upload == true
54+
uses: pypa/gh-action-pypi-publish@release/v1
55+
with:
56+
password: ${{ secrets.RAPIDSAI_PYPI_TOKEN }}

.github/workflows/pr.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: pr
2+
3+
on:
4+
pull_request:
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.ref }}
8+
cancel-in-progress: true
9+
10+
jobs:
11+
check-style:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v3
16+
with:
17+
ref: ${{ github.event.pull_request.head.sha }}
18+
fetch-depth: 0
19+
- name: Install pre-commit
20+
run: $CONDA/bin/conda install -c conda-forge pre-commit
21+
- name: Run check style
22+
run: $CONDA/bin/pre-commit run --hook-stage manual --all-files --show-diff-on-failure
23+
build:
24+
needs: check-style
25+
name: Build Frigate Package
26+
uses: ./.github/workflows/build_conda_and_pypi.yaml
27+
with:
28+
upload: false
29+
pr-builder:
30+
needs:
31+
- check-style
32+
- build
33+
uses: rapidsai/shared-action-workflows/.github/workflows/[email protected]

.pre-commit-config.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Copyright (c) 2023, NVIDIA CORPORATION.
2+
3+
repos:
4+
- repo: https://github.com/PyCQA/flake8
5+
rev: 6.0.0
6+
hooks:
7+
- id: flake8
8+
args: ["--exclude=src,style,test"]
9+
files: frigate/.*$
10+
default_language_version:
11+
python: python3

ci/cpu/build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ python setup.py sdist bdist_wheel
6262
################################################################################
6363
# UPLOAD - Packages
6464
################################################################################
65+
# Commenting the lines below to prevent uploading packages via jenkins CI,
66+
# and rely on GH actions instead
6567

66-
gpuci_logger "Upload packages"
67-
source ci/cpu/upload.sh
68+
# gpuci_logger "Upload packages"
69+
# source ci/cpu/upload.sh

frigate/sphinx/ext.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class FrigateDirective(rst.Directive):
1818

1919
def run(self):
2020
chart_path = os.path.join(
21-
os.getcwd(), # TODO Need to find a better way to get the root of the docs
21+
self.state.document.settings.env.srcdir,
2222
self.arguments[0],
2323
)
2424
if self.options.get('output_format') is None:

frigate/templates/rst.jinja2

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,20 @@ Configuration
2222

2323
The following table lists the configurable parameters of the {{ name | capitalize }} chart and their default values.
2424

25-
================================================== ==================================================================================================== ==================================================
26-
Parameter Description Default
27-
================================================== ==================================================================================================== ==================================================
28-
{% for (param, comment, default) in values -%}
29-
{% set param = '``' + param + '``' -%}
30-
{% set default = '``%s``' | format(default) -%}
31-
{{ "%-50s" | format(param) }} {{ "%-100s" | format(comment) }} {{ "%-50s" | format(default) }}
32-
{% endfor -%}
33-
================================================== ==================================================================================================== ==================================================
25+
.. list-table::
26+
:header-rows: 1
27+
:stub-columns: 1
28+
29+
* - Parameter
30+
- Description
31+
- Default
32+
{% for (param, comment, default) in values %}
33+
{% set param = '``' + param + '``' %}
34+
{% set default = '``%s``' | format(default) %}
35+
* - {{ "%-50s" | format(param) }}
36+
- {{ "%-100s" | format(comment) }}
37+
- {{ "%-50s" | format(default) }}
38+
{% endfor %}
3439
{% endblock -%}
3540

3641
{% block footnotes -%}

0 commit comments

Comments
 (0)