Skip to content

Commit 73772b3

Browse files
author
Thomas Günther
committed
Merge branch 'try-workflows'
2 parents fb50d9e + 6093deb commit 73772b3

File tree

497 files changed

+28654
-28707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

497 files changed

+28654
-28707
lines changed

.flake8

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
[flake8]
1+
[flake8]
22
max-line-length = 120

.github/workflows/pre-commit.yaml

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
name: pre-commit
2-
3-
on:
4-
pull_request:
5-
push:
6-
branches:
7-
- master
8-
9-
jobs:
10-
pre-commit:
11-
runs-on: ubuntu-latest
12-
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-python@v5
15-
- uses: pre-commit/[email protected]
1+
name: pre-commit
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
pre-commit:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v4
10+
- uses: actions/setup-python@v5
11+
- uses: pre-commit/[email protected]

.github/workflows/scorecard.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
schedule:
1313
- cron: '15 8 * * 1'
1414
push:
15-
branches: [ "master" ]
15+
branches: [ "master", "try-workflows" ]
1616

1717
# Declare default permissions as read only.
1818
permissions: read-all
@@ -32,19 +32,19 @@ jobs:
3232

3333
steps:
3434
- name: "Checkout code"
35-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3636
with:
3737
persist-credentials: false
3838

3939
- name: "Run analysis"
40-
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
40+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
4141
with:
4242
results_file: results.sarif
4343
results_format: sarif
4444
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
4545
# - you want to enable the Branch-Protection check on a *public* repository, or
46-
# - you are installing Scorecard on a *private* repository
47-
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
46+
# - you are installing Scorecards on a *private* repository
47+
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
4848
# repo_token: ${{ secrets.SCORECARD_TOKEN }}
4949

5050
# Public repositories:
@@ -59,15 +59,14 @@ jobs:
5959
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6060
# format to the repository Actions tab.
6161
- name: "Upload artifact"
62-
uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
62+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6363
with:
6464
name: SARIF file
6565
path: results.sarif
6666
retention-days: 5
6767

68-
# Upload the results to GitHub's code scanning dashboard (optional).
69-
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
68+
# Upload the results to GitHub's code scanning dashboard.
7069
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@v3
70+
uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
7271
with:
7372
sarif_file: results.sarif

.gitlab-ci.yml

-75
This file was deleted.

.pre-commit-config.yaml

+21-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
exclude: ^cimpy/cgmes_
2-
3-
repos:
4-
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v2.3.0
6-
hooks:
7-
- id: check-yaml
8-
- id: end-of-file-fixer
9-
- id: trailing-whitespace
10-
11-
- repo: https://github.com/psf/black
12-
rev: 22.10.0
13-
hooks:
14-
- id: black
15-
16-
- repo: https://github.com/PyCQA/flake8
17-
rev: 7.1.0
18-
hooks:
19-
- id: flake8
1+
exclude: ^cimpy/cgmes_
2+
3+
repos:
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
5+
rev: v5.0.0
6+
hooks:
7+
- id: check-yaml
8+
- id: end-of-file-fixer
9+
- id: trailing-whitespace
10+
- id: mixed-line-ending
11+
- id: check-executables-have-shebangs
12+
13+
- repo: https://github.com/psf/black
14+
rev: 24.10.0
15+
hooks:
16+
- id: black
17+
18+
- repo: https://github.com/PyCQA/flake8
19+
rev: 7.1.1
20+
hooks:
21+
- id: flake8

README.md

+24-2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,35 @@ The focus of CIMpy is on the support of the Common Grid Model Exchange Standard
1111
CIMpy's documentation you can find [here](http://sogno-platform.github.io/cimpy/).
1212
The documentation provides instructions on CIMpy's installation, getting started examples and the possibility to browse through the supported CIM class codebases.
1313

14+
## Development
15+
16+
### Developer Installation
17+
18+
```bash
19+
git clone https://github.com/sogno-platform/cimpy.git
20+
cd cimpy
21+
pip install -e .[dev]
22+
```
23+
24+
Run pre-commit checks manually:
25+
26+
```bash
27+
pre-commit run --all-files
28+
```
29+
30+
Install pre-commit hook to run it automatically:
31+
32+
```bash
33+
pre-commit install
34+
```
35+
1436
## License
1537

1638
This project is released under the terms of the [Apache License 2.0](./LICENSE).
1739

18-
## Publication
40+
## Publications
1941

2042
If you are using CIMpy for your research, please cite the following paper in your publications:
2143

2244
Dinkelbach, J., Razik, L., Mirz, M., Benigni, A., Monti, A.: Template-based generation of programming language specific code for smart grid modelling compliant with CIM and CGMES.
23-
J. Eng. 2023, 113 (2022). [https://doi.org/10.1049/tje2.12208](https://doi.org/10.1049/tje2.12208)
45+
J. Eng. 2023, 1-13 (2022). [https://doi.org/10.1049/tje2.12208](https://doi.org/10.1049/tje2.12208)

0 commit comments

Comments
 (0)