Skip to content

Commit

Permalink
change version, clean workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
thevincentadam committed Sep 21, 2021
1 parent b14ee2a commit b12b34a
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 68 deletions.
16 changes: 7 additions & 9 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@

name: Deploy

#on:
# push:
# branches:
# - develop
on: [push]
on:
push:
branches:
- develop

jobs:
check-test-deploy-docs:
Expand Down Expand Up @@ -50,7 +49,6 @@ jobs:
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true

#----------------------------------------------
# load cached venv if cache exists
#----------------------------------------------
Expand All @@ -67,15 +65,15 @@ jobs:
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction --no-root
#----------------------------------------------
# install your root project, if required
# install root project
#----------------------------------------------
- name: Install library
run: poetry install --no-interaction
#----------------------------------------------
# run test suite
#----------------------------------------------
# - name: Run tests
# run: poetry run task quicktest
- name: Run tests
run: poetry run task quicktest
#----------------------------------------------
# build documentation
#----------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/quality-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction --no-root
#----------------------------------------------
# install your root project, if required
# install root project
#----------------------------------------------
- name: Install library
run: poetry install --no-interaction
Expand Down
106 changes: 50 additions & 56 deletions .github/workflows/upload-pypi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,75 +14,69 @@

name: Upload-PyPI



on:
workflow_dispatch:
push:
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
tags: v[0-9]+.[0-9]+.[0-9]+*

jobs:
check-and-test:
check-test-deploy-docs:
runs-on: ubuntu-latest
env:
DOCS: ""
strategy:
matrix:
python-version: [3.7]
tensorflow: [2.2.1]
poetry-version: [1.1.6]
name: Python-${{ matrix.python-version }}
python-version: [ 3.7 ]
tensorflow: [ 2.2.1 ]
name: Python-${{ matrix.python-version }} tensorflow${{ matrix.tensorflow }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
#----------------------------------------------
# check-out repo and set-up python
#----------------------------------------------
- name: Check out repository
uses: actions/checkout@v2
- name: Set up python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
# ------------ Install poetry
- name: Setup pip/poetry
run: |
pip install -U pip poetry twine
poetry config virtualenvs.create false
# ------------ build and install package
- name: Install package
run: poetry install
# ------------ run tests
- name: Run tests
run: poetry run task test
pypi:
# needs: check-and-test
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
poetry-version: [1.1.6]
name: Release PyPi package
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
#----------------------------------------------
# ----- install & configure poetry -----
#----------------------------------------------
- name: Install Poetry
uses: snok/install-poetry@v1
with:
python-version: ${{ matrix.python-version }}
# ------------ Install poetry
- name: Setup pip/poetry
version: 1.1.6
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true
#----------------------------------------------
# load cached venv if cache exists
#----------------------------------------------
- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v2
with:
path: .venv
key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
#----------------------------------------------
# install dependencies if cache does not exist
#----------------------------------------------
- name: Install dependencies
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction --no-root
#----------------------------------------------
# install root project
#----------------------------------------------
- name: Install library
run: |
pip install -U pip poetry twine
poetry config virtualenvs.create false
# ------------ build and install package
# - name: Install package
# run: |
# poetry install
# poetry build
- name: Build and publish to pypi
uses: JRubics/[email protected]
poetry install --no-interaction
poetry build
#----------------------------------------------
# publish to pypi
#----------------------------------------------
- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
python_version: "3.7"
poetry_version: "==1.1.6" # (PIP version specifier syntax)
pypi_token: ${{ secrets.PYPI_TOKEN }}
build_format: "sdist"
repository_name: "markovflow"
repository_url: "https://github.com/secondmind-labs/markovflow"
ignore_dev_requirements: "yes"
# # ------------ publish to pypi
# - name: Publish to PyPI
# uses: pypa/gh-action-pypi-publish@release/v1
# with:
# user: __token__
# password: ${{ secrets.PYPI_TOKEN }}
user: __token__
password: ${{ secrets.PYPI_TOKEN }}
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.7
0.0.12
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "markovflow"
version = "0.0.7"
version = "0.0.12"
description = "A Tensorflow based library for Time Series Modelling with Gaussian Processes"
authors = ["Markovflow Contributors <[email protected]>"]
packages = [{include = "markovflow"}]
Expand Down

0 comments on commit b12b34a

Please sign in to comment.