Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v0.10.6 #13

Merged
merged 32 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ab21a22
fixed all issues for the build system and updated feems
kevinksyTRD Mar 26, 2024
f255a7a
pipeline for testing added
kevinksyTRD Mar 26, 2024
d92bacf
fixed requirement
kevinksyTRD Mar 26, 2024
acbccdb
linting
kevinksyTRD Mar 26, 2024
52d6e88
fixed test pipeline
kevinksyTRD Mar 26, 2024
46ca585
test publishing to pypi
kevinksyTRD Mar 26, 2024
3557f6a
Bump urllib3 from 2.0.5 to 2.0.7 in /feems
dependabot[bot] Mar 26, 2024
415cd96
fixes related to release pipeline
kevinksyTRD Mar 26, 2024
a64c7c6
Merge branch 'main' into 3-update-build-system-for-all-packages
kevinksyTRD Mar 26, 2024
75affc7
fixed version numbers
kevinksyTRD Mar 26, 2024
cc038b5
publish pipeline added
kevinksyTRD Mar 27, 2024
13cf088
Merge pull request #9 from SINTEF/3-update-build-system-for-all-packages
kevinksyTRD Mar 27, 2024
d33dda4
fixed the pipeline for publishing
kevinksyTRD Mar 27, 2024
b958796
Fixed the pipeline to publish only with release tag
kevinksyTRD Mar 27, 2024
ed37631
COGAS, COGES implemented
kevinksyTRD Mar 27, 2024
301f81c
test for cogas, coges implemented
kevinksyTRD Mar 28, 2024
5eaa72a
emission info added to cogas
kevinksyTRD Mar 28, 2024
98dc810
coges integrated for the system
kevinksyTRD Mar 28, 2024
5372639
system with coges tested
kevinksyTRD Mar 28, 2024
f50f829
Coges tested for all libraries
kevinksyTRD Apr 2, 2024
d2ec0bc
Merge pull request #5 from SINTEF/dependabot/pip/feems/urllib3-2.0.7
tibnor Apr 4, 2024
6267bcd
feat: add py.typed to packages
tibnor Apr 4, 2024
c6f8be1
chore: bump version
tibnor Apr 4, 2024
5d5161d
testing conversion for coges completed
kevinksyTRD Apr 8, 2024
7551bf0
Merge pull request #11 from SINTEF/10-feat-add-coges
kevinksyTRD Apr 9, 2024
930391d
Update publish_feems.yml
kevinksyTRD Apr 9, 2024
c1eabe7
Update publish_feems.yml
kevinksyTRD Apr 9, 2024
e8456fd
Update publish_feems.yml
kevinksyTRD Apr 9, 2024
c8833a5
publish at release
kevinksyTRD Apr 9, 2024
7652cb5
release workflow
kevinksyTRD Apr 9, 2024
466b88a
fixed pipeline
kevinksyTRD Apr 9, 2024
1fb062e
fixed version
kevinksyTRD Apr 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/python
{
"name": "Python 3",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/python:1-3.10-buster",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "pip3 install --user -r requirements_dev.txt"

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
49 changes: 49 additions & 0 deletions .github/workflows/publish_MachSysS.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Publish Python 🐍 distribution 📦 to PyPI for FEEMS

on:
pull_request:
branches: ["release"]

jobs:
build:
name: Build distribution 📦
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.x"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install build --user
- name: Build package
run: |
cd machinery-system-structure
python -m build
- name: Store the distribution packages 📦
uses: actions/upload-artifact@v3
with:
name: python-package-distributions-MachSysS
path: machinery-system-structure/dist/

publish-to-pypi:
name: >-
Publish Python 🐍 distribution 📦 to PyPI
needs:
- build
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/MachSysS
permissions:
id-token: write
steps:
- uses: actions/download-artifact@v3
with:
name: python-package-distributions-MachSysS
path: dist/
- name: Publish distribution 📦 to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
49 changes: 49 additions & 0 deletions .github/workflows/publish_RunFeemsSim.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Publish Python 🐍 distribution 📦 to PyPI for FEEMS

on:
pull_request:
branches: ["release"]

jobs:
build:
name: Build distribution 📦
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.x"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install build --user
- name: Build package
run: |
cd RunFEEMSSim
python -m build
- name: Store the distribution packages 📦
uses: actions/upload-artifact@v3
with:
name: python-package-distributions-RunFeemsSim
path: RunFEEMSSim/dist/

publish-to-pypi:
name: >-
Publish Python 🐍 distribution 📦 to PyPI
needs:
- build
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/RunFeemsSim
permissions:
id-token: write
steps:
- uses: actions/download-artifact@v3
with:
name: python-package-distributions-RunFeemsSim
path: dist/
- name: Publish distribution 📦 to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
49 changes: 49 additions & 0 deletions .github/workflows/publish_feems.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Publish Python 🐍 distribution 📦 to PyPI for FEEMS

on:
pull_request:
branches: ["release"]

jobs:
build:
name: Build distribution 📦
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.x"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install poetry --user
- name: Build package
run: |
cd feems
poetry build
- name: Store the distribution packages 📦
uses: actions/upload-artifact@v3
with:
name: python-package-distributions-feems
path: feems/dist/

publish-to-pypi:
name: >-
Publish Python 🐍 distribution 📦 to PyPI
needs:
- build
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/feems
permissions:
id-token: write
steps:
- uses: actions/download-artifact@v3
with:
name: python-package-distributions-feems
path: dist/
- name: Publish distribution 📦 to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
69 changes: 0 additions & 69 deletions .github/workflows/release-please.yml

This file was deleted.

53 changes: 53 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python

name: Python package

on:
push:
branches: ["*"]
pull_request:
branches: ["*"]

jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ["3.10", "3.11", "3.12"]
project:
- feems
- machinery-system-structure
- RunFEEMSSim

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}

- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-

- name: Install dependencies
run: |
python3 -m pip install --upgrade pip setuptools
pip install -r requirements_dev.txt

- name: Test with pytest if the project is feems else test with nbdev
run: |
cd ${{ matrix.project }}
if [ "${{ matrix.project }}" = "feems" ]; then
pytest
else
nbdev_test --do_print
fi
12 changes: 12 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"python.testing.unittestArgs": [
"-v",
"-s",
"./feems",
"-p",
"test*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true,
"python.testing.pytestArgs": ["feems"]
}
Loading
Loading