Merge pull request #26 from robalberse/bugfix/PJ-024

bugfix/PJ-024: Hopefull fix to pandas FutureWarning.

playlistjockey/mixes.py

@@ -19,7 +19,6 @@ def dj_mix(donor_df):
     """Mixing algorithm that sorts a playlist like a DJ: utilizing compatible keys, bpms, and energy features."""
     # Establish the recipient df that will be the playlist's new order
     recipient_df = pd.DataFrame(columns=donor_df.columns)
-    recipient_df["select_type"] = ""
 
     # Begin by randomly selecting the first song
     song_1_index = selects.random_select_song(donor_df)
@@ -56,7 +55,6 @@ def party_mix(donor_df):
     low level of energy, building to a peak at the halfway point, then gradually lowering the energy back down."""
     # Establish two recipient DataFrames
     rec_front_half = pd.DataFrame(columns=donor_df.columns)
-    rec_front_half["select_type"] = ""
     rec_back_half = rec_front_half.copy()
 
     # Sort the donor_df by energy and danceability
@@ -139,7 +137,6 @@ def setlist_mix(donor_df):
     Starting with high levels of energy, saving the least energetic song for the midpoint, then building the energy back up for the grand finale."""
     # Establish two recipient DataFrames
     rec_front_half = pd.DataFrame(columns=donor_df.columns)
-    rec_front_half["select_type"] = ""
     rec_back_half = rec_front_half.copy()
 
     # Sort the donor_df by energy and popularity
@@ -228,7 +225,6 @@ def genre_mix(donor_df):
 
     # Establish the recipient df that will be the playlist's new order
     recipient_df = pd.DataFrame(columns=donor_df.columns)
-    recipient_df["select_type"] = ""
 
     # Begin by randomly selecting the first song
     song_1_index = selects.random_select_song(donor_df)

playlistjockey/utils.py

@@ -69,6 +69,10 @@ def spotify_key_to_camelot(spotify_key, spotify_mode):
 
 def move_song(donor_df, recipient_df, next_song_index, select_type=None):
     """Helper function that moves a song from the donor_df to the recipient_df, given its index."""
+    # Establish the select_type column in the donor df
+    if "select_type" not in donor_df:
+        donor_df["select_type"] = ""
+
     # Copy the song over to the recipient_df, and drop it from the donor_df
     if select_type:
         donor_df.at[next_song_index, "select_type"] = select_type