Skip to content

Commit

Permalink
Merge pull request #100 from dhhagan/dhhagan-feature-aaar2024
Browse files Browse the repository at this point in the history
Dhhagan feature aaar2024
  • Loading branch information
dhhagan authored Oct 4, 2024
2 parents 8d1f9ac + 2968097 commit 2035cee
Show file tree
Hide file tree
Showing 437 changed files with 3,525 additions and 53,356 deletions.
25 changes: 13 additions & 12 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
name: docs/gh-pages
on:
create:
tags:
- v*
on: [workflow_dispatch]

jobs:
build-docs:
name: Build docs and push to gh-pages
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v2
Expand All @@ -18,26 +15,30 @@ jobs:
python-version: 3.8

- name: Install poetry
uses: snok/[email protected]

uses: snok/install-poetry@v1
with:
virtualenvs-create: true

- name: Install dependencies
run: poetry install
run: poetry install --no-interaction

- name: Install pandoc
run: sudo apt-get install pandoc

- name: build docs
run: |
source $(poetry env info --path)/activate
cd docs
make clean
make tutorials
make html
cd ..
- name: deploy to gh-pages
uses: Cecilapp/GitHub-Pages-deploy@master
uses: Cecilapp/GitHub-Pages-deploy@v3
env:
EMAIL: [email protected]
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
BUILD_DIR: docs/_build/html
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
with:
email: [email protected]
build_dir: docs/_build/html

45 changes: 23 additions & 22 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
name: build & release
on:
create:
tags:
- v*
release:
types: [published]

jobs:
build-n-publish:
name: Build and publish to PyPI
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout branch
uses: actions/checkout@v2
Expand All @@ -18,31 +17,33 @@ jobs:
python-version: 3.8

- name: Install poetry
uses: snok/[email protected]
uses: snok/install-poetry@v1
with:
virtualenvs-create: true

- name: Install dependencies
run: poetry install
run: poetry install --no-interaction

- name: Build and publish to PyPI
run: |
poetry build
poetry publish -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }}
poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }}
publish-to-docker:
name: Build Docker image and push to DockerHub
runs-on: ubuntu-18.04
steps:
- name: Checkout branch
uses: actions/checkout@v2
# publish-to-docker:
# name: Build Docker image and push to DockerHub
# runs-on: ubuntu-20.04
# steps:
# - name: Checkout branch
# uses: actions/checkout@v2

- name: Build and deploy Docker image
uses: docker/build-push-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
path: docker/
repository: dhhagan/opcsim
tags: latest
tag_with_ref: true
# - name: Build and deploy Docker image
# uses: docker/build-push-action@v1
# with:
# username: ${{ secrets.DOCKER_USERNAME }}
# password: ${{ secrets.DOCKER_PASSWORD }}
# path: docker/
# repository: dhhagan/opcsim
# tags: latest
# tag_with_ref: true


10 changes: 6 additions & 4 deletions .github/workflows/test-and-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [3.6, 3.7, 3.8]
python: ["3.8", "3.9", "3.10", "3.11"]
name: Python ${{ matrix.python }} tests
steps:
- name: Checkout branch
Expand All @@ -17,14 +17,16 @@ jobs:
python-version: ${{ matrix.python }}

- name: Install poetry
uses: snok/[email protected]
uses: snok/install-poetry@v1
with:
virtualenvs-create: true

- name: Install dependencies
run: poetry install
run: poetry install --no-interaction

- name: Run tests and generate coverage report
run: |
poetry run pytest --cov=./ --cov-report=xml
poetry run pytest tests/ --cov=./ --cov-report=xml
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
Expand Down
7 changes: 0 additions & 7 deletions docker/Dockerfile

This file was deleted.

55 changes: 0 additions & 55 deletions docker/examples/Figure-1.ipynb

This file was deleted.

Binary file removed docs/_build/doctrees/api.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/contributing.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/environment.pickle
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/examples/index.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/examples/opc_with_dist.doctree
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/examples/ten_bin_opc.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/examples/three_weights.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/generated/opcsim.OPC.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/index.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/installing.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/introduction.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/tutorial.doctree
Binary file not shown.
Binary file not shown.
Binary file removed docs/_build/doctrees/tutorial/nephelometer.doctree
Binary file not shown.
Binary file removed docs/_build/doctrees/tutorial/opcs.doctree
Binary file not shown.
4 changes: 0 additions & 4 deletions docs/_build/html/.buildinfo

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2035cee

Please sign in to comment.