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 #4909 - Update license to new format #4910

Merged
merged 3 commits into from
Jun 20, 2023
Merged

Fix #4909 - Update license to new format #4910

merged 3 commits into from
Jun 20, 2023

Conversation

jmarrec
Copy link
Collaborator

@jmarrec jmarrec commented Jun 6, 2023

Pull request overview

Pull Request Author

  • Model API Changes / Additions
  • Any new or modified fields have been implemented in the EnergyPlus ForwardTranslator (and ReverseTranslator as appropriate)
  • Model API methods are tested (in src/model/test)
  • EnergyPlus ForwardTranslator Tests (in src/energyplus/Test)
  • If a new object or method, added a test in NREL/OpenStudio-resources: Add Link
  • If needed, added VersionTranslation rules for the objects (src/osversion/VersionTranslator.cpp)
  • Verified that C# bindings built fine on Windows, partial classes used as needed, etc.
  • All new and existing tests passes
  • If methods have been deprecated, update rest of code to use the new methods

Labels:

  • If change to an IDD file, add the label IDDChange
  • If breaking existing API, add the label APIChange
  • If deemed ready, add label Pull Request - Ready for CI so that CI builds your PR

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • Code Style, strip trailing whitespace, etc.
  • All related changes have been implemented: model changes, model tests, FT changes, FT tests, VersionTranslation, OS App
  • Labeling is ok
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified

@jmarrec jmarrec added component - Workflow Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. labels Jun 6, 2023
@jmarrec jmarrec self-assigned this Jun 6, 2023
Comment on lines +10 to +19
ROOT_DIR = File.absolute_path(File.join(File.dirname(__FILE__), "../../"))
LICENSE_PATH = File.join(ROOT_DIR, 'LICENSE.md')


license_lines = File.readlines(LICENSE_PATH)
# Now with short version
license_lines = [
"OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.\n",
"See also https://openstudio.net/license\n"
]
Copy link
Collaborator Author

@jmarrec jmarrec Jun 6, 2023

Choose a reason for hiding this comment

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

New short license here. Shouldn't change.

the https://openstudio.net/license is a dead link currently though

Comment on lines +40 to +51
exceptions = [
File.join(ROOT_DIR, "ci"),
File.join(ROOT_DIR, "developer"),
File.join(ROOT_DIR, "src/nano/"),
File.join(ROOT_DIR, "src/polypartition/"),
"mainpage.hpp",
"empty.hpp"
]

# glob for hpp and cpp
files = Dir.glob(basepath + "/src/**/*.[ch]pp")
files.concat Dir.glob(basepath + "/ruby/**/*.[ch]pp")
files.concat Dir.glob(basepath + "/src/**/*.cxx.in")
files.concat Dir.glob(basepath + "/src/**/*.tmp")
files = Dir.glob(File.join(ROOT_DIR, "**/*.[ch]pp"))
files += Dir.glob(File.join(ROOT_DIR, "**/*.[ch]xx.in"))
Copy link
Collaborator Author

@jmarrec jmarrec Jun 6, 2023

Choose a reason for hiding this comment

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

Clean up the code a bit to match the new structure. I'm grabbing files and folder that were excluded before (like the python/ one). I'm also adding license to python/**/*.py too

LICENSE.md Outdated
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Modif here

copyright.txt Outdated
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

And here (also got the latest E+ license from github)

@jmarrec jmarrec force-pushed the 4909_new_license branch from a834103 to 7662d79 Compare June 6, 2023 08:36
@jmarrec jmarrec requested review from tijcolem and kflemin June 12, 2023 09:06
@tijcolem
Copy link
Collaborator

@jmarrec This is great. Going to make the copyright maintenance so much easier.

@tijcolem tijcolem merged commit 9812050 into develop Jun 20, 2023
@tijcolem tijcolem deleted the 4909_new_license branch June 20, 2023 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component - Workflow Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update license to new format
3 participants