Skip to content

Commit a0e206a

Browse files
samuelduchesnesamuelduchesne
committed
Merge branch 'release/v2.18.3' into main
2 parents f5a3cd4 + bbbe55f commit a0e206a

File tree

115 files changed

+158916
-9255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+158916
-9255
lines changed

‎.coveragerc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[run]
2-
omit = tests/*
2+
omit = tests/*

‎.github/actions/setup-poetry-env/action.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: "setup-poetry-env"
2+
description: "Composite action to setup the Python and poetry environment."
3+
4+
inputs:
5+
python-version:
6+
required: false
7+
description: "The python version to use"
8+
default: "3.11"
9+
10+
runs:
11+
using: "composite"
12+
steps:
13+
- name: Set up python
14+
uses: actions/setup-python@v4
15+
with:
16+
python-version: ${{ inputs.python-version }}
17+
18+
- name: Install Poetry
19+
uses: snok/install-poetry@v1
20+
with:
21+
virtualenvs-in-project: true
22+
23+
- name: Load cached venv
24+
id: cached-poetry-dependencies
25+
uses: actions/cache@v3
26+
with:
27+
path: .venv
28+
key: venv-${{ runner.os }}-${{ inputs.python-version }}-${{ hashFiles('poetry.lock') }}
29+
30+
- name: Install dependencies
31+
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
32+
run: poetry install --no-interaction
33+
shell: bash

‎.github/dependabot.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
version: 2
22
updates:
3-
- package-ecosystem: pip
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
time: "10:00"
8-
open-pull-requests-limit: 10
9-
# Raise pull requests for version updates
10-
# to pip against the `main` branch
11-
target-branch: "main"
12-
ignore:
13-
- dependency-name: "*"
14-
update-types: ["version-update:semver-patch"]
3+
- package-ecosystem: pip
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
time: "10:00"
8+
open-pull-requests-limit: 10
9+
# Raise pull requests for version updates
10+
# to pip against the `main` branch
11+
target-branch: "main"
12+
ignore:
13+
- dependency-name: "*"
14+
update-types: ["version-update:semver-patch"]

‎.github/release-drafter.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
name-template: 'v$RESOLVED_VERSION 🌈'
2-
tag-template: 'v$RESOLVED_VERSION'
1+
name-template: "v$RESOLVED_VERSION 🌈"
2+
tag-template: "v$RESOLVED_VERSION"
33
categories:
4-
- title: '🚀 New Features'
4+
- title: "🚀 New Features"
55
labels:
6-
- 'new feature'
7-
- 'enhancement'
8-
- title: '🐛 Bug Fixes'
6+
- "new feature"
7+
- "enhancement"
8+
- title: "🐛 Bug Fixes"
99
labels:
10-
- 'fix'
11-
- 'bugfix'
12-
- 'bug'
13-
- title: '🧰 Maintenance'
10+
- "fix"
11+
- "bugfix"
12+
- "bug"
13+
- title: "🧰 Maintenance"
1414
labels:
15-
- 'refactoring'
16-
- 'dependencies'
17-
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
15+
- "refactoring"
16+
- "dependencies"
17+
change-template: "- $TITLE @$AUTHOR (#$NUMBER)"
1818
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
1919
version-resolver:
2020
major:
2121
labels:
22-
- 'major'
22+
- "major"
2323
minor:
2424
labels:
25-
- 'minor'
26-
- 'feature'
27-
- 'new feature'
28-
- 'enhancement'
25+
- "minor"
26+
- "feature"
27+
- "new feature"
28+
- "enhancement"
2929
patch:
3030
labels:
31-
- 'fix'
32-
- 'bugfix'
33-
- 'bug'
34-
- 'patch'
35-
- 'refactoring'
31+
- "fix"
32+
- "bugfix"
33+
- "bug"
34+
- "patch"
35+
- "refactoring"
3636
default: patch
3737
template: |
3838
## Changes

‎.github/workflows/main.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: Main
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
types: [opened, synchronize, reopened, ready_for_review]
9+
10+
jobs:
11+
quality:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check out
15+
uses: actions/checkout@v3
16+
with:
17+
submodules: "true"
18+
19+
- uses: actions/cache@v3
20+
with:
21+
path: ~/.cache/pre-commit
22+
key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
23+
24+
- name: Set up the environment
25+
uses: ./.github/actions/setup-poetry-env
26+
27+
- name: Run checks
28+
run: make check
29+
30+
tox:
31+
runs-on: ubuntu-latest
32+
strategy:
33+
matrix:
34+
python-version: ["3.9", "3.10", "3.11", "3.12"]
35+
os: [ubuntu-latest] # later, add macos-latest, windows-latest
36+
energyplus-version: [9.2.0] # later, add 9.4.0
37+
include:
38+
- runs-on: ubuntu-latest
39+
compiler: gcc
40+
- energyplus-version: 9.2.0
41+
energyplus-sha: 921312fa1d
42+
energyplus-install: 9-2-0
43+
fail-fast: false
44+
steps:
45+
- name: Check out
46+
uses: actions/checkout@v3
47+
with:
48+
submodules: "true"
49+
50+
- name: Set up python
51+
uses: actions/setup-python@v4
52+
with:
53+
python-version: ${{ matrix.python-version }}
54+
55+
- name: Install Poetry
56+
uses: snok/install-poetry@v1
57+
58+
- name: Load cached venv
59+
uses: actions/cache@v3
60+
with:
61+
path: .tox
62+
key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('poetry.lock') }}
63+
64+
- name: Install tox
65+
run: |
66+
python -m pip install --upgrade pip
67+
python -m pip install tox tox-gh-actions
68+
69+
- name: Install EnergyPlus
70+
uses: Elementa-Engineering/install-energyplus@v1
71+
with:
72+
energyplus-version: ${{ matrix.energyplus-version }}
73+
energyplus-sha: ${{ matrix.energyplus-sha }}
74+
energyplus-install: ${{ matrix.energyplus-install }}
75+
76+
- name: Test with tox
77+
run: tox -- -n 2 --doctest-modules tests --cov --cov-config=pyproject.toml --cov-report=xml
78+
79+
- name: Upload coverage reports to Codecov with GitHub Action on Python 3.11
80+
uses: codecov/codecov-action@v3
81+
if: ${{ matrix.python-version == '3.11' }}

‎.github/workflows/on-release-main.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: release-main
2+
3+
on:
4+
release:
5+
types: [published]
6+
branches: [main]
7+
8+
jobs:
9+
publish:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out
13+
uses: actions/checkout@v3
14+
with:
15+
submodules: "true"
16+
17+
- name: Set up the environment
18+
uses: ./.github/actions/setup-poetry-env
19+
20+
- name: Export tag
21+
id: vars
22+
run: echo tag=${GITHUB_REF#refs/*/} >> $GITHUB_OUTPUT
23+
24+
- name: Build and publish
25+
run: |
26+
source .venv/bin/activate
27+
poetry version $RELEASE_VERSION
28+
make build-and-publish
29+
env:
30+
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
31+
RELEASE_VERSION: ${{ steps.vars.outputs.tag }}

‎.github/workflows/python-package.yml‎

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

‎.github/workflows/python-publish.yml‎

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

‎.github/workflows/validate-codecov-config.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: validate-codecov-config
2+
3+
on:
4+
pull_request:
5+
paths: [codecov.yaml]
6+
push:
7+
branches: [main]
8+
9+
jobs:
10+
validate-codecov-config:
11+
runs-on: ubuntu-22.04
12+
steps:
13+
- uses: actions/checkout@v3
14+
with:
15+
submodules: "true"
16+
- name: Validate codecov configuration
17+
run: curl -sSL --fail-with-body --data-binary @codecov.yaml https://codecov.io/validate

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,4 @@ fabric.properties
235235

236236
docs/reference/
237237

238-
.idea/
238+
.idea/

0 commit comments

Comments
 (0)