Skip to content

Commit 0094157

Browse files
mrbean-bremenmrbean-bremen
committed
Prepare the MeVisLab thirdparty libraries for the 4.1.3 release
1 parent a0d9a61 commit 0094157

6 files changed

Lines changed: 224 additions & 3 deletions

File tree

‎.clang-format‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
---
2+
Language: Cpp
3+
# BasedOnStyle: LLVM
4+
AccessModifierOffset: -2
5+
AlignAfterOpenBracket: true
6+
AlignEscapedNewlinesLeft: false
7+
AlignOperands: true
8+
AlignTrailingComments: true
9+
AllowAllParametersOfDeclarationOnNextLine: true
10+
AllowShortBlocksOnASingleLine: false
11+
AllowShortCaseLabelsOnASingleLine: false
12+
AllowShortIfStatementsOnASingleLine: false
13+
AllowShortLoopsOnASingleLine: false
14+
AllowShortFunctionsOnASingleLine: None
15+
AlwaysBreakAfterDefinitionReturnType: false
16+
AlwaysBreakTemplateDeclarations: false
17+
AlwaysBreakBeforeMultilineStrings: false
18+
BreakBeforeBinaryOperators: None
19+
BreakBeforeTernaryOperators: true
20+
BreakConstructorInitializersBeforeComma: true
21+
BinPackParameters: true
22+
BinPackArguments: true
23+
ColumnLimit: 100
24+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
25+
ConstructorInitializerIndentWidth: 2
26+
DerivePointerAlignment: false
27+
ExperimentalAutoDetectBinPacking: false
28+
IndentCaseLabels: false
29+
IndentWrappedFunctionNames: false
30+
IndentFunctionDeclarationAfterType: true
31+
MaxEmptyLinesToKeep: 2
32+
KeepEmptyLinesAtTheStartOfBlocks: true
33+
NamespaceIndentation: All
34+
ObjCBlockIndentWidth: 2
35+
ObjCSpaceAfterProperty: false
36+
ObjCSpaceBeforeProtocolList: true
37+
PenaltyBreakBeforeFirstCallParameter: 19
38+
PenaltyBreakComment: 300
39+
PenaltyBreakString: 1000
40+
PenaltyBreakFirstLessLess: 120
41+
PenaltyExcessCharacter: 1000000
42+
PenaltyReturnTypeOnItsOwnLine: 80
43+
PointerAlignment: Right
44+
SpacesBeforeTrailingComments: 1
45+
Cpp11BracedListStyle: true
46+
Standard: Cpp11
47+
IndentWidth: 4
48+
TabWidth: 8
49+
UseTab: Never
50+
BreakBeforeBraces: Allman
51+
SpacesInParentheses: false
52+
SpacesInSquareBrackets: false
53+
SpacesInAngles: false
54+
SpaceInEmptyParentheses: false
55+
SpacesInCStyleCastParentheses: false
56+
SpaceAfterCStyleCast: false
57+
SpacesInContainerLiterals: true
58+
SpaceBeforeAssignmentOperators: true
59+
ContinuationIndentWidth: 4
60+
CommentPragmas: '^ IWYU pragma:'
61+
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
62+
SpaceBeforeParens: ControlStatements
63+
DisableFormat: false
64+
...

‎.editorconfig‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
indent_style = space
7+
insert_final_newline = true
8+
tab_width = 4
9+
trim_trailing_whitespace = true
10+
11+
[*.yml]
12+
tab_width = 2
13+
14+
[{Makefile, Makefile.am, Makefile.in,**.mk}]
15+
indent_style = tab
16+
17+
[*.{diff, patch}]
18+
charset = utf-8
19+
end_of_line = unset
20+
indent_style = unset
21+
insert_final_newline = unset
22+
trim_trailing_whitespace = unset
23+
24+
[**/sources/]
25+
charset = unset
26+
end_of_line = unset
27+
indent_size = unset
28+
indent_style = unset
29+
insert_final_newline = false
30+
tab_width = unset
31+
trim_trailing_whitespace = false

