Merge aefaab8 into c990562

.rubocop.yml

@@ -7,7 +7,7 @@ AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
   ExtraDetails: true
-  # TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.3
 
 Style/StringLiterals:
   EnforcedStyle: single_quotes

.travis.yml

@@ -22,11 +22,6 @@ rvm:
   - 2.3.2
   - 2.3.1
   - 2.3.0
-  - 2.2.9
-  - 2.2.8
-  - 2.2.7
-  - 2.2.6
-  - 2.2.5
   - ruby-head
 matrix:
   allow_failures:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # AEMO Gem Changelog
 
+## 0.3.0-beta1
+
+* Refactor NMI allocations
+
 ## 0.2.1
 
 * Loss factors for FY18

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aemo (0.2.0)
+    aemo (0.3.0)
       activesupport (>= 4.2.6, < 5.2)
       httparty (~> 0.15, >= 0.15.6)
       json (>= 1.7.5)
@@ -17,7 +17,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    ast (2.3.0)
+    ast (2.4.0)
     awesome_print (1.8.0)
     builder (3.2.3)
     coderay (1.1.2)
@@ -102,17 +102,16 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
     powerpack (0.1.1)
     pry (0.11.1)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     psych (2.2.4)
     rack (2.0.3)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (12.1.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
@@ -131,11 +130,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubocop (0.50.0)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
@@ -156,7 +155,7 @@ GEM
     tins (1.15.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.3.2)
     webmock (3.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -175,7 +174,7 @@ DEPENDENCIES
   listen (~> 3.1, = 3.1.5)!
   rdoc (~> 5.1, >= 5.1.0)!
   rspec (~> 3.7, >= 3.7.0)!
-  rubocop (~> 0.50, >= 0.50.0)!
+  rubocop (~> 0.52.1, >= 0.52.1)!
   simplecov (~> 0.14, >= 0.14.1)!
   timecop (~> 0.9, >= 0.9.1)!
   webmock (~> 3.1, >= 3.1.0)!