Skip to content

Commit

Permalink
Merge branch 'release/v2.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelduchesne committed May 20, 2021
2 parents 5e384a4 + 8bbc454 commit 36bdaa2
Show file tree
Hide file tree
Showing 128 changed files with 36,703 additions and 46,684 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: daily
time: "10:00"
open-pull-requests-limit: 10
# Raise pull requests for version updates
# to pip against the `develop` branch
target-branch: "develop"
46 changes: 31 additions & 15 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
template: |
## What’s New
$CHANGES
## Contributors
$CONTRIBUTORS
name-template: 'v$RESOLVED_VERSION 🌈'
tag-template: 'v$RESOLVED_VERSION'
categories:
- title: 'New Features'
- title: '🚀 New Features'
labels:
- 'feature'
- 'new feature'
- 'enhancement'
- title: 'Bug Fixes'
- title: '🐛 Bug Fixes'
labels:
- 'fix'
- 'bugfix'
- 'bug'
- title: 'Under the hood refactoring ⚙'
- title: '🧰 Maintenance'
labels:
- 'refactoring'
name-template: 'v$NEXT_PATCH_VERSION 🌈'
tag-template: 'v$NEXT_PATCH_VERSION'
- 'dependencies'
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
version-resolver:
major:
labels:
- 'major'
minor:
labels:
- 'minor'
- 'feature'
- 'new feature'
- 'enhancement'
patch:
labels:
- 'fix'
- 'bugfix'
- 'bug'
- 'patch'
- 'refactoring'
default: patch
template: |
## Changes
$CHANGES
81 changes: 81 additions & 0 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Python package

on:
push:
branches: [ master, develop ]
pull_request:
branches: [ master, develop ]

jobs:
build:

runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [ 3.7, 3.8 ]
os: [ ubuntu-latest ] # later, add macos-latest, windows-latest
energyplus-version: [ 9.2.0 ] # later, add 9.4.0
include:
- runs-on: ubuntu-latest
compiler: gcc
- energyplus-version: 9.2.0
energyplus-sha: 921312fa1d
energyplus-install: 9-2-0
# later, add 9.4.0
# - energyplus-version: 9.4.0
# energyplus-sha: 998c4b761e
# energyplus-install: 9-4-0
steps:
- name: Display the OS
run: echo $OSTYPE
shell: bash
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install EnergyPlus
env:
ENERGYPLUS_VERSION: ${{ matrix.energyplus-version }}
ENERGYPLUS_SHA: ${{ matrix.energyplus-sha }}
ENERGYPLUS_INSTALL_VERSION: ${{ matrix.energyplus-install }}
run: bash ./install_energyplus.sh
- name: Get pip cache dir
id: pip-cache
run: |
echo "::set-output name=dir::$(pip cache dir)"
- name: pip cache
id: cache
uses: actions/cache@v2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt', '**/requirements-dev.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Install dependencies
if: success()
run: |
python -m pip install --upgrade pip
python -m pip install flake8 pytest-cov pytest-xdist[psutil]
python -m pip install -r requirements.txt -r requirements-dev.txt
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
pytest -n auto --cov=archetypal --cov-report=xml tests/
- name: Upload coverage to Codecov
if: ${{ matrix.python-version == 3.7 }}
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./coverage.xml
fail_ci_if_error: false
verbose: true

31 changes: 31 additions & 0 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflow will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

name: Upload Python Package

on:
release:
types: [created, edited]

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: Build and publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
Loading

0 comments on commit 36bdaa2

Please sign in to comment.