Skip to content

Commit

Permalink
Merge pull request #1094 from spotDL/dev
Browse files Browse the repository at this point in the history
Dev-->Master, Discord Info & fix releasedrafter
  • Loading branch information
Silverarmor authored Jan 9, 2021
2 parents 4cdca4c + cb14796 commit 36f8a74
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .bettercodehub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ component_depth: 3

# Folders to exclude
exclude:
- /dev utils/*
- /dev utils/.*
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ assignees: ''
<!--- Please search existing bugs before creating a new one -->
<!--- Format your issue titles as 'Error: Description' -->
<!--- example title: "FileNotFoundError: error while downloading individual songs." -->
<!--- You can also talk to us on our Discord https://discord.gg/xCa23pwJWY -->

### Environment
- **System OS:** <!--- Windows/OSX/Linux/Heroku/Docker -->

- **Python Version:** <!--- Python Version can be found by running "py -V" -->

- **Install Source:**
<!--- Did you download from pip, the master branch on github, or a different branch? -->
<!--- Did you download from pip, or from GitHub? -->
<!--- Provide the command you used to install spotDL -->

- **Version OR Commit hash:**
Expand Down
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
blank_issues_enabled: false

contact_links:
- name: spotDL Discord Server!
url: https://discord.gg/xCa23pwJWY
about: Join the spotDL Discord Server

2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ assignees: ''
<!--- Please search existing issues for your feature before creating a new one -->
<!--- Change the title to summarise simply and succintly. -->

<!--- !!! Come talk to us on our Discord! https://discord.gg/xCa23pwJWY !!! -->

## Problem
<!--- Why should we add this feature? How would it help spotDL users? -->

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
types:
- created
- published
- edited

jobs:
deploy:
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ spotdl.egg-info/*
# setuptools and PyInstaller
build
dist

# PyInstaller
*.spec

# pycharm/intellij
# Jetbrains IDEs; PyCharm/IntelliJ
.idea
17 changes: 6 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
# Which contributions get accepted and which ones don't?

For the sake of maintainability and ease-of-use standards, we can not accept all contributions that
come to spotDL - don't get us wrong, **ALL CONTRIBUTIONS ARE WELCOME...** So just which
For the sake of maintainability and ease-of-use standards, we are not able to accept all contributions that come to spotDL - don't get us wrong, **ALL CONTRIBUTIONS ARE WELCOME...** So just which
contributions get accepted and which ones don't? That's what we're here to answer.

<br><br>

# A short note to contributors

1. Further on in this document, we use the term 'Users' interchangeably for both people who use
spotDL as a command line tool and those who use spotDL as a library.
1. Further on in this document, we use the term 'Users' interchangeably for both people who use spotDL as a command line tool and those who use spotDL as a library.

2. These requirements are aimed at helping future contributors (people like you) more than its
aimed at users, code quality and other such things.
2. These requirements are aimed at helping future contributors (people like you) more than its aimed at users, code quality and other such things.

3. Most of the requirements we need for a contribution to be accepted overlap with each other, so
our 5-point requirements is more of a 3.5-point requirements.
3. Most of the requirements we need for a contribution to be accepted overlap with each other, so our 5-point requirements is more of a 3.5-point requirements.

4. Yes, there might be times when you can't both improve spotDL and stick to the requirements,
in those rare cases, focus on improvement first and do your best ot meet the requirements.
Sometimes, you have to take a step back to take several forward.
4. Yes, there might be times when you can't both improve spotDL and stick to the requirements, in those rare cases, focus on improvement first and do your best ot meet the requirements.
ometimes, you have to take a step back to take several forward.

5. Most of the requirements are subjective to an extent. In your view, your code might meet the
requirements, in reality, from the experience handling many, many previous contributions, this
Expand Down
16 changes: 12 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,18 @@

# spotDL

> The fastest, easiest, and most accurate command-line music downloader
> **The fastest, easiest, and most accurate command-line music downloader**
[![MIT License](https://img.shields.io/apm/l/atomic-design-ui.svg?)](https://github.com/spotDL/spotify-downloader/blob/master/LICENSE)
![Contributors](https://img.shields.io/github/contributors/spotDL/spotify-downloader)
![downloads](https://img.shields.io/github/downloads/spotDL/spotify-downloader/latest/total)
[![BCH compliance](https://bettercodehub.com/edge/badge/spotDL/spotify-downloader?branch=master)](https://bettercodehub.com/)
[![pypi version](https://img.shields.io/pypi/pyversions/spotDL)](https://pypi.org/project/spotdl/)
[![pypi version](https://img.shields.io/pypi/v/spotDL)](https://pypi.org/project/spotdl/)
[![pypi downloads](https://img.shields.io/pypi/dw/spotDL?label=downloads@pypi)](https://pypi.org/project/spotdl/)
[![Discord](https://img.shields.io/discord/771628785447337985.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/xCa23pwJWY)
![GitHub commits since latest release (by date)](https://img.shields.io/github/commits-since/spotDL/spotify-downloader/latest)

[![MIT License](https://img.shields.io/apm/l/atomic-design-ui.svg?)](https://github.com/spotDL/spotify-downloader/blob/master/LICENSE) ![Contributors](https://img.shields.io/github/contributors/spotDL/spotify-downloader) ![downloads](https://img.shields.io/github/downloads/spotDL/spotify-downloader/latest/total) [![BCH compliance](https://bettercodehub.com/edge/badge/spotDL/spotify-downloader?branch=master)](https://bettercodehub.com/)
[![pypi version](https://img.shields.io/pypi/v/spotDL)](https://pypi.org/project/spotdl/) [![pypi downloads](https://img.shields.io/pypi/dw/spotDL?label=downloads@pypi)](https://pypi.org/project/spotdl/) [![pypi version](https://img.shields.io/pypi/pyversions/spotDL)](https://pypi.org/project/spotdl/)

What spotDL does:

Expand All @@ -24,7 +32,7 @@ We rebuilt spotDL from scratch to be faster, simpler, and better than spotDL v2.

⚠ We have dropped the active development of spotDL v2 due to support and maintainability. No focused efforts will be made to resolve v2 specific issues.

#### Join the [spotDL discussion](https://github.com/spotDL/spotify-downloader/discussions?discussions_q=category%3AGeneral)!
### Join the [spotDL Discord!](https://discord.gg/xCa23pwJWY)!


## Installation
Expand Down

0 comments on commit 36f8a74

Please sign in to comment.