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.0.7 #188

Merged
merged 42 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
fb1e386
Prepare for development towwards 0.0.7
p-snft Jun 12, 2023
645d6ae
Add long_description_content_type to setup.py
p-snft Jun 12, 2023
17761c4
--ammend
p-snft Jun 12, 2023
a850d27
Remove travis.yml
p-snft Sep 30, 2024
2946de8
Remove year from LICENSE file
p-snft Sep 30, 2024
c9591e0
Merge setup infos in pyproject.toml
p-snft Sep 30, 2024
6783f25
Ignore .venv
p-snft Sep 30, 2024
0c77a69
Adapt for oemof.network v0.5
p-snft Sep 30, 2024
9954fcf
Fix version number format
p-snft Oct 8, 2024
28d74a7
Update sdist list
p-snft Oct 8, 2024
1edab40
Blacken code style
p-snft Oct 8, 2024
4109fcb
Fix sphinx config
p-snft Oct 8, 2024
29cf5ad
Fix format of docs
p-snft Oct 8, 2024
71cbe20
List sphinx in docs requirements
p-snft Oct 8, 2024
a2a5281
Copy tox.ini from solph
p-snft Oct 8, 2024
bafeb20
Copy GitHub workflows from solph
p-snft Oct 8, 2024
6c71981
Adhere to Black
p-snft Oct 8, 2024
95890b3
Adhere to Black
p-snft Oct 8, 2024
a4744bc
Align python requirement with target version
p-snft Oct 10, 2024
f6093b6
Remove flake8 file
p-snft Oct 10, 2024
8621465
Adapt pyproject.toml
p-snft Oct 10, 2024
893e086
Fix import orders
p-snft Oct 10, 2024
2365aef
Ignore line lenght in flake8 check
p-snft Oct 10, 2024
1d7cc15
Ignore vscode directory
p-snft Oct 10, 2024
ac9337b
Fix links in documentation
p-snft Oct 10, 2024
cfa7066
Remove unused variables
p-snft Oct 10, 2024
939b80d
Remove unused variables
p-snft Oct 10, 2024
a7ca976
Remove unused variables
p-snft Oct 10, 2024
2acef73
Remove unused variables
p-snft Oct 10, 2024
ab59cfc
Require a label for Facades
p-snft Oct 10, 2024
b60d34d
Adapt constraint tests for multi-period invests
p-snft Oct 10, 2024
597d871
Pin pvlib to v0.9.0
p-snft Oct 10, 2024
29f0162
Update lpfiles of constraint tests
p-snft Oct 10, 2024
6015e62
Make constraint test independent from line sorting
p-snft Oct 10, 2024
131c950
Fix import order
p-snft Oct 10, 2024
d284d71
Rename Transformer to Converter
p-snft Oct 11, 2024
56e35ef
Fix import order
p-snft Oct 11, 2024
08daa29
Merge pull request #187 from oemof/fix/setup
p-snft Oct 14, 2024
ace3378
Add oemof.network v0.5 compat to whatsnew
p-snft Nov 27, 2024
7db912a
Pin solph version
p-snft Nov 27, 2024
72291e0
Finalise v0.0.7
p-snft Nov 27, 2024
aae47cf
Handle unknown irradiance_method in PTC
p-snft Nov 27, 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
4 changes: 0 additions & 4 deletions .flake8

This file was deleted.

44 changes: 44 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: "CodeQL"

on:
push:
branches:
- dev
- master
- 'release/**'
pull_request:
branches: [ "dev" ]
schedule:
- cron: "23 2 * * 2"

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ python ]

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

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
queries: +security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{ matrix.language }}"
38 changes: 38 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Black

on:
push:
branches:
- master
- dev
- 'release/**'
pull_request:

jobs:
run-linters:
name: Run linters
runs-on: ubuntu-latest

steps:
- name: Check out Git repository
uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.9

- name: Install Python dependencies
run: pip install black flake8

- name: Run linters
uses: samuelmeuli/lint-action@v1
with:
github_token: ${{ secrets.github_token }}
# Enable linters
black: true
flake8: false
# Mark the following line true if you want linters to attempt to autocorrect your code
auto_fix: false
git_name: "Greene Lab Linter"
git_email: "[email protected]"
40 changes: 40 additions & 0 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: packaging

on:
# Make sure packaging process is not broken
push:
branches:
- master
- dev
- 'release/**'
pull_request:
# Make a package for release
release:
types: [published]

jobs:
build:

runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.9]

steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools setuptools_scm twine wheel build
- name: Create packages
run: python -m build .
- name: Run twine check
run: twine check dist/*
- uses: actions/upload-artifact@v4
with:
name: tox-gh-actions-dist
path: dist
57 changes: 57 additions & 0 deletions .github/workflows/tox_checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# NB: this name is used in the status badge
name: tox checks

on:
push:
branches:
- master
- dev
- 'release/**'
pull_request:

workflow_dispatch:
schedule:
- cron: "0 5 * * 6" # 5:00 UTC every Saturday

jobs:
lint:
name: ${{ matrix.toxenv }}
runs-on: ubuntu-latest

strategy:
matrix:
toxenv:
- clean
- check
- docs

steps:
- name: Update package list
run: sudo apt update
- name: Install LaTeX
run: sudo apt install dvipng rubber texlive-latex-extra
- name: Git clone
uses: actions/checkout@v2

- name: Set up Python ${{ env.default_python || '3.9' }}
uses: actions/setup-python@v5
with:
python-version: "${{ env.default_python || '3.9' }}"

- name: Pip cache
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('tox.ini', 'setup.py') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.toxenv }}-
${{ runner.os }}-pip-

- name: Install dependencies
run: |
python -m pip install -U pip
python -m pip install -U setuptools wheel build
python -m pip install -U tox

- name: Run ${{ matrix.toxenv }}
run: python -m tox -e ${{ matrix.toxenv }}
44 changes: 44 additions & 0 deletions .github/workflows/tox_pytests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: tox pytests

on:
push:
branches:
- master
- dev
- 'release/**'
pull_request:

workflow_dispatch:
schedule:
- cron: "0 5 * * 6" # 5:00 UTC every Saturday

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9, "3.10", "3.11"]

steps:
- uses: actions/checkout@v1
- name: Install cbc
run: sudo apt install coinor-cbc
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox tox-gh-actions coverage coveralls
- name: Test with tox
run: tox

- name: Check test coverage
run: coverage report -m --fail-under=${{ matrix.vcs == 'bzr' && 84 || 85 }}

- name: Report to coveralls
run: coveralls
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_SERVICE_NAME: github
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ __pycache__/
# Distribution / packaging
.Python
env/
.venv/
.vscode/
venv/
build/
develop-eggs/
Expand Down
55 changes: 0 additions & 55 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 oemof developing group
Copyright (c) oemof developing group

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

12 changes: 0 additions & 12 deletions docs/_pics/README.rst

This file was deleted.

4 changes: 2 additions & 2 deletions docs/compression_heat_pumps_and_chillers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ _____
This module was developed to provide COP calculations
based on temperatures for energy system optimizations with oemof.solph.

A time series of pre-calculated COPs can be used as input for a transformer
A time series of pre-calculated COPs can be used as input for a Converter
(an oemof.solph component) in an energy system optimization.
Discover more possibilities to use this module with our examples:
https://github.com/oemof/oemof-thermal/tree/dev/examples
Expand Down Expand Up @@ -166,7 +166,7 @@ Do NOT use this function to determine the input for `calc_cops()`!
References
__________

.. [1] VDE ETG Energietechnik, VDE-Studie "Potenziale für Strom im Wärmemarkt bis 2050 - Wärmeversorgung in flexiblen Energieversorgungssystemen mit hohen Anteilen an erneuerbaren Energien". 2015. (http://www.energiedialog2050.de/BASE/DOWNLOADS/VDE_ST_ETG_Warmemarkt_RZ-web.pdf)
.. [1] VDE ETG Energietechnik, VDE-Studie "Potenziale für Strom im Wärmemarkt bis 2050 - Wärmeversorgung in flexiblen Energieversorgungssystemen mit hohen Anteilen an erneuerbaren Energien". 2015.

.. [2] C. Arpagaus, Hochtemperatur-Wärmepumpen - Marktübersicht, Stand der Technik und Anwendungsbeispiele. Berlin, Offenbach: VDE-Verlag, 2019.

8 changes: 4 additions & 4 deletions docs/concentrating_solar_power.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ system optimizations with oemof.solph.
In
https://github.com/oemof/oemof-thermal/tree/dev/examples
you can find an example on how to use the modul to calculate a CSP power plant.
A time series of pre-calculated heat flows can be used as input for a source
(an oemof.solph component), and a transformer (an oemof.solph component) can be
A time series of pre-calculated heat flows can be used as input for a Source
(an oemof.solph component), and a Converter (an oemof.solph component) can be
used to hold electrical power consumption and further thermal losses of the
collector in an energy system optimization.
In addition, you will find an example which compares this precalculation with
Expand Down Expand Up @@ -175,7 +175,7 @@ calculated with a fix efficiency.

The results of this precalculation can be used in an oemof energy system model
as output of a source component. To model the behaviour of a collector, it can be
complemented with a transformer, which holds the electrical consumption of pumps
complemented with a Converter, which holds the electrical consumption of pumps
and peripheral heat losses (see the the example csp_plant_collector.py).

ParabolicTroughCollector facade
Expand All @@ -193,7 +193,7 @@ class of the facade module for all parameters which have to be provided.

See example_csp_facade.py for an application example. It models the same
system as the csp_plant_example.py, but uses the ParabolicTroughCollector facade
instead of separate source and transformer.
instead of separate Source and Converter.


.. code-block:: python
Expand Down
Loading
Loading