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

Version 0.7.0-alpha #171

Merged
merged 56 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
56a724e
Apply conda forge update proposal
benoit9126 Nov 29, 2023
495648d
Update to Python 3.10 (#151)
alihamdan Dec 1, 2023
672d540
Bump conda-incubator/setup-miniconda from 2 to 3
dependabot[bot] Dec 1, 2023
2dc18b9
Merge pull request #152 from RoseauTechnologies/dependabot/github_act…
benoit9126 Dec 1, 2023
cb0ece0
Start fusion of the python code
Saelyos Dec 12, 2023
6835674
Update solvers
Saelyos Dec 13, 2023
625bf99
Make more members private
Saelyos Dec 13, 2023
7111029
Fix test
Saelyos Dec 13, 2023
d3ee8b4
Fix merging
Saelyos Dec 21, 2023
118e95b
Bump actions/upload-pages-artifact from 2 to 3 (#153)
dependabot[bot] Jan 1, 2024
fe127fb
Bump actions/deploy-pages from 2 to 4 (#154)
dependabot[bot] Jan 1, 2024
01fb5d6
Bump actions/setup-python from 4 to 5 (#155)
dependabot[bot] Jan 1, 2024
482119a
Bump actions/configure-pages from 3 to 4 (#156)
dependabot[bot] Jan 1, 2024
9665328
Bump actions/upload-artifact from 3 to 4 (#157)
dependabot[bot] Jan 1, 2024
a80974b
Update the tests, the doc and the dependencies
alihamdan Jan 10, 2024
44aae0a
New year!
benoit9126 Jan 10, 2024
064b1f0
Change the license in pyproject.toml file
benoit9126 Jan 10, 2024
db1847f
Activate the license from the environment
benoit9126 Jan 10, 2024
7cd7718
Fix res_transformers returning an empty dataframe (#163)
alihamdan Jan 10, 2024
64e5667
Remove clear_short_circuit and improve error message
alihamdan Jan 10, 2024
645423d
Docuemnt how to modify an element in place
alihamdan Jan 10, 2024
7920c7c
Merge branch 'develop' into fusion
alihamdan Jan 11, 2024
ef8dd83
Add elements for the license checks
benoit9126 Jan 11, 2024
2d8a0bb
Change copyright year
benoit9126 Jan 12, 2024
dc20790
Better warm start handling
alihamdan Jan 12, 2024
6dca6df
Remove res_info
alihamdan Jan 12, 2024
9a814a9
No res_info
alihamdan Jan 12, 2024
1a1669e
Fix res transformers and branches
alihamdan Jan 12, 2024
7d8537c
Move test coverage limit to pyproject.toml
alihamdan Jan 12, 2024
2ea96f9
License ++
alihamdan Jan 12, 2024
78e289e
No conda currently, add missing image
alihamdan Jan 12, 2024
41b5717
Skip CI tests temporarily
alihamdan Jan 12, 2024
6acfa43
Skip for real
alihamdan Jan 12, 2024
c3d492d
Add missing deps to show_versions and simplify logging
alihamdan Jan 15, 2024
b421da7
Merge pull request #164 from RoseauTechnologies/fusion
alihamdan Jan 15, 2024
a0a7924
Improve network creation performance
Saelyos Jan 15, 2024
63c08cc
Improve results performance
Saelyos Jan 15, 2024
b428280
Add precise error codes
Saelyos Jan 15, 2024
10d9ccf
Merge pull request #165 from RoseauTechnologies/fusion2
Saelyos Jan 15, 2024
e0d6ad8
Add a log
benoit9126 Jan 15, 2024
4c8589e
Clean unused error code
benoit9126 Jan 15, 2024
b1a0389
Fix minor typo
alihamdan Jan 16, 2024
45ef8d4
Fix potential propagation
Saelyos Jan 22, 2024
af1076c
Allow more connections
Saelyos Jan 22, 2024
cf9527f
Safer check
Saelyos Jan 22, 2024
b1fdbaa
Update changelog
Saelyos Jan 22, 2024
4ffca75
Merge pull request #168 from RoseauTechnologies/issue166
Saelyos Jan 22, 2024
e63dd60
Add lines catalogue and get_catalogue method (#167)
alihamdan Jan 23, 2024
e4b5073
Add missing changelog entries (#170)
alihamdan Jan 23, 2024
ff35a33
Update dependencies
benoit9126 Jan 24, 2024
0e38318
Update tests for pandas 2.2.0
benoit9126 Jan 24, 2024
b9b760c
Update documentation URL
benoit9126 Jan 24, 2024
bf61cf5
Update documentation
benoit9126 Jan 24, 2024
dd0a9f8
Update bug template report
benoit9126 Jan 24, 2024
b626783
Remove conda build for now
benoit9126 Jan 24, 2024
5569374
Update ci workflow
benoit9126 Jan 24, 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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Minimal Working Example to understand the problem
from roseau.load_flow import *

# Your code here
# Please do not add username/or password here
# Please do not add username, password or API keys here
```

**Expected behavior**
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
run: pipx install poetry

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
Expand All @@ -59,11 +59,13 @@ jobs:

- name: Test with pytest
run: |
poetry run pytest -n=auto --durations=25 --cov=roseau --cov-report html \
--cov-config pyproject.toml --cov-fail-under 75 roseau
poetry run pytest -vv -n=auto --durations=25 --cov-report html \
--cov-config pyproject.toml roseau
env:
ROSEAU_LOAD_FLOW_LICENSE_KEY: ${{ secrets.ROSEAU_LOAD_FLOW_LICENSE_KEY }}

- name: Archive code coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: code-coverage-report-${{ runner.os }}-python-${{ matrix.python-version }}
Expand Down
68 changes: 0 additions & 68 deletions .github/workflows/conda.yml

This file was deleted.

101 changes: 0 additions & 101 deletions .github/workflows/doc.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
with:
lfs: false
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.12"
- uses: pre-commit/[email protected]
11 changes: 4 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
exclude: ^.idea/|^conda/meta.yaml
exclude: ^.idea/|.vscode/|^conda/meta.yaml
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
- id: check-builtin-literals
- id: check-json
exclude: ^.vscode/
- id: check-merge-conflict
- id: check-toml
- id: check-yaml
Expand All @@ -17,7 +15,7 @@ repos:
hooks:
- id: poetry-check
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.6 # keep in sync with pyproject.toml
rev: v0.1.14 # keep in sync with pyproject.toml
hooks:
- id: ruff
types_or: [python, pyi, jupyter]
Expand All @@ -28,12 +26,11 @@ repos:
rev: 1.16.0
hooks:
- id: blacken-docs
entry: bash -c "blacken-docs -l 90 $(find doc/ -name '*.md')"
files: ^doc/.*\.md$
args: [-l 90]
additional_dependencies: [black==23.10.1] # keep in sync with black above
additional_dependencies: [black==23.12.1]
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
hooks:
- id: prettier
args: ["--print-width", "120"]
exclude: ^.vscode/
6 changes: 5 additions & 1 deletion .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"words": [
"abcn",
"absolufy",
"acsr",
"asarray",
"astype",
"bysource",
Expand Down Expand Up @@ -34,10 +35,13 @@
"susceptance",
"transfo",
"ureg",
"xlpe",
"yesqa"
],
// flagWords - list of words to be always considered incorrect
// This is useful for offensive words and common spelling errors.
// For example "hte" should be "the"
"flagWords": ["hte"]
"flagWords": [
"hte"
]
}
5 changes: 0 additions & 5 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
"recommendations": [
"charliermarsh.ruff",
"esbenp.prettier-vscode",
"ms-python.black-formatter",
"ms-python.python",
"ms-python.vscode-pylance",
],
"unwantedRecommendations": [
"ms-python.flake8", // We use ruff
"ms-python.isort" // We use ruff
]
}
8 changes: 6 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"python.testing.pytestEnabled": true,
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter",
"editor.defaultFormatter": "charliermarsh.ruff",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports.ruff": "explicit",
Expand All @@ -25,5 +25,9 @@
"[markdown][yaml][html][css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
}
},
// Json
"[json]": {
"editor.indentSize": 2,
},
}
18 changes: 9 additions & 9 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"options": { "cwd": "${workspaceFolder}" },
"presentation": {
"showReuseMessage": true,
"clear": true
"clear": true,
},
"tasks": [
{
Expand All @@ -15,13 +15,13 @@
"command": "make -C doc html",
"group": {
"kind": "build",
"isDefault": true
"isDefault": true,
},
"problemMatcher": [],
"presentation": {
"reveal": "silent",
"focus": true
}
"focus": true,
},
},
{
"label": "Open docs",
Expand All @@ -32,13 +32,13 @@
"reveal": "never",
"close": true,
"focus": false,
"panel": "dedicated"
"panel": "dedicated",
},
"group": {
"kind": "build",
"isDefault": true
"isDefault": true,
},
"isBackground": true
}
]
"isBackground": true,
},
],
}
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2023, Roseau Technologies
Copyright (c) 2018, Roseau Technologies

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Expand Down
Loading
Loading