updated v0.1.4

samapriya · Jan 10, 2019 · 7950afa · 7950afa
1 parent 9950db6
commit 7950afa
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -218,6 +218,11 @@ optional arguments:
 ```
 # Changelog
 
+### v0.1.4
+
+- OS based geckdriver path fix
+- General improvements
+
 ### v0.1.3
 
 - fixed issues with extra arguments

diff --git a/geeup/__init__.py b/geeup/__init__.py
@@ -2,4 +2,4 @@
 
 __author__ = 'Samapriya Roy'
 __email__ = '[email protected]'
-__version__ = '0.1.3'
+__version__ = '0.1.4'
diff --git a/geeup/batch_uploader.py b/geeup/batch_uploader.py
@@ -242,7 +242,10 @@ def __get_google_auth_session(username, password):
     authorization_url="https://code.earthengine.google.com"
     uname=str(username)
     passw=str(password)
-    driver = Firefox(executable_path=os.path.join(lp,"geckodriver.exe"),firefox_options=options)
+    if os.name=="nt":
+        driver = Firefox(executable_path=os.path.join(lp,"geckodriver.exe"),firefox_options=options)
+    elif os.name=="posix":
+        driver = Firefox(executable_path=os.path.join(lp,"geckodriver"),firefox_options=options)
     driver.get(authorization_url)
     time.sleep(5)
     username = driver.find_element_by_xpath('//*[@id="identifierId"]')

diff --git a/geeup/metadata_ingest.py b/geeup/metadata_ingest.py
@@ -274,7 +274,10 @@ def __get_google_auth_session(username, password):
     authorization_url="https://code.earthengine.google.com"
     uname=str(username)
     passw=str(password)
-    driver = Firefox(executable_path=os.path.join(lp,"geckodriver.exe"),firefox_options=options)
+    if os.name=="nt":
+        driver = Firefox(executable_path=os.path.join(lp,"geckodriver.exe"),firefox_options=options)
+    elif os.name=="posix":
+        driver = Firefox(executable_path=os.path.join(lp,"geckodriver"),firefox_options=options)
     driver.get(authorization_url)
     time.sleep(5)
     username = driver.find_element_by_xpath('//*[@id="identifierId"]')

diff --git a/geeup/sel_tuploader.py b/geeup/sel_tuploader.py
@@ -40,7 +40,10 @@ def seltabup(dirc,uname,destination):
     authorization_url="https://code.earthengine.google.com"
     uname=str(username)
     passw=str(password)
-    driver = Firefox(executable_path=os.path.join(lp,"geckodriver.exe"),firefox_options=options)
+    if os.name=="nt":
+        driver = Firefox(executable_path=os.path.join(lp,"geckodriver.exe"),firefox_options=options)
+    elif os.name=="posix":
+        driver = Firefox(executable_path=os.path.join(lp,"geckodriver"),firefox_options=options)
     driver.get(authorization_url)
     time.sleep(5)
     username = driver.find_element_by_xpath('//*[@id="identifierId"]')

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@ def readme():
         return f.read()
 setuptools.setup(
     name='geeup',
-    version='0.1.3',
+    version='0.1.4',
     packages=find_packages(),
     url='https://github.com/samapriya/geeup',
     install_requires=['earthengine_api >= 0.1.87','requests >= 2.10.0','retrying >= 1.3.3','beautifulsoup4 >= 4.5.1','pandas>=0.23.0','psutil>=5.4.5',