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.

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

fix: change Total S.A. to TotalEnergies #3487

Merged
merged 7 commits into from
Dec 11, 2024
Merged

Conversation

rrsettgast
Copy link
Member

@rrsettgast rrsettgast commented Dec 9, 2024

This PR fixes some copyright issues. since it touches so many files, I will bypass branch protections once @herve-gross approves.

GEOS-DEV/PVTPackage#52

Copy link
Contributor

@herve-gross herve-gross left a comment

Choose a reason for hiding this comment

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

Thanks for the change!

RELEASE Outdated Show resolved Hide resolved
RELEASE_NOTES.md Outdated Show resolved Hide resolved
* Copyright (c) 2018-2024 Lawrence Livermore National Security LLC
* Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
* Copyright (c) 2018-2024 TotalEnergies
* Copyright (c) 2019- GEOS/GEOSX Contributors
Copy link
Contributor

Choose a reason for hiding this comment

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

just curious - why this header is different across the files?
there is Chevron in the file below and above but not here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Probably because someone created a file in a PR using the old header, then when I changed the header, they didn't update their copy, then it was merged into develop, then that header was copied.....or I just messed up.

Copy link
Member Author

Choose a reason for hiding this comment

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

@paveltomin This should be fixed. If you happen to see anything else while you are randomly reviewing the 2000 files let me know 😁

Copy link
Contributor

@untereiner untereiner left a comment

Choose a reason for hiding this comment

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

Hi! I am wondering, any reason not to use the spdx identifier for copyright ? Like the one for licensing.
For example SPDX-FileCopyrightText: 2018-2024 TotalEnergies

@rrsettgast
Copy link
Member Author

Hi! I am wondering, any reason not to use the spdx identifier for copyright ? Like the one for licensing. For example SPDX-FileCopyrightText: 2018-2024 TotalEnergies

Never really considered it. No reasons I can think of besides that it is ugly. What are the reasons to include the identifier? Is it not already obvious what the copyright is from the current header?

@untereiner
Copy link
Contributor

untereiner commented Dec 10, 2024

  1. For sources files I mean it is kind of standardized, similar to the license identifier and machine readable if needed.

Example for Base.hpp
Now:

/*
 * ------------------------------------------------------------------------------------------------------------
 * SPDX-License-Identifier: LGPL-2.1-only
 *
 * Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
 * Copyright (c) 2018-2024 TotalEnergies
 * Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
 * Copyright (c) 2023-2024 Chevron 
 * Copyright (c) 2019-     GEOS/GEOSX Contributors
 *
 * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.
 * ------------------------------------------------------------------------------------------------------------
 */

After the change

/*
 * ------------------------------------------------------------------------------------------------------------
 * SPDX-License-Identifier: LGPL-2.1-only
 * SPDX-FileCopyrightText: (c) 2016-2024 Lawrence Livermore National Security LLC
 * SPDX-FileCopyrightText: (c) 2018-2024 TotalEnergies
 * SPDX-FileCopyrightText: (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
 * SPDX-FileCopyrightText: (c) 2023-2024 Chevron 
 * SPDX-FileCopyrightText: (c) 2019-     GEOS/GEOSX Contributors
 *
 * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.
 * ------------------------------------------------------------------------------------------------------------
 */
  1. Also after digging a bit I found that using year ranges is useless. It could simplify one annual chore.

  2. Do we need to keep GEOSX in GEOS/GEOSX Contributors ? Since it is renamed GEOS ?

@rrsettgast rrsettgast added ci: run CUDA builds Allows to triggers (costly) CUDA jobs ci: run integrated tests Allows to run the integrated tests in GEOS CI ci: run code coverage enables running of the code coverage CI jobs labels Dec 10, 2024
Copy link

codecov bot commented Dec 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.88%. Comparing base (7e2c33b) to head (3b6106b).
Report is 1 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3487      +/-   ##
===========================================
- Coverage    56.89%   56.88%   -0.01%     
===========================================
  Files         1154     1154              
  Lines        99885    99885              
===========================================
- Hits         56825    56823       -2     
- Misses       43060    43062       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@rrsettgast rrsettgast merged commit 651c600 into develop Dec 11, 2024
25 checks passed
@rrsettgast rrsettgast deleted the cleanup/Copyright branch December 11, 2024 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci: run code coverage enables running of the code coverage CI jobs ci: run CUDA builds Allows to triggers (costly) CUDA jobs ci: run integrated tests Allows to run the integrated tests in GEOS CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants