Skip to content

Commit

Permalink
Merge pull request #18 from EnergieID/develop
Browse files Browse the repository at this point in the history
Add Baseload analysis
  • Loading branch information
JrtPec authored Jan 24, 2025
2 parents bfcc45b + 46cddaa commit 5252347
Show file tree
Hide file tree
Showing 35 changed files with 166,228 additions and 1,428 deletions.
5 changes: 4 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"features": {},
"postCreateCommand": "zsh -l .devcontainer/post-install.sh",
// "postStartCommand": "",
"workspaceMount": "source=${localWorkspaceFolder},target=/workspaces/${localWorkspaceFolderBasename},type=bind,consistency=cached",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
"remoteUser": "root",
"customizations": {
"vscode": {
Expand All @@ -15,7 +17,8 @@
"visualstudioexptteam.vscodeintellicode",
"esbenp.prettier-vscode",
"GitHub.vscode-pull-request-github",
"mhutchie.git-graph"
"mhutchie.git-graph",
"ms-toolsai.jupyter"
],
"settings": {
"python.pythonPath": "/usr/local/bin/python",
Expand Down
16 changes: 7 additions & 9 deletions .devcontainer/post-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@ poetry install
# Install pre-commit hooks
pre-commit install

# Install Node.js and Pure prompt
# nvm install node
# npm install --global pure-prompt
# Install ZSH plugins
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting

# # Configure Zsh to use Pure prompt
# "autoload -U promptinit; promptinit; prompt pure"
# "echo "autoload -U promptinit; promptinit; prompt pure" >> ~/.zshrc"
# Update .zshrc to enable plugins
sed -i 's/plugins=(git)/plugins=(git zsh-autosuggestions zsh-syntax-highlighting)/' ~/.zshrc

# # Uncomment the following line to install zsh-syntax-highlighting
# # sudo apt-get install zsh-syntax-highlighting
# # echo "source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" >> ${ZDOTDIR:-$HOME}/.zshrc
# Source the updated configuration
source ~/.zshrc
21 changes: 21 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Set default behavior to LF
* text=auto eol=lf

# Explicitly declare files that should always use LF
*.py text eol=lf
*.json text eol=lf
*.md text eol=lf
*.yaml text eol=lf
*.yml text eol=lf
*.sh text eol=lf
*.ndjson text eol=lf
*.html text eol=lf
*.toml text eol=lf
*.txt text eol=lf
*.dat text eol=lf
*.lock text eol=lf

# Denote all files that are truly binary and should not be modified
*.png binary
*.jpg binary
*.gif binary
1 change: 0 additions & 1 deletion .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ jobs:
run: python -m build
- name: Publish package
uses: pypa/gh-action-pypi-publish@release/v1

2 changes: 1 addition & 1 deletion .github/workflows/ruff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: chartboost/ruff-action@v1
- uses: chartboost/ruff-action@v1
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,5 @@ secrets.json
private_data/
figures/
temp_notebooks/
*.pkl
*.pkl
vis/
29 changes: 24 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,27 @@ repos:
- id: pyupgrade
args: [--py311-plus]

# - repo: https://github.com/pre-commit/mirrors-mypy
# rev: "" # Use the sha / tag you want to point at
# hooks:
# - id: mypy
# args: [--strict, --ignore-missing-imports]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
hooks:
- id: mixed-line-ending
args: [--fix=lf] # Force LF line endings
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-added-large-files

- repo: local
hooks:
- id: poetry-export-prod
name: Poetry export production requirements
entry: poetry export -f requirements.txt --output requirements.txt --without-hashes
language: system
pass_filenames: false
files: ^(pyproject\.toml|poetry\.lock)$
- id: poetry-export-dev
name: Poetry export development requirements
entry: poetry export -f requirements.txt --output requirements-dev.txt --without-hashes --only dev
language: system
pass_filenames: false
files: ^(pyproject\.toml|poetry\.lock)$
5 changes: 3 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"python.analysis.typeCheckingMode": "basic"
}
"python.analysis.typeCheckingMode": "basic",
"remote.autoForwardPortsFallback": 0
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

Open Source Python library for energy data analytics and simulations

[*more info for developers*](DEVELOPERS.md)
[*more info for developers*](DEVELOPERS.md)
Loading

0 comments on commit 5252347

Please sign in to comment.