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

Spelling fixes #403

Merged
merged 9 commits into from
Aug 14, 2021
Merged

Spelling fixes #403

merged 9 commits into from
Aug 14, 2021

Conversation

gsjaardema
Copy link
Contributor

Fix several incorrectly spelled words...

Command used was codespell -i 3 -w -L inout,ned,aci which resulted in few false-positives.

@gsjaardema gsjaardema mentioned this pull request Aug 3, 2021
Closed
@gsjaardema
Copy link
Contributor Author

Fixes #404

@bartlettroscoe
Replace 'entry file' with 'entire file'
c35972d 
Spell checker codespell  selected the wrong word replacement.
bartlettroscoe
bartlettroscoe reviewed Aug 6, 2021
View reviewed changes
Copy link
Member

@bartlettroscoe bartlettroscoe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gsjaardema, thanks for posting this and taking the time to do this. I did not know about the tool codespell but it seems pretty useful. I will see about installing it and see if I can integrate it into my development processes.

The only issue I see is that it looks like this was run on an older version of TriBITS 'master' and some of the files have changed names and have been moved around. Therefore, I may need to push a few more commits to this branch to address these things to make sure.

test/ci_support/CMakeCache.large.txt Show resolved Hide resolved
common_tools/cloc/cloc.pl Show resolved Hide resolved
test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt Outdated Show resolved Hide resolved
tribits/core/package_arch/TribitsAddTest.cmake Show resolved Hide resolved
tribits/doc/README.DEPENDENCIES Outdated Show resolved Hide resolved
tribits/doc/developers_guide/generate-dev-guide.sh Outdated Show resolved Hide resolved
@marcinwrobel1986 marcinwrobel1986 mentioned this pull request Aug 12, 2021
Merged
bartlettroscoe added a commit to gsjaardema/TriBITS that referenced this pull request Aug 13, 2021
@bartlettroscoe
Merge remote-tracking branch 'github/master' into 403-spelling-fixes (T…
17a5ccf 
…riBITSPub#403)

I fixed straightforward conflicts in the files:

* tribits/core/package_arch/TribitsGlobalMacros.cmake
* tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake
* tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst
bartlettroscoe added a commit to gsjaardema/TriBITS that referenced this pull request Aug 13, 2021
@bartlettroscoe
Remove files that no longer exist that got added through PR branch Tr…
edf2bbc 
…iBITSPub#403

As part of the conflict resolution process these files got added back by
accident.

The spell check must have been run on an older version of 'master' (or another
branch was on the side got merged to 'master' before this branch got created
off 'master').
bartlettroscoe added a commit to gsjaardema/TriBITS that referenced this pull request Aug 13, 2021
@bartlettroscoe
Merge remote-tracking branch 'github/master' into 403-spelling-fixes (T…
2a8e589 
…riBITSPub#403)

I removed the files:

* tribits/doc/README.DEPENDENCIES
* tribits/doc/developers_guide/generate-dev-guide.sh

that must have got added back accidentally in an earlier merge resolution
step.

I fixed straightforward conflicts in the files:

* tribits/core/package_arch/TribitsGlobalMacros.cmake
* tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake
* tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst
@bartlettroscoe
Merge remote-tracking branch 'github/master' into 403-spelling-fixes (T…
cd4bb0b 
…riBITSPub#403)

I removed the files:

* tribits/doc/README.DEPENDENCIES
* tribits/doc/developers_guide/generate-dev-guide.sh

that must have got added back accidentally in an earlier merge resolution
step.

I fixed straightforward conflicts in the files:

* tribits/core/package_arch/TribitsGlobalMacros.cmake
* tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake
* tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst
@bartlettroscoe bartlettroscoe merged commit 77dcbe4 into TriBITSPub:master Aug 14, 2021
bartlettroscoe added a commit to bartlettroscoe/Trilinos that referenced this pull request Sep 4, 2021
@bartlettroscoe
Merge branch 'tribits_github_snapshot' into tribits-snapshot-2021-09-03
3c77011 
Brings in numerous refactorings to TriBITS over the last 3 months, but there
should be no breaks in backward compatibility.  Almost every file in TriBITS
is changed due to the lower-casing of command, macro and function names in PR
TriBITSPub/TriBITS#379.  But the main driver for this snapshot is to bring in
the change in PR TriBITSPub/TriBITS#413 that should make it so that Kokkos
INTERFACE_COMPILE_OPTIONS get propagated to downstream targets in TriBITS and
therefore to external customers through installed <Package>Config.cmake files
and IMPORTED targets.  I should have done several snapshots in the last few
months and not done a big snapshot like this (but I have been testing with
Trilinos locally along the way).

Overall, this merge brings in changes from a bunch of TriBITS PRs including
(from most recent):

* TriBITSPub/TriBITS#413: Change internal TriBITS target_link_libraries() to
  PUBLIC (TriBITSPub/TriBITS#299) component: core type: enhancement

* TriBITSPub/TriBITS#410: Upgrade from cmake 3.21.0 to 3.21.2
  (TriBITSPub/TriBITS#363, TriBITSPub/TriBITS#394)

* TriBITSPub/TriBITS#394: DO NOT MERGE: Show TriBITS test failures with CMake
  3.21.0 that don't occur with CMake 3.17.5 (TriBITSPub/TriBITS#363)

* TriBITSPub/TriBITS#409: Add getTestDictStatusField() to handle empty
  'status' field (SESW-383) component: ci_support type: enhancement

* TriBITSPub/TriBITS#408: Deal with spaces in CDash url parts (SESW-383)
  component: ci_support type: enhancement

* TriBITSPub/TriBITS#403: Spelling fixes

* TriBITSPub/TriBITS#407: Move tribits_get_build_url_and_write_to_file() to
  stand-alone module (TriBITSPub/TriBITS#154) component: ctest_driver type:
  enhancement

* TriBITSPub/TriBITS#388: Fixing typos (TriBITSPub/TriBITS#377)

* TriBITSPub/TriBITS#406: Fix tribits_ctest_driver() package-by-package mode
  for CMake 3.19+ (TriBITSPub/TriBITS#363, TriBITSPub/TriBITS#394) component:
  ctest_driver type: bug

* TriBITSPub/TriBITS#401: Improve GitHub Actions and CDash integration
  (TriBITSPub/TriBITS#154) type: enhancement

* TriBITSPub/TriBITS#366: CI: draft action yaml

* TriBITSPub/TriBITS#402: Revert some incorrect uppercase->lowercase changes

* TriBITSPub/TriBITS#387: Build and deploy TriBITS documentation with Sphinx
  (TriBITSPub/TriBITS#386) component: documentation type: enhancement

* TriBITSPub/TriBITS#398: Deal with pr null in not preprending build name
  (TriBITSPub/TriBITS#363) type: bug

* TriBITSPub/TriBITS#396: Send PR results to 'Pull Request' CDash group and
  add PR ID to build names (TriBITSPub/TriBITS#363) type: enhancement

* TriBITSPub/TriBITS#397: Print the ninja path and version
  (TriBITSPub/TriBITS#363)

* TriBITSPub/TriBITS#393: GitHub Actions based testing for TriBITS
  (TriBITSPub/TriBITS#363) type: enhancement

* TriBITSPub/TriBITS#389: TriBITS CI testing with GitHub Actions
  (TriBITSPub/TriBITS#363) type: enhancement

* TriBITSPub/TriBITS#392: Fix broken tests for non-Fortran and CMake 3.21
  builds (TriBITSPub/TriBITS#363) component: core

* TriBITSPub/TriBITS#391: Fix up build_docs.sh for Sphinx doc generation
  (TriBITSPub/TriBITS#386) component: documentation type: enhancement

* TriBITSPub/TriBITS#390: Add test for doc generation and fix usage of Python3
  component: documentation type: bug

* TriBITSPub/TriBITS#385: Replace last few references to
  TribitsDevelopersGuide.html (TriBITSPub/TriBITS#381) component:
  documentation type: enhancement

* TriBITSPub/TriBITS#384: Split TribitsDevelopersGuide.* into
  TribitsUsersGuide.* and TribitsMaintainersGuide.* (TriBITSPub/TriBITS#381)
  component: documentation type: enhancement

* TriBITSPub/TriBITS#383: Remove endfunction(<string>) and endmacro(<string>)
  (TriBITSPub/TriBITS#274, TriBITSPub/TriBITS#382) component: common_tpls
  type: bug

* TriBITSPub/TriBITS#380: More package-arch data-structure documentation
  updates (TriBITSPub/TriBITS#63) component: documentation type: enhancement

* TriBITSPub/TriBITS#379: Convert TriBITS to lower-case CMake command, macro,
  and function names (TriBITSPub/TriBITS#274)

The following files were conflicting where I went with what is on the Trilinos
'develop' branch:

* cmake/tribits/common_tpls/FindTPLBLAS.cmake
* cmake/tribits/common_tpls/FindTPLLAPACK.cmake
* cmake/tribits/common_tpls/FindTPLNetcdf.cmake

(It looks like the above changes never made it back into TriBITS proper.  The
conflicts were due to the case changes in cmake command calls in these files
due to TriBITSPub/TriBITS#379.)

There was also a conflict in the file:

* cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in

I looked at that one carefully and I think that may have been due to fixes on
both sides and then the case changes from TriBITSPub/TriBITS#379.
@bartlettroscoe bartlettroscoe mentioned this pull request Sep 4, 2021
Merged
bartlettroscoe added a commit to bartlettroscoe/TriBITS that referenced this pull request Oct 12, 2021
@bartlettroscoe
Fix spelling of RST hyperlink to match previous change in PR TriBITSP…
4d88007 
…ub#403

This hyperlink spelling did not git fixed when the anchor got fixed in commit
c716a74.  This link was broken in the RST
documentation.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bartlettroscoe bartlettroscoe bartlettroscoe left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gsjaardema @bartlettroscoe