Merge pull request #2952 from quintel/heat-2023

Temperature levels for district heating
quintel · Oct 23, 2023 · b3d8c77 · b3d8c77
2 parents 857d2d5 + e41e680
commit b3d8c77
Show file tree

Hide file tree

Showing 3,479 changed files with 402,641 additions and 3,518,141 deletions.
diff --git a/Gemfile b/Gemfile
@@ -9,7 +9,7 @@ gem 'rake'
 
 group :development, :test do
   gem 'roo'
-  gem 'atlas',    ref: '9b616c4', github: 'quintel/atlas'
+  gem 'atlas',    ref: 'f7aebb9', github: 'quintel/atlas'
 end
 
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/quintel/atlas.git
-  revision: 9b616c4c1eed5f7bceba2ea5ead19fcc7d1e0b59
-  ref: 9b616c4
+  revision: f7aebb944182f7b92fecb5f4188c3354a64c93c6
+  ref: f7aebb9
   specs:
     atlas (1.0.0)
       activemodel (>= 7)
@@ -31,32 +31,43 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activesupport (7.0.7.2)
+    activemodel (7.1.1)
+      activesupport (= 7.1.1)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.2.2)
-    csv (3.2.6)
+    connection_pool (2.4.1)
+    csv (3.2.7)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
+    drb (2.1.1)
+      ruby2_keywords
     equalizer (0.0.11)
-    gpgme (2.0.22)
+    gpgme (2.0.23)
       mini_portile2 (~> 2.7)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     mini_portile2 (2.8.2)
-    minitest (5.19.0)
+    minitest (5.20.0)
+    mutex_m (0.1.2)
     nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
@@ -81,6 +92,7 @@ GEM
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby-graphviz (1.2.4)
+    ruby2_keywords (0.0.5)
     rubyzip (1.3.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)