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.

Sign up for GitHub

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

Jump to bottom

Backports release 29 #3735

Merged
merged 7 commits into from
Aug 3, 2023
Merged

Backports release 29 #3735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f359ecb
Merge pull request #3699 from vicentebolea/revert-normalize-eol
vicentebolea Jul 18, 2023
0f2bdf5
Merge pull request #3687 from dmitry-ganyushin/i3646-mult-macos
eisenhauer Jul 4, 2023
d9bd750
Merge pull request #3712 from ornladios/dependabot/pip/docs/certifi-2…
vicentebolea Jul 25, 2023
390b762
Merge pull request #3704 from ornladios/dependabot/pip/docs/pygments-…
vicentebolea Jul 20, 2023
916cdf9
Merge pull request #3698 from vicentebolea/add-gitattribute-file
vicentebolea Jul 18, 2023
eb3609a
Merge pull request #3697 from ornladios/dependabot/pip/docs/cryptogra…
vicentebolea Jul 18, 2023
2cfe548
Merge pull request #3676 from pnorbert/c_version2
vicentebolea Aug 2, 2023
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
22 changes: 22 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.cxx text
*.h text
*.hxx text
*.tcc text
*.cu text
*.c text
*.h text
*.py text
*.f90 text
*.F90 text
*.sh text

*.cmake whitespace=tab-in-indent
*.md whitespace=tab-in-indent whitespace=-blank-at-eol conflict-marker-size=79
*.rst whitespace=tab-in-indent conflict-marker-size=79
*.txt whitespace=tab-in-indent
*.xml whitespace=tab-in-indent
2 changes: 2 additions & 0 deletions cmake/ADIOSFunctions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,12 @@ function(GenerateADIOSHeaderConfig)
")
if(ADIOS2_HAVE_${OPT})
set(ADIOS2_HAVE_${OPT_UPPER} 1)
string(APPEND ADIOS2_CONFIG_FEATURE_LIST "\"${OPT_UPPER}\",")
else()
set(ADIOS2_HAVE_${OPT_UPPER})
endif()
endforeach()
string(APPEND ADIOS2_CONFIG_FEATURE_LIST "nullptr")

configure_file(
${ADIOS2_SOURCE_DIR}/source/adios2/common/ADIOSConfig.h.in
Expand Down
6 changes: 3 additions & 3 deletions docs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Babel==2.11.0
blockdiag==3.0.0
breathe==4.33.0
brotlipy==0.7.0
certifi==2022.12.7
certifi==2023.7.22
cffi==1.15.1
charset-normalizer==2.1.1
colorama==0.4.6
cryptography==41.0.0
cryptography==41.0.2
docutils==0.17
funcparserlib==1.0.1
idna==3.4
Expand All @@ -21,7 +21,7 @@ packaging==22.0
Pillow==9.4.0
pip==22.3.1
pycparser==2.21
Pygments==2.14.0
Pygments==2.15.0
pyOpenSSL==23.0.0
PySocks==1.7.1
pytz==2022.7
Expand Down
Loading
Loading