ResStock-HPXML

.circleci/config.yml

@@ -2,58 +2,29 @@ version: 2
 jobs:
   build:
     docker:
-      - image: nrel/openstudio:2.9.0
+      - image: nrel/openstudio:3.0.1
     steps:
       - checkout
       - run: 
           name: Install gems
           command: |
             rm -f Gemfile.lock && bundle install
       - run:
-          name: Apply rubocop
+          name: Run all integrity checks
           command: |
-            rubocop --format simple --only Layout --debug
-      - run:
-          name: Update all measures
-          command: |
-            rake update_measures
-      - run: 
-          name: Regenerate test osms
-          command: |
-            rake test:regenerate_osms
+            rake test:integrity_checks
       - run: 
           name: Run all unit tests
           command: |
             rake test:unit_tests
+      - run: 
+          name: Run measures osw test
+          command: |
+            rake test:measures_osw
       - run:
           name: Run all regression tests
           command: |
             rake test:regression_tests
       - store_artifacts:
             path: workflows/results
             destination: results
-      - store_artifacts:
-            path: resources/measures/ResidentialScheduleGenerator/tests/output/test_sweep_building_ids_and_num_occupants
-            destination: schedules
-  docs:
-    docker:
-      - image: circleci/python:3
-    steps:
-      - checkout
-      - run:
-          name: Build documentation
-          command: |
-            cd docs/read_the_docs
-            pip install -r requirements.txt
-            make html
-      - store_artifacts:
-            path: docs/read_the_docs/build
-            destination: readthedocs
-workflows:
-  version: 2
-  commit:
-    jobs:
-      - build
-      - docs:
-          requires:
-            - build

.gitignore

