Skip to content

Commit d61eecc

Browse files
author
Deploy Release Github Action
committed
Merge branch 'releases/v0.2.1rc0'
2 parents 7af21b6 + d81a07a commit d61eecc

File tree

10 files changed

+134
-272
lines changed

10 files changed

+134
-272
lines changed

.github/workflows/deploy-pre-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ env:
1414
LC_ALL: en_US.utf-8
1515
PYTHON_VERSION: '3.10'
1616
PROJECT_NAME: volttron-lib-sql-historian
17-
POETRY_VERSION: '1.2.2'
1817

1918
jobs:
2019

2120
deploy-pre-release:
21+
if: github.ref_name != 'main'
2222
runs-on: ubuntu-22.04
2323
steps:
2424
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."

.github/workflows/dispatch-to-pypi.yml

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

.github/workflows/downstream-test-response.yml

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

.github/workflows/make-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ jobs:
5656
publish-to-test-pypi: false
5757
secrets:
5858
git-token: ${{ secrets.AUTO_PROJECT_PAT }}
59-
pypi-token: ${{ secrets.PYPI_TOKEN }}
59+
pypi-token: ${{ secrets.PYPI_TOKEN }}

.github/workflows/publish-to-pypi.yml

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

.github/workflows/run-downstream-tests.yml

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

.github/workflows/run-tests.yml

Lines changed: 44 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,20 @@ name: Run Pytests
33
on:
44
push:
55
paths:
6-
- '**.py'
7-
- '**.yaml'
8-
- '**.yml'
9-
- '**.toml'
6+
- '**.py'
7+
- '**.yaml'
8+
- '**.yml'
9+
- '**.toml'
1010
pull_request:
1111
types:
12-
- opened
13-
- synchronize
14-
- reopened
12+
- opened
13+
- synchronize
14+
- reopened
1515
paths:
16-
- '**.py'
16+
- '**.py'
17+
- '**.yaml'
18+
- '**.yml'
19+
- '**.toml'
1720

1821
defaults:
1922
run:
@@ -23,74 +26,60 @@ env:
2326
LANG: en_US.utf-8
2427
LC_ALL: en_US.utf-8
2528
PYTHON_VERSION: '3.10'
26-
PROJECT_NAME: volttron-lib-base-historian
29+
PROJECT_NAME: volttron-lib-sql-historian
2730

2831
jobs:
2932

3033
run-tests:
3134
strategy:
3235
matrix:
33-
os: [ubuntu-20.04, ubuntu-22.04]
34-
python: ['3.8', '3.9', '3.10']
36+
os: [ "ubuntu-22.04" ]
37+
python: [ "3.10", "3.11" ]
3538

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

3841
steps:
39-
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
40-
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
41-
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
42+
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
43+
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
44+
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
4245

4346
#----------------------------------------------
4447
# check-out repo and set-up python
4548
#----------------------------------------------
46-
- name: Checkout code
47-
uses: actions/checkout@v3
49+
- name: Checkout code
50+
uses: actions/checkout@v3
4851

49-
- name: Set up Python ${{ matrix.python }}
50-
id: setup-python
51-
uses: actions/setup-python@v2
52-
with:
53-
python-version: ${{ matrix.python }}
52+
- name: Set up Python ${{ matrix.python }}
53+
id: setup-python
54+
uses: actions/setup-python@v2
55+
with:
56+
python-version: ${{ matrix.python }}
5457

5558
#----------------------------------------------
5659
# ----- install & configure poetry -----
5760
#----------------------------------------------
58-
- name: Install Poetry
59-
uses: snok/install-poetry@v1
60-
with:
61-
version: 1.2.2
62-
virtualenvs-create: true
63-
virtualenvs-in-project: true
64-
installer-parallel: true
61+
- name: Install Poetry
62+
uses: snok/install-poetry@v1
63+
with:
64+
virtualenvs-create: true
65+
virtualenvs-in-project: true
66+
installer-parallel: true
6567

66-
# #----------------------------------------------
67-
# # load cached venv if cache exists
68-
# #----------------------------------------------
69-
# - name: Load cached venv
70-
# id: cached-poetry-dependencies
71-
# uses: actions/[email protected]
72-
# with:
73-
# path: .venv
74-
# key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
75-
# #----------------------------------------------
76-
# # install dependencies if cache does not exist
77-
# #----------------------------------------------
78-
# - name: Install dependencies
79-
# if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
80-
# run: poetry install --no-interaction --no-root
68+
#----------------------------------------------
69+
# install your root project, and run tests.
70+
#----------------------------------------------
71+
- name: Check file existence
72+
id: check_files
73+
uses: andstor/file-existence-action@v2
74+
with:
75+
files: tests
8176

8277
#----------------------------------------------
8378
# install your root project, and run tests.
8479
#----------------------------------------------
85-
- name: Check file existence
86-
id: check_files
87-
uses: andstor/file-existence-action@v2
88-
with:
89-
files: tests
90-
91-
- name: Install library and run tests
92-
if: steps.check_files.outputs.files_exists == 'true'
93-
run: |
94-
poetry install --no-interaction
95-
poetry add --group dev pytest-github-actions-annotate-failures
96-
poetry run pytest --cov=src tests/
80+
- name: Install library and run tests
81+
if: steps.check_files.outputs.files_exists == 'true'
82+
run: |
83+
poetry install --no-interaction
84+
poetry add --group dev pytest-github-actions-annotate-failures
85+
poetry run pytest --cov=src

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[![Eclipse VOLTTRON™](https://img.shields.io/badge/Eclips%20VOLTTRON--red.svg)](https://volttron.readthedocs.io/en/latest/)
2+
![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)
3+
![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)
14
[![pypi version](https://img.shields.io/pypi/v/volttron-lib-sql-historian.svg)](https://pypi.org/project/volttron-lib-sql-historian/)
25
![Passing?](https://github.com/VOLTTRON/volttron-lib-sql-historian/actions/workflows/run-tests.yml/badge.svg)
36

@@ -8,7 +11,7 @@ installed as a VOLTTRON agent.
811

912
## Requirements
1013

11-
- Python >= 3.8
14+
- Python >= 3.10
1215

1316
## Installation
1417

0 commit comments

Comments
 (0)