openstudio-analysis 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/openstudio-analysis.yml +40 -0
  3. data/CHANGELOG.md +8 -1
  4. data/LICENSE.md +1 -1
  5. data/README.md +3 -3
  6. data/Rakefile +1 -1
  7. data/lib/openstudio-analysis.rb +1 -1
  8. data/lib/openstudio/analysis.rb +1 -1
  9. data/lib/openstudio/analysis/algorithm_attributes.rb +1 -1
  10. data/lib/openstudio/analysis/formulation.rb +1 -1
  11. data/lib/openstudio/analysis/server_api.rb +1 -1
  12. data/lib/openstudio/analysis/support_files.rb +1 -1
  13. data/lib/openstudio/analysis/translator/datapoints.rb +1 -1
  14. data/lib/openstudio/analysis/translator/excel.rb +1 -1
  15. data/lib/openstudio/analysis/translator/workflow.rb +1 -1
  16. data/lib/openstudio/analysis/version.rb +2 -2
  17. data/lib/openstudio/analysis/workflow.rb +1 -1
  18. data/lib/openstudio/analysis/workflow_step.rb +1 -1
  19. data/lib/openstudio/helpers/hash.rb +1 -1
  20. data/lib/openstudio/helpers/string.rb +1 -1
  21. data/lib/openstudio/helpers/utils.rb +1 -1
  22. data/lib/openstudio/weather/epw.rb +1 -1
  23. data/openstudio-analysis.gemspec +2 -2
  24. data/update_license.rb +3 -3
  25. metadata +6 -8
  26. data/.gitlab-ci.yml +0 -20
  27. data/.travis.yml +0 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 96f9b0f5f3e8ae95a9efe4389c7d642764442072a18573bbedad60a3ae769252
4
- data.tar.gz: a0b1b3a971e9fb51d95aef3c6e4e95f0da121d527e7dd43b204b2302a04e84c6
3
+ metadata.gz: c57c83c75eb61c8b4253907c07d2f4cc1eaa6939aa27c30dc5fdae7bc0bd551f
4
+ data.tar.gz: c2299fdd5b78dfc58792c4bf35aa621f2a4e1db862e2e5b3fcd93107ee7f82ae
5
5
  SHA512:
6
- metadata.gz: 652a4113d0638a6c738d4f35b8daf96a00f972fa6c7886d7d1179dbccf73d06fcc768cb6f1952b973dadf29e5e7ee09bf687915a81545d7031adad590531167e
7
- data.tar.gz: 652ad3b9699b047fa904394fd9b4e784952285daf753aba89d1ef6e64f4c3825d25ae22e7806f766005ccf5fcde7f8a000a0ecba0b5b3982628ed3b386c898f8
6
+ metadata.gz: eac9ee6feee2103b9fe6b9529116f5939145198b8dee8ea9c7094ea5fe0d61e47fb009882c73b0770c152c997f319c5202c56266c6bbd84ca3775a2a98b1074c
7
+ data.tar.gz: ac4167112ffa932916d99c765d1486e184ad154f65e49b70b56d99b458bb3a3458371687450e031cc6d0afa92318e647c4756625dd5ef1f097937a50c0d43e88
data/.github/workflows/openstudio-analysis.yml ADDED
@@ -0,0 +1,40 @@
1
+ name: openstudio-analysis-gem
2
+
3
+ on: [push, pull_request]
4
+
5
+ jobs:
6
+ ubuntu-1804: # ruby 2.5 workflow
7
+ if: github.event.pull_request.base.ref == '1.1.X-LTS' # check target branch of pr
8
+ runs-on: ubuntu-18.04
9
+ steps:
10
+ - name: Check out repository
11
+ uses: actions/checkout@v2
12
+ - name: ruby-install
13
+ shell: bash
14
+ run: "sudo apt install -y ruby && ruby -v" # ruby anye tests here when ready
15
+ ubuntu-2004: # ruby 2.7 workflow
16
+ if: github.event.pull_request.base.ref != '1.1.X-LTS' # check target branch of pr
17
+ runs-on: ubuntu-20.04
18
+ steps:
19
+ -
20
+ name: Check out repository
21
+ uses: actions/checkout@v2
22
+ -
23
+ name: Display system info
24
+ run: |
25
+ ruby --version
26
+ docker --version
27
+ docker-compose --version
28
+ -
29
+ name: Start OpenStudio for testing Server API
30
+ run: |
31
+ echo "Not yet implemented"
32
+ -
33
+ name: Run tests in Docker
34
+ env:
35
+ COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
36
+ run: |
37
+ docker run -e COVERALLS_REPO_TOKEN=${COVERALLS_REPO_TOKEN} \
38
+ -v $(pwd):/var/simdata/openstudio \
39
+ nrel/openstudio:develop \
40
+ /bin/bash -c "bundle install && bundle exec rake"
data/CHANGELOG.md CHANGED
@@ -1,8 +1,15 @@
1
1
  OpenStudio Analysis Gem Change Log