@@ -1,46 +1,13 @@
-faraday.log
-.temp/*
-/*.pem
-/*.pub
-/res_stock.json
-*.project
-*.pydevproject
-*.pyc
-Gemfile.lock
-
-coverage
-/test/reports
-/log
-/.bundle
-/download_files.rb
-.DS_Store
-.idea/*.*
-/run
-/test/osw_files/out.osw
-/test/osw_files/run
-/files/schedules.csv
-
-/resources/buildstock.csv
+/coverage
+/workflows/*
 /project_national/housing_characteristics/buildstock.csv
+/project_national/outputs
 /project_testing/housing_characteristics/buildstock.csv
-
-build/
-node_modules/
-
-.ipynb_checkpoints/
-
-/measures/*/tests/output
-/resources/measures/*/tests/output
-/workflows/reports
-/workflows/run
-/workflows/out.osw
-/workflows/results
-/workflows/generated_files
-
+/project_testing/outputs
 /lib
-/weather
-/test/test_measures_osw/run
-/test/test_measures_osw/reports
 /test/test_measures_osw/buildstock.csv
+/test/test_measures_osw/generated_files
 /test/test_measures_osw/measures_osw
-/test/test_measures_osw/generated_files
+/test/test_measures_osw/measures_upgrade_osw
+/test/test_measures_osw/out.osw
+/resources/buildstock.csv

.rubocop.yml

@@ -1,6 +1,16 @@
-AllCops:
-    DisabledByDefault: true
-Layout:
-    Enabled: true
-Layout/EndAlignment:
-    AutoCorrect: true
+Layout/EndOfLine:
+  Enabled: false
+Metrics/LineLength:
+  AutoCorrect: false
+  Enabled: false
+Layout/RescueEnsureAlignment:
+  AutoCorrect: true
+Style/FrozenStringLiteralComment:
+  AutoCorrect: true
+# Enable the cops below when rubocop is upgraded
+#Style/HashEachMethods:
+#  Enabled: true
+#Style/HashTransformKeys:
+#  Enabled: true
+#Style/HashTransformValues:
+#  Enabled: true

.ruby-version

@@ -1 +1 @@
-2.2.4
+2.5.5

Gemfile

@@ -1,22 +1,15 @@
-source 'http://rubygems.org'
+# frozen_string_literal: true
 
-gem 'rake'
-gem 'colored', '~> 1.2'
-gem 'git', require: false
-gem 'json', '~> 1.8'
-gem 'ffi', '~> 1.9.18'
-gem 'openstudio-standards', '0.2.9'
-gem 'aes', '~> 0.5.0'
-gem 'geocoder', '~> 1.4.4'
-gem 'highline', '~> 2.0.3'
-gem 'launchy', '~> 2.4.3'
-gem 'public_suffix', '3.1.1'
+source 'http://rubygems.org'
 
-gem 'minitest', '~> 5.9'
-gem 'rubocop', '~> 0.60.0'
-gem 'rubocop-checkstyle_formatter', '~> 0.4.0'
-gem 'ci_reporter_minitest', '~> 1.0.0'
-gem 'simplecov', '~> 0.17.1'
-gem 'simplecov-html', '~> 0.10.0'
-gem 'minitest-reporters'
-gem 'minitest-ci', :git => 'https://github.com/circleci/minitest-ci.git' # For CircleCI Automatic test metadata collection
+group :test do
+  gem 'nokogiri', '~> 1.10'
+  gem 'oga'
+  gem 'rake'
+  gem 'minitest', '~> 5.9'
+  gem 'ci_reporter_minitest', '~> 1.0.0'
+  gem 'simplecov'
+  gem 'codecov'
+  gem 'minitest-reporters'
+  gem 'minitest-ci' # For CircleCI Automatic test metadata collection
+end

Gemfile.lock

@@ -0,0 +1,58 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    ast (2.4.1)
+    builder (3.2.4)
+    ci_reporter (2.0.0)
+      builder (>= 2.1.2)
+    ci_reporter_minitest (1.0.0)
+      ci_reporter (~> 2.0)
+      minitest (~> 5.0)
+    codecov (0.2.6)
+      colorize
+      json
+      simplecov
+    colorize (0.8.1)
+    docile (1.3.2)
+    json (2.3.1)
+    mini_portile2 (2.4.0)
+    minitest (5.14.1)
+    minitest-ci (3.4.0)
+      minitest (>= 5.0.6)
+    minitest-reporters (1.4.2)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    nokogiri (1.10.10-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
+    oga (3.3)
+      ast
+      ruby-ll (~> 2.1)
+    rake (13.0.1)
+    ruby-ll (2.1.2)
+      ansi
+      ast
+    ruby-progressbar (1.10.1)
+    simplecov (0.19.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+
+PLATFORMS
+  x64-mingw32
+
+DEPENDENCIES
+  ci_reporter_minitest (~> 1.0.0)
+  codecov
+  minitest (~> 5.9)
+  minitest-ci
+  minitest-reporters
+  nokogiri (~> 1.10)
+  oga
+  rake
+  simplecov
+
+BUNDLED WITH
+   2.1.0

README.md

@@ -6,6 +6,7 @@ OpenStudio-BuildStock
 [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/NREL/OpenStudio-BuildStock?include_prereleases)](https://github.com/NREL/OpenStudio-BuildStock/releases)
 [![CircleCI](https://circleci.com/gh/NREL/OpenStudio-BuildStock.svg?style=shield)](https://circleci.com/gh/NREL/OpenStudio-BuildStock)
 [![Documentation Status](https://readthedocs.org/projects/resstock/badge/?version=latest)](https://resstock.readthedocs.io/en/latest/?badge=latest)
+[![codecov](https://codecov.io/gh/NREL/OpenStudio-BuildStock/branch/master/graph/badge.svg)](https://codecov.io/gh/NREL/OpenStudio-BuildStock)
 
 <img src="https://user-images.githubusercontent.com/1276021/85608250-1ff46b80-b612-11ea-903e-4ced367e5940.jpg" width="400">