Skip to content

Commit

Permalink
Squashed 'resources/hpxml-measures/' changes from eb585f46ff52..3b131…
Browse files Browse the repository at this point in the history
…58069c8

3b13158069c8 Fix rubocop
81b0051fa1d3 Bump to rc2.
e4c017a4130a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os380
4dcef1411aeb Oops, still need this logic.
1531eac7e995 Use develop until rc2 is available.
184778d4e443 Removed get_arguments_values method; now using runner.getArgumentValues per @joseph-robertson. Reduced BuildResidentialHPXML measure by 750 LOC.
577a64b02bad Fix UrlResolver
c03390a0e166 Try rc1
3a7b0d68e0ae Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os380
4e7dfc8109ff Add matrix gem.
b152a771c423 Update require.
6cdbb255f18c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os380
c01039eafe23 Updates for ruby 3.2.2 [ci skip]
288b35ff3e63 This regression was fixed in EnergyPlus, can revert to original code.
b4f2ac219bb3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os380
8f5d22f85e1f Fix CI errors
5ad6f814c5ea Merge branch 'os380' of https://github.com/NREL/OpenStudio-HPXML into os380
3d92e2525a32 Update measure xml file.
39b18534c404 Merge branch 'master' into os380
48f0a9fd91e3 These shouldn't be needed anymore due to recent OS changes [ci skip]
ed7c7b12245f Try develop
3a15ccd8d4b0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os380
e61a7ef89aba Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os380
fa0fa33e5be4 Update Changelog, docs. [ci skip]
299c27773560 First pass. [ci skip]

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 3b13158069c88c6877bd43ec547ec52d8e890421
  • Loading branch information
joseph-robertson committed May 7, 2024
1 parent c371b34 commit 13eb574
Show file tree
Hide file tree
Showing 24 changed files with 739 additions and 1,479 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
run-unit-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0
image: docker://nrel/openstudio:dev-3.8.0-rc2
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
run-workflow1-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0
image: docker://nrel/openstudio:dev-3.8.0-rc2
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -91,7 +91,7 @@ jobs:
run-workflow2-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0
image: docker://nrel/openstudio:dev-3.8.0-rc2
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -120,8 +120,8 @@ jobs:
- name: Install software and run test
shell: pwsh
run: |
$env:OS_VERSION="3.7.0"
$env:OS_SHA="d5269793f1"
$env:OS_VERSION="3.8.0-rc2"
$env:OS_SHA="af997f4fef"
Invoke-WebRequest -OutFile Windows.tar.gz -URI "https://github.com/NREL/OpenStudio/releases/download/v${env:OS_VERSION}/OpenStudio-${env:OS_VERSION}+${env:OS_SHA}-Windows.tar.gz"
tar -xzf Windows.tar.gz
& .\OpenStudio-${env:OS_VERSION}+${env:OS_SHA}-Windows\bin\openstudio.exe workflow\run_simulation.rb -x workflow\sample_files\base.xml --hourly ALL --add-component-loads --add-stochastic-schedules
Expand Down
114 changes: 113 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Style/HashTransformKeys:
Enabled: true
Style/HashTransformValues:
Enabled: true
Gemspec/DateAssignment:
Gemspec/DeprecatedAttributeAssignment:
Enabled: true
Layout/SpaceBeforeBrackets:
Enabled: true
Expand Down Expand Up @@ -72,4 +72,116 @@ Style/RedundantArgument:
Style/StringChars:
Enabled: true
Style/SwapValues:
Enabled: true
Gemspec/DevelopmentDependencies: # new in 1.44
Enabled: true
Gemspec/RequireMFA: # new in 1.23
Enabled: true
Layout/LineContinuationLeadingSpace: # new in 1.31
Enabled: true
Layout/LineContinuationSpacing: # new in 1.31
Enabled: true
Layout/LineEndStringConcatenationIndentation: # new in 1.18
Enabled: true
Lint/AmbiguousOperatorPrecedence: # new in 1.21
Enabled: true
Lint/AmbiguousRange: # new in 1.19
Enabled: true
Lint/ConstantOverwrittenInRescue: # new in 1.31
Enabled: true
Lint/DuplicateMagicComment: # new in 1.37
Enabled: true
Lint/DuplicateMatchPattern: # new in 1.50
Enabled: true
Lint/EmptyInPattern: # new in 1.16
Enabled: true
Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
Enabled: true
Lint/NonAtomicFileOperation: # new in 1.31
Enabled: true
Lint/RefinementImportMethods: # new in 1.27
Enabled: true
Lint/RequireRangeParentheses: # new in 1.32
Enabled: true
Lint/RequireRelativeSelfPath: # new in 1.22
Enabled: true
Lint/UselessRescue: # new in 1.43
Enabled: true
Lint/UselessRuby2Keywords: # new in 1.23
Enabled: true
Metrics/CollectionLiteralLength: # new in 1.47
Enabled: true
Naming/BlockForwarding: # new in 1.24
Enabled: true
Security/CompoundHash: # new in 1.28
Enabled: true
Security/IoMethods: # new in 1.22
Enabled: true
Style/ArrayIntersect: # new in 1.40
Enabled: true
Style/ComparableClamp: # new in 1.44
Enabled: true
Style/ConcatArrayLiterals: # new in 1.41
Enabled: true
Style/DataInheritance: # new in 1.49
Enabled: true
Style/DirEmpty: # new in 1.48
Enabled: true
Style/EmptyHeredoc: # new in 1.32
Enabled: true
Style/EnvHome: # new in 1.29
Enabled: true
Style/FetchEnvVar: # new in 1.28
Enabled: true
Style/FileEmpty: # new in 1.48
Enabled: true
Style/FileRead: # new in 1.24
Enabled: true
Style/FileWrite: # new in 1.24
Enabled: true
Style/InPatternThen: # new in 1.16
Enabled: true
Style/MagicCommentFormat: # new in 1.35
Enabled: true
Style/MapCompactWithConditionalBlock: # new in 1.30
Enabled: true
Style/MapToHash: # new in 1.24
Enabled: true
Style/MapToSet: # new in 1.42
Enabled: true
Style/MinMaxComparison: # new in 1.42
Enabled: true
Style/MultilineInPatternThen: # new in 1.16
Enabled: true
Style/NestedFileDirname: # new in 1.26
Enabled: true
Style/NumberedParameters: # new in 1.22
Enabled: true
Style/NumberedParametersLimit: # new in 1.22
Enabled: true
Style/ObjectThen: # new in 1.28
Enabled: true
Style/OpenStructUse: # new in 1.23
Enabled: true
Style/OperatorMethodCall: # new in 1.37
Enabled: true
Style/QuotedSymbols: # new in 1.16
Enabled: true
Style/RedundantConstantBase: # new in 1.40
Enabled: true
Style/RedundantDoubleSplatHashBraces: # new in 1.41
Enabled: true
Style/RedundantEach: # new in 1.38
Enabled: true
Style/RedundantHeredocDelimiterQuotes: # new in 1.45
Enabled: true
Style/RedundantInitialize: # new in 1.27
Enabled: true
Style/RedundantLineContinuation: # new in 1.49
Enabled: true
Style/RedundantSelfAssignmentBranch: # new in 1.19
Enabled: true
Style/RedundantStringEscape: # new in 1.37
Enabled: true
Style/SelectByRegexp: # new in 1.22
Enabled: true
Loading

0 comments on commit 13eb574

Please sign in to comment.