Skip to content

Commit

Permalink
Reformatted the code according to python standards
Browse files Browse the repository at this point in the history
Reformating according to pep8 rules

Proposed architecture for new code

black + isort check

Added models of rocket nose components

Attempt at modelling components by mesh

Numerical implementation of some components

Added test for parabolic nose,  new code structure

Calculs on Cn, Cd and CPA, added some connexions

Updated aerodynamic forces and moments computation

 .py files, finished aerodynamic computations

Added pressure, density and gravity models

Rocket with reservatory, constant mass

Added variable mass

Added center of gravity computation

Added ground reservatory and pipe

Added unit tests

Added class folders and mission drivers

Doubles in same folder, organised modules

Removed python template folder (added by mistake)

Organized files, unique tank class, corrected name

fix pytest error
add configuration to init pytest in cwd

add missing conda deps

use a standard gitignore file

black + isort

Corrected pipe design, added sequences

Changed variable names

Modular ground class, pre-commit, typos

pre-commit

Bug fixes

Changed pre-commit files

Added pipe switch

Bug fixes

pre-commit

Changes proposed in the PR

Changes as discussed in the PR

pre-commit on test_sequences

Documentation + removed engine switch

Changed w_out_temp to w_out_max
  • Loading branch information
luca7084 authored and adriendelsalle committed Jul 5, 2023
1 parent 3896222 commit 03d889e
Show file tree
Hide file tree
Showing 127 changed files with 1,334 additions and 5,715 deletions.
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[flake8]
max-line-length=100
extend-ignore=E203,D104,D100,I004
exclude=*/tests/*,docs/source/tools/*
43 changes: 43 additions & 0 deletions .github/workflows/commit-verification.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Commit check

on: [push]

jobs:
files-check:
runs-on: ubuntu-latest
strategy:
max-parallel: 5

steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3

- name: Add dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Run precommit
run: |
pre-commit run --all-files
run-test:
runs-on: ubuntu-latest
strategy:
max-parallel: 5

steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3

- name: Add dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Test with pytest
run: |
pytest
256 changes: 253 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,253 @@
__pycache__
.DS_Store
.ipynb_checkpoints
# Created by https://www.gitignore.io/api/git,linux,macos,python,windows,pycharm,jupyternotebook

### Git ###
*.orig

### JupyterNotebook ###
.ipynb_checkpoints
*/.ipynb_checkpoints/*

# Remove previous ipynb_checkpoints
# git rm -r .ipynb_checkpoints/
#
### Linux ###
*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

### macOS ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### VScode ###
.vscode/*

### PyCharm ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

.idea/*

# User-specific stuff:
.idea/**/*.iml
.idea/**/workspace.xml
.idea/**/vcs.xml
.idea/**/tasks.xml
.idea/**/misc.xml
.idea/**/modules.xml
.idea/dictionaries

# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml

# Gradle:
.idea/**/gradle.xml
.idea/**/libraries

# CMake
cmake-build-debug/

# Mongo Explorer plugin:
.idea/**/mongoSettings.xml

## File-based project format:
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Ruby plugin and RubyMine
/.rakeTasks

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### PyCharm Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
.idea/sonarlint

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*/__pycache__/*
**.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
.pytest_cache/
nosetests.xml
coverage.xml
*.cover
.hypothesis/

# Translations
*.mo
*.pot

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule.*

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/

### Windows ###
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# Cosapp Systems representations
**.html

# End of https://www.gitignore.io/api/git,linux,macos,python,windows,pycharm,jupyternotebook
7 changes: 7 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[settings]
line_length=100
known_third_party=pybind11,conda,conda_env
multi_line_output=3
include_trailing_comma=True
force_grid_wrap=0
use_parentheses=True
52 changes: 52 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
repos:
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
args: [--safe, --quiet]
- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
hooks:
- id: blacken-docs
additional_dependencies: [black==22.3.0]
- repo: https://github.com/pycqa/pydocstyle
rev: 4.0.0
hooks:
- id: pydocstyle
args: [--ignore, "D100,D104,D107,D102,D202,D203,D213,D413,D416"]
exclude: tests
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: fix-encoding-pragma
args: [--remove]
- id: check-yaml
exclude: tests|conda.recipe/*
- id: check-toml
- id: check-json
- id: check-merge-conflict
- id: pretty-format-json
args: [--autofix]
- id: debug-statements
language_version: python3
- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.10.1
hooks:
- id: isort
exclude: tests/data
- repo: https://github.com/pycqa/flake8
rev: 3.9.2
hooks:
- id: flake8
language_version: python3
additional_dependencies:
- flake8-typing-imports==1.12.0
- flake8-builtins==1.5.3
- flake8-bugbear==22.1.11
- flake8-isort==4.1.1
- repo: https://github.com/kynan/nbstripout
rev: 0.5.0
hooks:
- id: nbstripout
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Luca Rodrigues Miguel
File renamed without changes.
6 changes: 6 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Copyright (c) 2022, twiinIT - All Rights Reserved

Unauthorized copying and/or distribution of this source-code, via any medium
is strictly prohibited without the express permission of twiinIT.

Proprietary and confidential.
7 changes: 7 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
include AUTHORS.md
include CHANGELOG.md
include README.md

recursive-exclude tests *
recursive-exclude * __pycache__
recursive-exclude * *.py[co]
Loading

0 comments on commit 03d889e

Please sign in to comment.