2
2
  ==================================
3
3
 
4
+ Version 1.2.0
5
+ -------------
6
+ * master -> main
7
+ * Remove support for Ruby 2.5. Only support Ruby ~> 2.7.0
8
+ * BCL ~> 0.7.0
9
+ * Use GitHub actions for CI
10
+
4
11
  Version 1.1.0
5
- --------------------------
12
+ -------------
6
13
  * Allow for blank :seed, :weather_file and :workflow sections of OSA
7
14
 
8
15
  Version 1.0.6
data/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
1
+ OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided
4
4
  that the following conditions are met:
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # OpenStudio Analysis Gem
2
2
 
3
- [![Build Status](https://travis-ci.org/NREL/OpenStudio-analysis-gem.svg?branch=develop)](https://travis-ci.org/NREL/OpenStudio-analysis-gem)
3
+ [![Build Status](https://github.com/NREL/OpenStudio-analysis-gem/actions/workflows/openstudio-analysis.yml/badge.svg?branch=develop)](https://github.com/NREL/OpenStudio-analysis-gem/actions/workflows/openstudio-analysis.yml)
4
4
  [![Coverage Status](https://coveralls.io/repos/NREL/OpenStudio-analysis-gem/badge.svg?branch=develop)](https://coveralls.io/r/NREL/OpenStudio-analysis-gem?branch=develop)
5
5
  [![Gem Version](https://badge.fury.io/rb/openstudio-analysis.svg)](https://badge.fury.io/rb/openstudio-analysis)
6
6
 
@@ -81,8 +81,8 @@ Follow the steps below when releasing a new version:
81
81
  3. Run rubocop and make sure code meets coding standards.
82
82
  4. Push release candidate on a branch.
83
83
  5. Create a pull request to develop. Once the tests pass, merge into develop.
84
- 6. Create a pull request to master. Once tests pass, then merge into master.
85
- 7. Checkout master and run `rake release`
84
+ 6. Create a pull request to main. Once tests pass, then merge into main.
85
+ 7. Checkout main and run `rake release`
86
86
 
87
87
  # Todos
88
88
 
data/Rakefile CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio-analysis.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/analysis.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/analysis/algorithm_attributes.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/analysis/formulation.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/analysis/server_api.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/analysis/support_files.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/analysis/translator/datapoints.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/analysis/translator/excel.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/analysis/translator/workflow.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/analysis/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
@@ -37,6 +37,6 @@ module OpenStudio
37
37
  module Analysis
38
38
  # format should be ^.*\-{1}[a-z]+[0-9]+
39
39
  # for example: -rc1, -beta6, -customusecase0
40
- VERSION = '1.1.0'.freeze
40
+ VERSION = '1.2.0'.freeze
41
41
  end
42
42
  end
data/lib/openstudio/analysis/workflow.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/analysis/workflow_step.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/helpers/hash.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/helpers/string.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/helpers/utils.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/lib/openstudio/weather/epw.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
data/openstudio-analysis.gemspec CHANGED
@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
21
21
  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
22
22
  s.require_paths = ['lib']
23
23
 
24
- s.required_ruby_version = '~> 2.5.0'
24
+ s.required_ruby_version = '~> 2.7.0'
25
25
 
26
- s.add_dependency 'bcl', '~> 0.6.1'
26
+ s.add_dependency 'bcl', '~> 0.7.0'
27
27
  s.add_dependency 'dencity', '~> 0.1.0'
28
28
  s.add_dependency 'faraday', '~> 1.0.1'
29
29
  s.add_dependency 'roo', '~> 2.8.3'
data/update_license.rb CHANGED
@@ -6,7 +6,7 @@ js_regex = /^\/\* @preserve.*Copyright.*license.{2}\*\//m
6
6
 
7
7
  ruby_header_text = <<EOT
8
8
  # *******************************************************************************
9
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
9
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
10
10
  # All rights reserved.
11
11
  # Redistribution and use in source and binary forms, with or without
12
12
  # modification, are permitted provided that the following conditions are met:
@@ -45,7 +45,7 @@ ruby_header_text.strip!
45
45
  erb_header_text = <<EOT
46
46
  <%
47
47
  # *******************************************************************************
48
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
48
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
49
49
  # All rights reserved.
50
50
  # Redistribution and use in source and binary forms, with or without
51
51
  # modification, are permitted provided that the following conditions are met:
@@ -84,7 +84,7 @@ erb_header_text.strip!
84
84
 
85
85
  js_header_text = <<EOT
86
86
  /* @preserve
87
- * OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
87
+ * OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
88
88
  * Use of this source code is governed by a BSD-style license that can be found at openstudio.net/license.
89
89
  */
90
90
  EOT
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: openstudio-analysis
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicholas Long
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.6.1
19
+ version: 0.7.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 0.6.1
26
+ version: 0.7.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: dencity
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -157,10 +157,9 @@ executables: []
157
157
  extensions: []
158
158
  extra_rdoc_files: []
159
159
  files:
160
+ - ".github/workflows/openstudio-analysis.yml"
160
161
  - ".gitignore"
161
- - ".gitlab-ci.yml"
162
162
  - ".rubocop.yml"
163
- - ".travis.yml"
164
163
  - CHANGELOG.md
165
164
  - Gemfile
166
165
  - LICENSE.md
@@ -196,15 +195,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
196
195
  requirements:
197
196
  - - "~>"
198
197
  - !ruby/object:Gem::Version
199
- version: 2.5.0
198
+ version: 2.7.0
200
199
  required_rubygems_version: !ruby/object:Gem::Requirement
201
200
  requirements:
202
201
  - - ">="
203
202
  - !ruby/object:Gem::Version
204
203
  version: '0'
205
204
  requirements: []
206
- rubyforge_project:
207
- rubygems_version: 2.7.6.2
205
+ rubygems_version: 3.1.4
208
206
  signing_key:
209
207
  specification_version: 4
210
208
  summary: Create JSON, ZIP to communicate with OpenStudio Distributed Analysis in the
data/.gitlab-ci.yml DELETED
@@ -1,20 +0,0 @@
1
- test:windows:
2
- stage: test
3
- tags:
4
- - windows
5
- script:
6
- - bundle exec rake
7
-
8
- test:mac:
9
- stage: test
10
- tags:
11
- - mac
12
- script:
13
- - bundle exec rake
14
-
15
- test:ubuntu:
16
- stage: test
17
- tags:
18
- - ubuntu
19
- script:
20
- - bundle exec rake
data/.travis.yml DELETED
@@ -1,4 +0,0 @@
1
- language: ruby
2
- rvm:
3
- - 2.5.1
4
- before_install: gem install bundler -v 2.1