reverted back to gdal v2 and added gdal v3 gemfile to gitignore

unepwcmc · Aug 5, 2020 · 555fc77 · 555fc77
1 parent b70a097
commit 555fc77
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,5 +37,4 @@ tmp/cache/webpacker
 
 .vscode/
 
-# Special gemfile with GDAL v3
-Gemfile_GDALV3
+Gemfile_GDALV3
diff --git a/Gemfile b/Gemfile
@@ -35,9 +35,7 @@ gem 'vuejs-rails', '~> 2.3.2'
 gem 'sprockets-vue', '~> 0.1.0'
 
 gem 'rails-controller-testing'
-# gem 'gdal', '~> 2.0'
-# TODO Stanley - Need to change this version of gdal back to 2.0 (and remove from gitignore) when I reinstall GDAL to 2.4.4
-gem 'gdal', '~> 3.0'
+gem 'gdal', '~> 2.0'
 #
 group :production, :staging do
 #  gem 'unicorn'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1066,7 +1066,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     fastercsv (1.5.5)
     ffi (1.12.1)
-    gdal (3.0.0)
+    gdal (2.0.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.1.2)
@@ -1337,7 +1337,7 @@ DEPENDENCIES
   elasticsearch (~> 7.2.0)
   exception_notification (~> 4.3.0)
   factory_girl_rails (~> 4.4.1)
-  gdal (~> 3.0)
+  gdal (~> 2.0)
   httmultiparty (~> 0.3.14)
   httparty (~> 0.15.1)
   jquery-rails (~> 4.3.3)