Skip to content

Commit

Permalink
wip data element
Browse files Browse the repository at this point in the history
wip
wip
wip
wip
wip
  • Loading branch information
hf-kklein committed May 24, 2024
1 parent edeee0a commit 33a53cb
Show file tree
Hide file tree
Showing 16 changed files with 8,944 additions and 226 deletions.
182 changes: 42 additions & 140 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,153 +1,55 @@
# Python Template Repository including a `tox.ini`, Unittests&Coverage, Pylint & MyPy Linting Actions and a PyPI Publishing Workflow
# FUNDAMEND - Formate und DAtenModelle für die ENergiewirtschaft in Deutschland

<!--- you need to replace the `organization/repo_name` in the status badge URLs --->
Dieses Repository enthält das Python-Paket `fundamend`.

![Unittests status badge](https://github.com/Hochfrequenz/python_template_repository/workflows/Unittests/badge.svg)
![Coverage status badge](https://github.com/Hochfrequenz/python_template_repository/workflows/Coverage/badge.svg)
![Linting status badge](https://github.com/Hochfrequenz/python_template_repository/workflows/Linting/badge.svg)
![Black status badge](https://github.com/Hochfrequenz/python_template_repository/workflows/Formatting/badge.svg)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
![Python Versions (officially) supported](https://img.shields.io/pypi/pyversions/fundamend.svg)
![Pypi status badge](https://img.shields.io/pypi/v/fundamend)
![Unittests status badge](https://github.com/Hochfrequenz/xml-fundamend-python/workflows/Unittests/badge.svg)
![Coverage status badge](https://github.com/Hochfrequenz/xml-fundamend-python/workflows/Coverage/badge.svg)
![Linting status badge](https://github.com/Hochfrequenz/xml-fundamend-python/workflows/Linting/badge.svg)
![Black status badge](https://github.com/Hochfrequenz/xml-fundamend-python/workflows/Formatting/badge.svg)

This is a template repository.
It doesn't contain any useful code but only a minimal working setup for a Python project including:
## Sinn und Zweck
Seit 2024 bietet der BDEW (endlich) maschinenlesbare MIG- und AHB-Spezifikationen an, wo zuvor nur PDF oder Word-Dateien veröffentlicht wurden.
Das ist ein wichtiger Schritt für eine echte Digitalisierung der Marktkommunikation im deutschen Energiemarkt.

- a basic **project structure** with
- tox.ini
- `pyproject.toml` where the project metadata and dependencies are defined
- and a requirements.txt derived from it
- an example class
- an example unit test (using pytest)
- ready to use **Github Actions** for
- [pytest](https://pytest.org)
- [code coverage measurement](https://coverage.readthedocs.io) (fails below 80% by default)
- [pylint](https://pylint.org/) (only accepts 10/10 code rating by default)
- [mypy](https://github.com/python/mypy) (static type checks where possible)
- [black](https://github.com/psf/black) code formatter check
- [isort](https://pycqa.github.io/isort/) import order check
- [codespell](https://github.com/codespell-project/codespell) spell check (including an ignore list)
- autoresolve dev-dependencies with `tox -e compile_requirements`
- ready-to-use publishing workflow for pypi (see readme section below)
Die nun maschinenlesbaren Informationen sind XML-basiert.

By default, it uses Python version 3.12.

This repository uses a [`src`-based layout](https://packaging.python.org/en/latest/discussions/src-layout-vs-flat-layout/).
This approach has many advantages and basically means for developers, that all business logic lives in the `src` directory.

## How to use this Repository on Your Machine

This introduction assumes that you have tox installed already (
see [installation instructions](https://tox.readthedocs.io/en/latest/installation.html)) and that a `.toxbase` environment
has been created.
`.toxbase` is a project independent virtual environment-template for all the tox environments on your machine. If anything is weird during the tox installation or after the installation, try turning your computer off and on again before getting too frustrated.

### Powershell restrictions on Windows
Also on new windows machines it is possible that the execution policy is set to restricted and you are not allowed execute scripts. You can find detailed information [here](https://learn.microsoft.com/de-de/powershell/module/microsoft.powershell.core/about/about_execution_policies?view=powershell-7.3).

The quickest way to solve this problem: Open an Administrator Powershell (e.g. Windows PowerShell App)
```ps
Set-ExecutionPolicy -ExecutionPolicy AllSigned
```
and try again (with your regular user, not as admin).

### Creating the project-specifc dev environment.
If all problems are solved and you're ready to start:
1. clone the repository, you want to work in
2. create the `dev` environment on your machine. To do this:
a) Open a Powershell
b) change directory to your repository
and finally type
Dieses Repository enthält ein kleines Python-Paket, das die XML-Dateien einliest und als Python-Objekte zur Verfügung stellt, damit sich niemand mit XML herumschlagen muss.
Das ist alles.

## Installation und Verwendung
Das Paket ist auf PyPI verfügbar und kann mit pip installiert werden:
```bash
tox -e dev
```

You have now created the development environment (dev environment). It is the environment which contains both the usual requirements as well as the testing and linting tools.

### How to use with PyCharm

1. You have cloned the repository, you want to work in, and have created the virtual environment, in which the repository should be executed (`your_repo/.tox/dev`). Now, to actually work inside the newly created environment, you need to tell PyCharm (your IDE) that it should use the virtual environment - to be more precise: the interpreter of this dev environment. How to do this:
a) navigate to: File ➡ Settings (Strg + Alt + S) ➡ Project: your_project ➡ Python Interpreter ➡ Add interpreter ➡ Existing
b) Choose as interpreter: `your_repo\.tox\dev\Scripts\python.exe` (under windows)
2. Set the default test runner of your project to pytest. How to do it:
a) navigate to Files ➡ Settings ➡ Tools ➡ Python integrated tools ➡ Testing: Default test runner
b) Change to "pytest"
If this doesn't work anymore, see [the PyCharm docs](https://www.jetbrains.com/help/pycharm/choosing-your-testing-framework.html)
3. Set the `src` directory as sources root. How to do this:
right click on 'src' ➡ "Mark directory as…" ➡ sources root
If this doesn't work anymore, see: [PyCharm docs](https://www.jetbrains.com/help/pycharm/content-root.html).
Setting the `src` directory right, allows PyCharm to effectively suggest import paths.
If you ever see something like `from src.mypackage.mymodule import ...`, then you probably forgot this step.
5. Set the working directory of the unit tests to the project root (instead of the unittest directory). How to do this:
a) Open any test file whose name starts with `test_` in unit tests/tests
b) Right click inside the code ➡ More Run/Debug ➡ Modify Run Configuration ➡ expand Environment collapsible ➡ Working directory
c) Change to `your_repo` instead of `your_repo\unittests`
By doing so, the import and other file paths in the tests are relative to the repo root.
If this doesn't work anymore, see: [working directory of the unit tests](https://www.jetbrains.com/help/pycharm/creating-run-debug-configuration-for-tests.html)

### How to use with VS Code
All paths mentioned in this section are relative to the repository root.

1. Open the folder with VS Code.
2. **Select the python interpreter** ([official docs](https://code.visualstudio.com/docs/python/environments#_manually-specify-an-interpreter)) which is created by tox. Open the command pallett with `CTRL + P` and type `Python: Select Interpreter`. Select the interpreter which is placed in `.tox/dev/Scripts/python.exe` under Windows or `.tox/dev/bin/python` under Linux and macOS.
3. **Set up pytest and pylint**. Therefore we open the file `.vscode/settings.json` which should be automatically generated during the interpreter setup. If it doesn't exist, create it. Insert the following lines into the settings:

```json
{
"python.testing.unittestEnabled": false,
"python.testing.nosetestsEnabled": false,
"python.testing.pytestEnabled": true,
"pythonTestExplorer.testFramework": "pytest",
"python.testing.pytestArgs": ["unittests"],
"python.linting.pylintEnabled": true
}
pip install fundamend
```

4. Create a `.env` file and insert the following line

For Windows:

```
PYTHONPATH=src;${PYTHONPATH}
```

For Linux and Mac:

```
PYTHONPATH=src:${PYTHONPATH}
```python
from pathlib import Path
from fundamend import MigReader, MessageImplementationGuide

# Angenommen, mig_utilts.xml enthält:
# <?xml version="1.0" encoding="UTF-8"?>
# <M_UTILTS Versionsnummer="1.1c"
# Veroeffentlichungsdatum="24.10.2023"
# Author="BDEW">
# ...
# </M_UTILTS>

reader = MigReader(Path("pfad/zur/mig_utils.xml"))
mig = reader.read()
assert isinstance(mig, MessageImplementationGuide)
assert mig.format == "UTILTS"
```

This makes sure, that the imports are working for the unittests.
At the moment I am not totally sure that it is the best practise, but it's getting the job done.

5. Enjoy 🤗

## Publishing on PyPI

This repository contains all necessary CI steps to publish any project created from it on PyPI.
It uses the trusted publishers workflow as described in the [official Python documentation](https://packaging.python.org/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows/).
It just requires some manual adjustments/settings depending on your project:

1. Fill out the metadata in the [`pyproject.toml`](pyproject.toml); Namely the package name and the dependencies which should be in sync with your `requirements.in`.
2. Uncomment the lines in [`.github/workflows/python-publish.yml`](.github/workflows/python-publish.yml)
3. Create a [new environment in your GitHub repository](https://github.com/Hochfrequenz/python_template_repository/settings/environments) and call it `release`.
4. Set up a new trusted publisher [in your PYPI account](https://pypi.org/manage/account/publishing/).
1. PyPI Project Name: The name which you defined in the `pyproject.toml` is the name of the project which you have to enter here.
2. Owner: The GitHub organization name or GitHub username that owns the repository
3. Repository name: The name of the GitHub repository that contains the publishing workflow
4. Workflow name: The filename of the publishing workflow. This file should exist in the .github/workflows/ directory in the repository configured above. Here in our case: `python-publish.yml`
5. Environment name: The name of the GitHub Actions environment that the above workflow uses for publishing. Here in our case: `release`
5. Now create a release by clicking on "Create new release" in the right Github sidebar (or visit `github.com/your-username/your-reponame/releases/new`). This should trigger the workflow (see the "Actions" tab of your repo).
6. Check if the action failed. If it succeeded your PyPI account should now show the new project. It might take some minutes until the package can be installed via `pip install packagename` because the index has to be updated.
7. Now create another PyPI token with limited scope and update the Github repository secret accordingly.

## Contribute

You are very welcome to contribute to this template repository by opening a pull request against the main branch.
Aktuell (Version 0.1) können nur MIGs gelesen werden.
Der AHB-Teil soll aber folgen.

### GitHub Actions
## Verwendung und Mitwirken
Der Code ist MIT-lizenziert und kann daher frei verwendet werden.
Wir freuen uns über Pull Requests an den main-Branch dieses Repositories.

- Dependabot auto-approve / -merge:
- If the actor is the Dependabot bot (i.e. on every commit by Dependabot)
the pull request is automatically approved and auto merge gets activated
(using squash merge).
Note that if you haven't enabled "auto merge" for your repository, the auto merge activation will fail.
If you want to use a merge type other than "squash merge" you have to edit the workflow.
## Hochfrequenz
Die [Hochfrequenz Unternehmensberatung GmbH](https://www.hochfrequenz.de) ist eine Beratung für Energieversorger im deutschsprachigen Raum.
Wir arbeiten größtenteils remote, haben aber auch Büros in Berlin, Bremen, Leipzig, Köln und Grünwald und attraktive [Stellenangebote](https://www.hochfrequenz.de/index.php/karriere/aktuelle-stellenausschreibungen/full-stack-entwickler).
5 changes: 5 additions & 0 deletions domain-specific-terms.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
# contains 1 lower case word per line which are ignored in the spell_check
autor
formate
fundamend
oder
ist
als
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "bamx"
description = "Python interface XML documents for MIG and AHBs, published by BDEW "
name = "fundamend"
description = "XML basierte Formate und DatemModelle für die Energiewirtschaft in Deutschland"
license = { text = "MIT" }
requires-python = ">=3.11"
authors = [{ name = "Hochfrequenz Unternehmensberatung GmbH", email = "info+github@hochfrequenz.de" }]
Expand All @@ -20,8 +20,8 @@ dependencies = [] # add all the dependencies here
dynamic = ["readme", "version"]

[project.urls]
Changelog = "https://github.com/Hochfrequenz/bdew_ahb_mig_xml-python/releases"
Homepage = "https://github.com/Hochfrequenz/bdew_ahb_mig_xml-python"
Changelog = "https://github.com/Hochfrequenz/xml-fundamend/releases"
Homepage = "https://github.com/Hochfrequenz/xml-fundamend"

[tool.black]
line-length = 120
Expand Down Expand Up @@ -52,7 +52,7 @@ fragments = [{ path = "README.md" }]
source = "vcs"

[tool.hatch.build.hooks.vcs]
version-file = "src/_bamx_version.py"
version-file = "src/_fundamend_version.py"
template = '''
version = "{version}"
'''
Expand Down
3 changes: 0 additions & 3 deletions src/bamx/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion src/bamx/models/__init__.py

This file was deleted.

21 changes: 0 additions & 21 deletions src/bamx/models/messageimplementationguide.py

This file was deleted.

53 changes: 0 additions & 53 deletions src/bamx/reader/migreader.py

This file was deleted.

8 changes: 8 additions & 0 deletions src/fundamend/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
"""
fundamend contains Formate und Datenmodelle für die Energiewirtschaft in Deutschland.
pip install xml-fundamend
"""
from .models import MessageImplementationGuide
from .reader import MigReader

__all__ = ["MigReader", "MessageImplementationGuide"]
4 changes: 4 additions & 0 deletions src/fundamend/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
"""contains model classes representing MIGs and AHBs"""
from .messageimplementationguide import MessageImplementationGuide

__all__ = ["MessageImplementationGuide"]
Loading

0 comments on commit 33a53cb

Please sign in to comment.