Skip to content

Commit

Permalink
Merge pull request #401 from NextCenturyCorporation/development
Browse files Browse the repository at this point in the history
Releasing 0.4.4
  • Loading branch information
ThomasSchellenbergNextCentury authored Sep 7, 2021
2 parents 860d13b + d563312 commit a716aeb
Show file tree
Hide file tree
Showing 326 changed files with 20,696 additions and 6,530 deletions.
47 changes: 47 additions & 0 deletions .github/master-merge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Pre-release to latest

on:
push:
branches:
master

jobs:
build:
strategy:
matrix:
# we are building a pure python wheel so it should work on any platform
os: [ubuntu-latest]
python-versions: [3.6]
runs-on: ${{ matrix.os }}
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Install Python 3
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-versions }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install -r requirements.txt
- name: Run unit tests
run: python -m unittest
- name: Flake8
run: flake8
- name: Autopep8
run: autopep8 --in-place --aggressive --recursive machine_common_sense
- name: create wheel file
run: python setup.py bdist_wheel sdist clean --all
- name: download unity packages
run: echo download ${GITHUB_REF##*/} and save in dist
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
#Can set an automatic release tag or let it use the initial tag. If latter, need to conform to semantic versioning.
# Note, so far, we don't conform to semantic versioning.
#alternatively, we could always tag as latest
automatic_release_tag: latest
prerelease: true
title: "Latest Pre-Release"
files: |
dist/*
34 changes: 34 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Mac and Ubuntu Python 3.6 Unit Tests

on:
push:
branches-ignore:
- development
- master
- gh-pages

jobs:
build:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Install Python 3
uses: actions/setup-python@v2
with:
python-version: 3.6
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install -r requirements.txt
- name: Run unit tests
run: python -m unittest
- name: Run isort
uses: jamescurtin/isort-action@master
- name: Flake8
run: flake8
- name: Autopep8
run: autopep8 --in-place --aggressive --recursive machine_common_sense
31 changes: 31 additions & 0 deletions .github/workflows/development-merge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Mac and Ubuntu Python 3.6, 3.7 and 3.8 Unit Tests

on:
push:
branches:
development

jobs:
build:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-versions: [3.6, 3.7, 3.8]
runs-on: ${{ matrix.os }}
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Install Python 3
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-versions }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install -r requirements.txt
- name: Run unit tests
run: python -m unittest
- name: Flake8
run: flake8
- name: Autopep8
run: autopep8 --in-place --aggressive --recursive machine_common_sense
51 changes: 51 additions & 0 deletions .github/workflows/docs-publish-pypi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Build and Publish PyPI, Documentation to GH Pages
on:
release:
types: [published]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
with:
fetch-depth: 0
- name: Build and Commit
uses: sphinx-notes/pages@master
with:
documentation_path: docs/source
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
build-n-pub:
strategy:
matrix:
# we are building a pure python wheel so it should work on any platform
os: [ubuntu-latest]
python-versions: [3.6]
runs-on: ${{ matrix.os }}
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Install Python 3
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-versions }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install -r requirements.txt
- name: create wheel file
run: python setup.py bdist_wheel sdist clean --all
- name: Publish distribution to Test PyPI
uses: pypa/gh-action-pypi-publish@master
with:
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
repository_url: https://test.pypi.org/legacy/
- name: Publish distribution to PyPI
uses: pypa/gh-action-pypi-publish@master
with:
password: ${{ secrets.PYPI_API_TOKEN }}
12 changes: 9 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@ sdist/
wheels/

docs/_build
**/*.gif
**/*.mp4
**/mcs_config.ini

# Debug output
# Ignore debug files in the root or scripts folders ONLY.
**/SCENE_HISTORY
*.gif
*.json
*.mp4
*.png
*.zip
scripts/**/*.gif
scripts/**/*.json
scripts/**/*.mp4
Expand All @@ -42,3 +45,6 @@ scripts/**/*.zip
# Logging output and user config
logs/*.log
scripts/log.config.user.py

#.vscode files
.vscode/launch.json
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ repos:
rev: v1.5.4
hooks:
- id: autopep8
- repo: https://github.com/pycqa/isort
rev: 5.8.0
hooks:
- id: isort
name: isort (python)
- repo: local
hooks:
- id: sphinx
Expand Down
2 changes: 1 addition & 1 deletion CPU_Container.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV TZ=America/New_York

# --build-arg mcsversion=0.0.x to override default in docker build command
ARG mcsversion=0.4.3
ARG mcsversion=0.4.4
ARG mcs_library_version=master

WORKDIR /mcs
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ENV NVIDIA_DRIVER_CAPABILITIES ${NVIDIA_DRIVER_CAPABILITIES},display
# ENV LANG C.UTF-8

# --build-arg mcsversion=0.0.x to override default in docker build command
ARG mcsversion=0.4.3
ARG mcsversion=0.4.4
ARG mcs_library_version=master

WORKDIR /mcs
Expand Down
Loading

0 comments on commit a716aeb

Please sign in to comment.