Skip to content

Commit

Permalink
Merge branch 'VOLTTRON:releases/9.0rc0' into releases/9.0rc0
Browse files Browse the repository at this point in the history
  • Loading branch information
riley206 authored Apr 2, 2024
2 parents d43946c + 28e7f07 commit 37e44b1
Show file tree
Hide file tree
Showing 22 changed files with 279 additions and 278 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pytest-auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

# setup the python environment for the operating system
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -69,7 +69,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-dbutils-backup_db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

# setup the python environment for the operating system
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -75,7 +75,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-dbutils-influxdbfuncts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
# Attempt to restore the cache from the build-dependency-cache workflow if present then
# the output value steps.check_files.outputs.files_exists will be set (see the next step for usage)
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -64,7 +64,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-dbutils-mysqlfuncts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
# Attempt to restore the cache from the build-dependency-cache workflow if present then
# the output value steps.check_files.outputs.files_exists will be set (see the next step for usage)
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -64,7 +64,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-dbutils-postgresqlfuncts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
# Attempt to restore the cache from the build-dependency-cache workflow if present then
# the output value steps.check_files.outputs.files_exists will be set (see the next step for usage)
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -64,7 +64,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-dbutils-sqlitefuncts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# Attempt to restore the cache from the build-dependency-cache workflow if present then
# the output value steps.check_files.outputs.files_exists will be set (see the next step for usage)
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -63,7 +63,7 @@ jobs:
test_output_suffix: ${{ env.OUTPUT_SUFFIX }}

- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-dbutils-timescaldbfuncts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# Attempt to restore the cache from the build-dependency-cache workflow if present then
# the output value steps.check_files.outputs.files_exists will be set (see the next step for usage)
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -63,7 +63,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-miscellaneous-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

# Setup the python environment for the operating system
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-testutils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
# Attempt to restore the cache from the build-dependency-cache workflow if present then
# the output value steps.check_files.outputs.files_exists will be set (see the next step for usage)
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -57,7 +57,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-vctl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
# Attempt to restore the cache from the build-dependency-cache workflow if present then
# the output value steps.check_files.outputs.files_exists will be set (see the next step for usage)
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -68,7 +68,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

# setup the python environment for the operating system
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -66,7 +66,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
![image](docs/source/files/VOLLTRON_Logo_Black_Horizontal_with_Tagline.png)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fcf58045b4804edf8f4d3ecde3016f76)](https://app.codacy.com/gh/VOLTTRON/volttron?utm_source=github.com&utm_medium=referral&utm_content=VOLTTRON/volttron&utm_campaign=Badge_Grade_Settings)

# VOLTTRON

This repository is for the current production VOLTTRON. We are working on VOLTTRON 10 (modular) which is available under
github at https://github.com/eclipse-volttron/. The modular version of VOLTTRON will help ease deployment and support
flexible deployment where in only required agents/applications can be installed, thereby simplifying setup and upgrade
steps for the end user. The VOLTTRON team are currently working on porting agents from monolithic VOLTTRON to the
modular version of VOLTTRON. To know more about modular VOLTTRON, please visit our new documentation site available
at https://eclipse-volttron.readthedocs.io/en/latest/. We would love for you to try it out and give us early
feedback. Also, until our work on modular VOLTTRON is completed, please continue cloning and using this
repository for your production systems.

VOLTTRON™ is an open source platform for distributed sensing and control. The
platform provides services for collecting and storing data from buildings and
Expand Down
4 changes: 2 additions & 2 deletions bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def update(operation, verbose=None, offline=False, optional_requirements=[], rab
# option_requirements contains wheel as first entry

# Build option_requirements separately to pass install options
build_option = '--build-option' if wheeling else '--install-option'
build_option = '--build-option' if wheeling else '--config-settings'

for requirement, options in option_requirements:
args = []
Expand Down Expand Up @@ -227,7 +227,7 @@ def main(argv=sys.argv):
sys.exit(77)

# Python3 for life!
if sys.version_info.major < 3 or sys.version_info.minor < 6:
if sys.version_info.major < 3 or sys.version_info.minor < 8:
sys.stderr.write('error: Python >= 3.8 is required\n')
sys.exit(1)

Expand Down
Loading

0 comments on commit 37e44b1

Please sign in to comment.