scraping-rtn 0.0.4.2__tar.gz → 0.0.5.1__tar.gz

{scraping_rtn-0.0.4.2 → scraping_rtn-0.0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scraping_rtn
-Version: 0.0.4.2
+Version: 0.0.5.1
 Summary: package to scrape gymnastics data from Road To Nationals
 Author-email: Claire Harmon <ceharmon220@gmail.com>
 Project-URL: Homepage, https://github.com/cgn-charmon/scraping_rtn

{scraping_rtn-0.0.4.2 → scraping_rtn-0.0.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scraping_rtn"
-version = "0.0.4.2"
+version = "0.0.5.1"
 authors = [
     { name="Claire Harmon", email="ceharmon220@gmail.com" },
 ]

{scraping_rtn-0.0.4.2 → scraping_rtn-0.0.5.1}/src/scraping_rtn/RtnSingleTeamYear.py

@@ -149,12 +149,10 @@ class RtnSingleTeamYear(object):
         Methods:
         * Individual Consistency - Uses Individual Consistency tab from RTN
             * Tends to have more complete data, especially for older years
-            * Requires summing of all events to get AA (code does this for you)
             * Relies on date to join back to meet info, such as opponent, etc.
             * One API call per gymnast, relative speed depends on number of meets vs number of gymnasts
         * By Meet - loops through each meet to get scores
             * Older meets tend to be missing
-            * Includes AA scores in the response
             * Uses team meet id to join back to meet info, such as opponent, etc.
             * One API call per meet, relative speed depends on number of meets vs number of gymnasts
         """
@@ -207,6 +205,7 @@ class RtnSingleTeamYear(object):
         if len(individual_scores_all) > 0:
             merge_dicts(dict1=individual_scores_all, dict2=self._raw_schedule, merge_field='Team Meet ID')
             self.individual_results = pd.DataFrame(individual_scores_all)
+            self.individual_results['AA'] = self.individual_results[['VT', 'UB', 'BB', 'FX']].dropna(how='any').astype(float).T.sum().round(4)
         else:
             self.individual_results = pd.DataFrame(columns=['Meet Date', 'VT', 'UB', 'BB', 'FX', 'AA', 'Gymnast ID', 'Name',
                                                     'Team ID', 'Team', 'Team Meet ID', 'Home/Away', 'Opponents',
@@ -267,7 +266,8 @@ class RtnSingleTeamYear(object):
 
     def _get_current_week(self):
         if not hasattr(self, 'week'):
-            return get_data_from_api(endpoint='currentweek', suffix=str(self.year)).json()['max']
+            week_data = get_data_from_api(endpoint='currentweek', suffix=str(self.year)).json()
+            return min(int(week_data['week']), int(week_data['max']))
 
     def _get_raw_rankings(self, team_vs_ind, event, week):
         team_ind_map = {'team': 0, 'ind': 1}

{scraping_rtn-0.0.4.2 → scraping_rtn-0.0.5.1}/src/scraping_rtn/__init__.py

@@ -18,7 +18,7 @@ def roster(year, teams, include_hometowns=False, include_class=False, include_ev
     all_rosters = []
     for team in teams:
         if verbose:
-            print(f'Getting roster for {team}                              ', end='\r')
+            print(f'Getting roster for {team}                              ', end='\r' if team != teams[-1] else None)
         rtn = RtnSingleTeamYear(year=year, team_name=team)
         res = rtn.get_roster(include_hometowns=include_hometowns, include_class=include_class,
                              include_events=include_events)
@@ -36,7 +36,7 @@ def schedule(year, teams, verbose=False):
     all_schedules = []
     for team in teams:
         if verbose:
-            print(f'Getting schedule for {team}                              ', end='\r')
+            print(f'Getting schedule for {team}                              ', end='\r' if team != teams[-1] else None)
         rtn = RtnSingleTeamYear(year=year, team_name=team)
         res = rtn.get_schedule()
         if verbose and len(res) == 0:
@@ -52,7 +52,7 @@ def team_results(year, teams, method='team_consistency', force_update=False, ver
     all_results = []
     for team in teams:
         if verbose:
-            print(f'Getting schedule and results for {team}                              ', end='\r')
+            print(f'Getting schedule and results for {team}                              ', end='\r' if team != teams[-1] else None)
         rtn = RtnSingleTeamYear(year=year, team_name=team)
         res = rtn.get_team_scores(method=method,force_update=force_update)
         if verbose and len(res) == 0:
@@ -68,7 +68,7 @@ def individual_results(year, teams, method='by_meet', force_update=False, verbos
     all_scores = []
     for team in teams:
         if verbose:
-            print(f'Getting scores for {team}                              ', end='\r')
+            print(f'Getting scores for {team}                              ', end='\r' if team != teams[-1] else None)
         rtn = RtnSingleTeamYear(year=year, team_name=team)
         res = rtn.get_individual_scores(method=method, force_update=force_update)
         if verbose and len(res) == 0:
@@ -84,7 +84,7 @@ def individual_nqs(year, teams, verbose=False):
     all_nqs = []
     for team in teams:
         if verbose:
-            print(f'Getting individual NQS for {team}                              ', end='\r')
+            print(f'Getting individual NQS for {team}                              ', end='\r' if team != teams[-1] else None)
         rtn = RtnSingleTeamYear(year=year, team_name=team)
         res = rtn.get_individual_nqs()
         if verbose and len(res) == 0:

{scraping_rtn-0.0.4.2 → scraping_rtn-0.0.5.1}/src/scraping_rtn.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scraping_rtn
-Version: 0.0.4.2
+Version: 0.0.5.1
 Summary: package to scrape gymnastics data from Road To Nationals
 Author-email: Claire Harmon <ceharmon220@gmail.com>
 Project-URL: Homepage, https://github.com/cgn-charmon/scraping_rtn