[PR #920] [MERGED] Sync branches #1081

New issue

Closed

opened 2026-02-28 00:03:32 +03:00 by kerem · 0 comments

kerem commented

2026-02-28 00:03:32 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/spotipy-dev/spotipy/pull/920
Author: @stephanebruckert
Created: 12/26/2022
Status: ✅ Merged
Merged: 12/26/2022
Merged by: @stephanebruckert

Base: v3 ← Head: v3_merge

📝 Commits (2)

5e711de Sync with master
c1dcf7b Fix gha

📊 Changes

33 files changed (+963 additions, -365 deletions)

View changed files

➕ .github/workflows/integration_tests.yml (+25 -0)
📝 .github/workflows/pythonapp.yml (+19 -20)
📝 CHANGELOG.md (+135 -71)
➕ CODE_OF_CONDUCT.md (+63 -0)
📝 CONTRIBUTING.md (+16 -2)
📝 LICENSE.md (+6 -6)
📝 README.md (+8 -0)
➕ TUTORIAL.md (+81 -0)
📝 docs/conf.py (+14 -13)
📝 docs/index.rst (+101 -25)
📝 examples/add_tracks_to_playlist.py (+2 -2)
📝 examples/app.py (+13 -27)
📝 examples/artist_discography.py (+3 -2)
➕ examples/follow_playlist.py (+27 -0)
📝 examples/headless.py (+1 -1)
📝 examples/my_playlists.py (+1 -1)
📝 examples/my_top_tracks.py (+1 -1)
➕ examples/playlist_add_items.py (+12 -0)
📝 examples/playlist_tracks.py (+2 -2)
📝 examples/show_artist_top_tracks.py (+1 -0)

...and 13 more files

📄 Description

Kind of a note to myself and to anyone wondering:

This is a merge commit instead of a rebase, because a rebase would have required a force push (see "Can’t automatically merge") and it's not safe to do that since PRs are open against v3. It means the v2 recent commit history is lost with this PR.

However that commit history will be back, or "still there" when merging v3 back into master, once v3 goes live and master goes to its own branch v2. At that point the plan will be to rebase v3 and merge it into master (see "Able to merge").

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/spotipy-dev/spotipy/pull/920 **Author:** [@stephanebruckert](https://github.com/stephanebruckert) **Created:** 12/26/2022 **Status:** ✅ Merged **Merged:** 12/26/2022 **Merged by:** [@stephanebruckert](https://github.com/stephanebruckert) **Base:** `v3` ← **Head:** `v3_merge` --- ### 📝 Commits (2) - [`5e711de`](https://github.com/spotipy-dev/spotipy/commit/5e711de9b5e44bea5d478a42aef7de8cbf634397) Sync with master - [`c1dcf7b`](https://github.com/spotipy-dev/spotipy/commit/c1dcf7b3f5be7007eff0c74f5aea3b11090521e4) Fix gha ### 📊 Changes **33 files changed** (+963 additions, -365 deletions) <details> <summary>View changed files</summary> ➕ `.github/workflows/integration_tests.yml` (+25 -0) 📝 `.github/workflows/pythonapp.yml` (+19 -20) 📝 `CHANGELOG.md` (+135 -71) ➕ `CODE_OF_CONDUCT.md` (+63 -0) 📝 `CONTRIBUTING.md` (+16 -2) 📝 `LICENSE.md` (+6 -6) 📝 `README.md` (+8 -0) ➕ `TUTORIAL.md` (+81 -0) 📝 `docs/conf.py` (+14 -13) 📝 `docs/index.rst` (+101 -25) 📝 `examples/add_tracks_to_playlist.py` (+2 -2) 📝 `examples/app.py` (+13 -27) 📝 `examples/artist_discography.py` (+3 -2) ➕ `examples/follow_playlist.py` (+27 -0) 📝 `examples/headless.py` (+1 -1) 📝 `examples/my_playlists.py` (+1 -1) 📝 `examples/my_top_tracks.py` (+1 -1) ➕ `examples/playlist_add_items.py` (+12 -0) 📝 `examples/playlist_tracks.py` (+2 -2) 📝 `examples/show_artist_top_tracks.py` (+1 -0) _...and 13 more files_ </details> ### 📄 Description Kind of a note to myself and to anyone wondering: This is a merge commit instead of a rebase, because a rebase would have required a force push ([see "Can’t automatically merge"](https://github.com/spotipy-dev/spotipy/compare/v3...spotipy-dev:spotipy:v3_rebase?expand=1)) and it's not safe to do that since PRs are open against v3. It means the v2 recent commit history is lost with this PR. However that commit history will be back, or "still there" when merging v3 back into master, once v3 goes live and master goes to its own branch v2. At that point the plan will be to rebase v3 and merge it into master ([see "Able to merge"](https://github.com/spotipy-dev/spotipy/compare/master...spotipy-dev:spotipy:v3_rebase?expand=1)). --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>