Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
fwitte committed Oct 11, 2023
2 parents 3d1d008 + 91b917b commit b05cf90
Show file tree
Hide file tree
Showing 130 changed files with 9,166 additions and 9,836 deletions.
14 changes: 0 additions & 14 deletions .coveragerc

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools setuptools_scm twine wheel
python -m pip install --upgrade pip setuptools setuptools_scm twine wheel flit
- name: Create packages
run: python setup.py sdist bdist_wheel
run: python -m flit build
- name: Run twine check
run: twine check dist/*
- uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tox_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('tox.ini', 'setup.py') }}
key: ${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('tox.ini', 'pyproject.toml') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.toxenv }}-
${{ runner.os }}-pip-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tox_pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10"]
python-version: ["3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v1
Expand Down
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) 2017-2022, oemof developer group
Copyright (c) 2017-2023 Francesco Witte

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
14 changes: 7 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Thermal Engineering Systems in Python
TESPy stands for "Thermal Engineering Systems in Python" and provides a
powerful simulation toolkit for thermal engineering plants such as power
plants, district heating systems or heat pumps. It is an external extension
module within the `Open Energy Modelling Framework <https://oemof.org/>`_ and
can be used as a standalone package.
module within the Open Energy Modelling Framework `oemof <https://oemof.org/>`_
and can be used as a standalone package.

.. figure:: https://raw.githubusercontent.com/oemof/tespy/9915f013c40fe418947a6e4c1fd0cd0eba45893c/docs/api/_images/logo_tespy_big.svg
:align: center
Expand All @@ -20,8 +20,8 @@ exchangers, drum).
Everybody is welcome to use and/or develop TESPy. Contribution is already
possible on a low level by simply fixing typos in TESPy's documentation or
rephrasing sections which are unclear. If you want to support us that way
please fork the TESPy repository to your own github account and make changes
as described in the github guidelines:
please fork the TESPy repository to your own GitHub account and make changes
as described in the GitHub guidelines:
https://guides.github.com/activities/hello-world/

Key Features
Expand Down Expand Up @@ -130,7 +130,7 @@ We have decided to start a reoccurring "Stammtisch" meeting for all interested
TESPy users and (potential) developers. You are invited to join us on every 3rd
Monday of a month at 17:00 CE(S)T for a casual get together. The first meeting
will be held at June, 20, 2022. The intent of this meeting is to establish a
more active and well connected network of TESPy users and developers.
more active and well-connected network of TESPy users and developers.

If you are interested, you can simply join the meeting at
https://meet.jit.si/tespy_user_meeting. We are looking forward to seeing you!
Expand All @@ -153,7 +153,7 @@ repository. They are included in the "tutorial" directory.
Citation
========
The scope and functionalities of TESPy have been documented in a paper
published in the Journal of Open Source Software with an OpenAccess license.
published in the Journal of Open Source Software with an Open-Access license.
Download the paper from https://doi.org/10.21105/joss.02178. As TESPy is a free
software, we kindly ask that you add a reference to TESPy if you use the
software for your scientific work. Please cite the article with the BibTeX
Expand Down Expand Up @@ -200,7 +200,7 @@ zenodo. Find your version here: https://doi.org/10.5281/zenodo.2555866.

License
=======
Copyright (c) 2017-2022 oemof developer group
Copyright (c) 2017-2023 Francesco Witte

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
Loading

0 comments on commit b05cf90

Please sign in to comment.