Skip to content

Commit

Permalink
Refactor setup.py. Add setup.cfg. modify issue & PR templates. (#1096)
Browse files Browse the repository at this point in the history
* Transition to setup.cfg rather than setup.py

* Update setup.cfg

* add packages

* Add Readme to PyPi

* Spacing

* Delete oldsetup.py

* Drop Version Support for Py3.6

* Update as for #1098

* Fix Critical Error in setup.py

Had comma separated list rather than semi colon. Prevented setup.py from functioning

* Add 3.9 classifier

* Update setup.cfg

* Drop py3.6 support

* Re-add Py3.6 support

* Change Email

* Remove `requests`

* add tqdm to requirements

* Fix Line Lengths in bug report template

it was annoying me lol

* Update and rename pull_request_template.md to PULL_REQUEST_TEMPLATE.md
  • Loading branch information
Silverarmor authored Jan 12, 2021
1 parent dbdc9e6 commit a40dc14
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 84 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ assignees: ''
<!--- If from pip, what is the version? Run "pip show spotdl" -->
<!--- If not from pip, what is the commit hash? -->

------------------------------------------------------------
---------

### Expected Behaviour
<!--- What did you expect to happen? -->
Expand All @@ -38,7 +38,7 @@ assignees: ''
2.
3.

--------------------------------------------------------------------
---------

### Traceback

Expand All @@ -47,6 +47,6 @@ assignees: ''
```

--------------------------------------------------------------------
---------

### Any other information:
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<!--- PLEASE REMEMBER TO ADD THE "BUGFIX" OR "ENHANCEMENT" LABEL TO YOUR PR -->


## Design
<!--- Describe the problem or feature in addition to a link to the issues. -->

Expand Down
63 changes: 63 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
[metadata]
name = spotdl
#! PyPi follows Semantic Versioning - http://semver.org/
version = 3.2.2

url = https://github.com/spotDL/spotify-downloader
download_url = https://pypi.org/project/spotdl/

author = spotDL Team
author_email = spotdladmins@googlegroups.com

license = MIT

description = Download your Spotify playlists and songs along with album art and metadata
long_description = file: README.md
long_description_content_type = text/markdown

keywords =
spotify
downloader
download
music
youtube
mp3
album
metadata

classifiers =
Intended Audience :: End Users/Desktop
License :: OSI Approved :: MIT License
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3 :: Only
Topic :: Multimedia
Topic :: Multimedia :: Sound/Audio
Topic :: Utilities

[options]
install_requires =
spotipy
pytube
rich
rapidfuzz
mutagen
ytmusicapi
tqdm

python_requires = >=3.6

packages = spotdl, spotdl.search, spotdl.download


[options.extras_require]
test = pytest>=6.0; pytest-mock==3.3.1; pytest-vcr==1.0.2; pyfakefs==4.3.0; pytest-cov==2.10.1
dev = tox

[options.entry_points]
console_scripts=
spotdl = spotdl:__main__
83 changes: 2 additions & 81 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,83 +1,4 @@
from setuptools import setup

long_desc = open('README.md', encoding = 'utf-8').read()

setup(
# 'spotify-downloader' was already taken (>﹏<)
name = "spotdl",

packages = [
'spotdl',
'spotdl.search',
'spotdl.download',
],

#! PyPi follows Semantic Versioning - http://semver.org/
version = '3.2.1',

install_requires = [
'spotipy',
'pytube',
'tqdm',
'rapidfuzz',
'requests',
'mutagen',
'ytmusicapi',
],

extras_require={
"test": [
"pytest>=6.0",
"pytest-mock==3.3.1",
"pytest-vcr==1.0.2",
"pyfakefs==4.3.0",
"pytest-cov==2.10.1"
],
"dev": [
"tox"
]
},

description="Downloads Spotify music from Youtube with metadata and album art",
long_description=long_desc,
long_description_content_type='text/markdown',

author="spotDL Team",
author_email="unrealengin71+PyPi@gmail.com",

license="MIT",

python_requires=">=3.6",

url="https://github.com/spotDL/spotify-downloader",
download_url="https://pypi.org/project/spotdl/",

keywords=[
"spotify",
"downloader",
"download",
"music",
"youtube",
"mp3",
"album",
"metadata",
],

classifiers=[
"Intended Audience :: End Users/Desktop",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3 :: Only",
"Topic :: Multimedia",
"Topic :: Multimedia :: Sound/Audio",
"Topic :: Utilities",
],

entry_points = {
"console_scripts": ["spotdl = spotdl.__main__:console_entry_point"]
}
)
if __name__ == "__main__":
setup()

0 comments on commit a40dc14

Please sign in to comment.