‎.gitignore‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
sources/
2+
src/
3+
test_package/__pycache__/
4+
test_package/build
5+
**/test_package/build*
6+
test_package.disabled/__pycache__/
7+
test_package.disabled/build/
8+
build.log
9+
CMakeUserPresets.json
10+
11+
conanbuildenv.sh
12+
conanrun.sh
13+
conanbuild.sh
14+
conanrunenv.sh
15+
16+
# IDEs
17+
.idea
18+
.vscode
19+
.project
20+
.pydevproject
21+
.settings/
22+
.ropeproject/
23+
## emacs
24+
*~
25+
26+
# Byte-compiled / optimized / DLL files / Cache
27+
__pycache__/
28+
*.pyc
29+
*.py[cod]
30+
*$py.class
31+
tmp/
32+
.DS_Store
33+
34+
# C extensions
35+
*.so
36+
37+
# Distribution / packaging
38+
.Python
39+
build/
40+
develop-eggs/
41+
dist/
42+
downloads/
43+
eggs/
44+
.eggs/
45+
lib/
46+
lib64/
47+
parts/
48+
sdist/
49+
var/
50+
wheels/
51+
*.egg-info/
52+
.installed.cfg
53+
*.egg
54+
MANIFEST
55+
56+
# PyInstaller
57+
# Usually these files are written by a python script from a template
58+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
59+
*.manifest
60+
*.spec
61+
62+
# Installer logs
63+
pip-log.txt
64+
pip-delete-this-directory.txt
65+
66+
# Unit test / coverage reports
67+
htmlcov/
68+
.tox/
69+
.coverage
70+
.coverage.*
71+
.cache
72+
nosetests.xml
73+
coverage.xml
74+
*.cover
75+
.hypothesis/
76+
.pytest_cache/
77+
78+
# pyenv
79+
.python-version
80+
81+
# Environments
82+
.env
83+
.venv
84+
env/
85+
venv/
86+
ENV/
87+
env.bak/
88+
venv.bak/
89+
distfiles/
90+
docker/
91+
qa.log

‎.pre-commit-config.yaml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
exclude: 'sources/.*|.*.patch'
2+
3+
repos:
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
5+
rev: v4.6.0
6+
hooks:
7+
- id: check-added-large-files
8+
- id: check-ast
9+
- id: check-case-conflict
10+
- id: check-json
11+
- id: check-merge-conflict
12+
- id: check-yaml
13+
- id: end-of-file-fixer
14+
- id: mixed-line-ending
15+
- id: requirements-txt-fixer
16+
- id: trailing-whitespace
17+
18+
- repo: https://github.com/psf/black
19+
rev: 24.8.0
20+
hooks:
21+
- id: black
22+
args: [--line-length, '120']
23+
24+
- repo: https://github.com/PyCQA/autoflake
25+
rev: v2.3.1
26+
hooks:
27+
- id: autoflake
28+
args: [--in-place, --remove-unused-variables, --remove-all-unused-imports]
29+
30+
- repo: https://github.com/pre-commit/mirrors-clang-format
31+
rev: v18.1.8
32+
hooks:
33+
- id: clang-format
34+
types_or: [c++, c, cuda]

‎recipes/mimalloc/conanfile.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
class ConanRecipe(ConanFile):
1010
name = "mimalloc"
11-
version = "2.2.3"
11+
# no update because of MLAB-5754 and MLAB-5300; only update if these are fixed
12+
version = "2.1.7"
1213
license = "MIT"
1314
homepage = "https://github.com/microsoft/mimalloc"
1415
description = "mimalloc is a compact general purpose allocator with excellent performance"
@@ -25,7 +26,7 @@ def layout(self):
2526
def source(self):
2627
get(
2728
self,
28-
sha256="ac5ba94172b60823215a22b87ae923c5b05ef0cdd9047df2a832c16da02a6447",
29+
sha256="0eed39319f139afde8515010ff59baf24de9e47ea316a315398e8027d198202d",
2930
url=f"https://github.com/microsoft/mimalloc/archive/v{self.version}.tar.gz",
3031
strip_root=True,
3132
)

‎recipes/python_addons/pillow/conanfile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class ConanRecipe(ConanFile):
99
name = "pillow"
1010
version = "11.2.1"
11-
homepage = "https://python-pillow.org/"
11+
homepage = "https://python-pillow.github.io/"
1212
description = "Python Imaging Library (Fork)"
1313
license = "HPND"
1414
python_requires = "python_package/[>=1.0.0]"

0 commit comments

Comments
 (0)