Skip to content

Commit

Permalink
Merge branch 'releases/v0.2.1rc0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Deploy Release Github Action committed May 12, 2023
2 parents a80b58a + a6939d7 commit 57a8c02
Show file tree
Hide file tree
Showing 14 changed files with 522 additions and 297 deletions.
1 change: 1 addition & 0 deletions .github/workflows/deploy-pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ env:
jobs:

deploy-pre-release:
if: github.ref_name != 'main'
runs-on: ubuntu-22.04
steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
Expand Down
39 changes: 0 additions & 39 deletions .github/workflows/dispatch-to-pypi.yml

This file was deleted.

24 changes: 0 additions & 24 deletions .github/workflows/downstream-test-response.yml

This file was deleted.

116 changes: 58 additions & 58 deletions .github/workflows/make-release.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
name: Make full release

on:
workflow_dispatch:
inputs:
publish-to-test-pypi:
description: 'Publish to test pypi instead of pypi'
required: false
default: false
type: boolean
bump-rule:
description: 'Rule for computing next release version'
required: false
default: 'prerelease'
type: choice
options:
- patch
- minor
- major
- prepatch
- preminor
- premajor
- prerelease
release-version:
description: 'Version number to use(instead of computing). Should be of the format x.y.z[rcn]. Do not use hyphens.'
required: false
default: ''
type: string
merge-strategy:
description: 'Merge strategy and strategy options. Used only in case of merge conflicts'
required: false
default: ''
type: string

defaults:
run:
shell: bash

env:
LANG: en_US.utf-8
LC_ALL: en_US.utf-8
PYTHON_VERSION: '3.10'

jobs:
call-deploy-release:
permissions:
contents: write # To push a branch
pull-requests: write # To create a PR from that branch

uses: eclipse-volttron/github-tooling/.github/workflows/deploy-release.yml@main
with:
merge-strategy: ${{ inputs.merge-strategy }}
release-version: ${{ inputs.release-version }}
bump-rule: ${{ inputs.bump-rule }}
run-tests-wait: 600
publish-to-test-pypi: false
secrets:
git-token: ${{ secrets.AUTO_PROJECT_PAT }}
name: Make full release

on:
workflow_dispatch:
inputs:
publish-to-test-pypi:
description: 'Publish to test pypi instead of pypi'
required: false
default: false
type: boolean
bump-rule:
description: 'Rule for computing next release version'
required: false
default: 'prerelease'
type: choice
options:
- patch
- minor
- major
- prepatch
- preminor
- premajor
- prerelease
release-version:
description: 'Version number to use(instead of computing). Should be of the format x.y.z[rcn]. Do not use hyphens.'
required: false
default: ''
type: string
merge-strategy:
description: 'Merge strategy and strategy options. Used only in case of merge conflicts'
required: false
default: ''
type: string

defaults:
run:
shell: bash

env:
LANG: en_US.utf-8
LC_ALL: en_US.utf-8
PYTHON_VERSION: '3.10'

jobs:
call-deploy-release:
permissions:
contents: write # To push a branch
pull-requests: write # To create a PR from that branch

uses: eclipse-volttron/github-tooling/.github/workflows/deploy-release.yml@main
with:
merge-strategy: ${{ inputs.merge-strategy }}
release-version: ${{ inputs.release-version }}
bump-rule: ${{ inputs.bump-rule }}
run-tests-wait: 600
publish-to-test-pypi: false
secrets:
git-token: ${{ secrets.AUTO_PROJECT_PAT }}
pypi-token: ${{ secrets.PYPI_TOKEN }}
40 changes: 0 additions & 40 deletions .github/workflows/publish-to-pypi.yml

This file was deleted.

88 changes: 0 additions & 88 deletions .github/workflows/run-downstream-tests.yml

This file was deleted.

26 changes: 6 additions & 20 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ on:
- reopened
paths:
- '**.py'
- '**.yaml'
- '**.yml'
- '**.toml'

defaults:
run:
Expand All @@ -30,8 +33,8 @@ jobs:
run-tests:
strategy:
matrix:
os: ["ubuntu-20.04", "ubuntu-22.04"]
python: ["3.8", "3.9", "3.10"]
os: [ "ubuntu-22.04" ]
python: [ "3.10", "3.11" ]

runs-on: ${{ matrix.os }}

Expand All @@ -48,7 +51,7 @@ jobs:

- name: Set up Python ${{ matrix.python }}
id: setup-python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}

Expand All @@ -58,27 +61,10 @@ jobs:
- name: Install Poetry
uses: snok/install-poetry@v1
with:
version: 1.2.2
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true

# #----------------------------------------------
# # load cached venv if cache exists
# #----------------------------------------------
# - name: Load cached venv
# id: cached-poetry-dependencies
# uses: actions/[email protected]
# with:
# path: .venv
# key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
# #----------------------------------------------
# # install dependencies if cache does not exist
# #----------------------------------------------
# - name: Install dependencies
# if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
# run: poetry install --no-interaction --no-root

#----------------------------------------------
# install your root project, and run tests.
#----------------------------------------------
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
[![Eclipse VOLTTRON™](https://img.shields.io/badge/Eclips%20VOLTTRON--red.svg)](https://volttron.readthedocs.io/en/latest/)
![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)
![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)
[![Run Pytests](https://github.com/eclipse-volttron/volttron-lib-base-historian/actions/workflows/run-tests.yml/badge.svg)](https://github.com/eclipse-volttron/volttron-lib-base-historian/actions/workflows/run-tests.yml)
[![pypi version](https://img.shields.io/pypi/v/volttron-lib-base-historian.svg)](https://pypi.org/project/volttron-lib-base-historian/)

VOLTTRON base historian framework that provide common functions such as caching, error handling, input validation etc. This historian cannot be used as agent as is. VOLTTRON historian agents can be created by subclassing the [BaseHistorian class](https://github.com/eclipse-volttron/volttron-lib-base-historian/blob/develop/src/historian/base/base_historian.py) in this library.

## Requirements

- Python >= 3.8
- Python >= 3.10

## Installation

Expand Down
Loading

0 comments on commit 57a8c02

Please sign in to comment.