Merge pull request #422 from scholarly-python-package/develop

Release v1.6.3

Author: arunkannawadi

scholarly/_scholarly.py

@@ -152,7 +152,7 @@ def search_pubs(self,
         """
         url = self._construct_url(_PUBSEARCH.format(requests.utils.quote(query)), patents=patents,
                                   citations=citations, year_low=year_low, year_high=year_high,
-                                  sort_by=sort_by, start_index=start_index)
+                                  sort_by=sort_by, include_last_year=include_last_year, start_index=start_index)
         return self.__nav.search_publications(url)
 
     def search_citedby(self, publication_id: int, **kwargs):
@@ -620,4 +620,4 @@ def save_journals_csv(self, filename, category="English", subcategory=None, incl
         except IOError:
             self.logger.error("Error writing journals as %s", filename)
         finally:
-            return journals
+            return journals

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='scholarly',
-    version='1.6.2',
+    version='1.6.3',
     author='Steven A. Cholewiak, Panos Ipeirotis, Victor Silva, Arun Kannawadi',
     author_email='steven@cholewiak.com, panos@stern.nyu.edu, vsilva@ualberta.ca, arunkannawadi@astro.princeton.edu',
     description='Simple access to Google Scholar authors and citations',

test_module.py

@@ -7,6 +7,8 @@
 import random
 import json
 import csv
+import requests
+from bs4 import BeautifulSoup
 from contextlib import contextmanager
 
 
@@ -640,13 +642,14 @@ def test_download_mandates_csv(self):
         # Delete the file with a finally block no matter what happens
         try:
             scholarly.download_mandates_csv(filename)
-            funder, policy, percentage2020 = [], [], []
+            funder, policy, percentage2020, percentageOverall = [], [], [], []
             with open(filename, "r") as f:
                 csv_reader = csv.DictReader(f)
                 for row in csv_reader:
                     funder.append(row['\ufeffFunder'])
                     policy.append(row['Policy'])
                     percentage2020.append(row['2020'])
+                    percentageOverall.append(row['Overall'])
 
             agency_policy = {
                 "US National Science Foundation": "https://www.nsf.gov/pubs/2015/nsf15052/nsf15052.pdf",
@@ -661,10 +664,17 @@ def test_download_mandates_csv(self):
                 "Swedish Research Council for Environment, Agricultural Sciences and Spatial Planning": "88%"
             }
 
-            for agency in agency_policy:
+            response = requests.get("https://scholar.google.com/citations?view_op=mandates_leaderboard&hl=en")
+            soup = BeautifulSoup(response.text, "html.parser")
+            agency_overall = soup.find_all("td", class_="gsc_mlt_n gsc_mlt_bd")
+
+            for agency, index in zip(agency_policy, [4-1,10-1, 19-1, 64-1]):
                 agency_index = funder.index(agency)
                 self.assertEqual(policy[agency_index], agency_policy[agency])
-                self.assertEqual(percentage2020[agency_index], agency_2020[agency])
+                # Check that the percentage values from CSV and on the page agree.
+                self.assertEqual(percentageOverall[agency_index], agency_overall[index].text)
+                # The percentage fluctuates, so we can't check the exact value.
+                self.assertAlmostEquals(int(percentage2020[agency_index][:-1]), int(agency_2020[agency][:-1]), delta=2)
         finally:
             if os.path.exists(filename):
                 os.remove(filename)