Major update to version 1.0

.github/workflows/main.yml

@@ -0,0 +1,37 @@
+name: SoundScrape CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "macos-latest"]
+        python-version: [3.7, 3.8]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 black pytest coverage
+        pip install -r requirements.txt
+    - name: Black code formatting
+      run: |
+        black --check --line-length 127 .
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --ignore=E203,E231 --statistics
+    - name: Run tests
+      run: |
+        PYTHONPATH=$(pwd) coverage run -m --include="soundscrape/*" pytest tests/test.py
+    - name: Coverage report
+      run: |
+        coverage report -m

.gitignore

@@ -1,6 +1,12 @@
+.vscode/
+build/
+dist/
 env/
+htmlcov/
+.coverage
 *.DS_Store
 *.pyc
 *.bak
-build/
-dist/
+*.mp3
+*.m4a
+*.tmp

README.md

@@ -1,9 +1,9 @@
 ![SoundScrape!](http://i.imgur.com/nHAt2ow.png)
 
-SoundScrape [![Build Status](https://travis-ci.org/Miserlou/SoundScrape.svg)](https://travis-ci.org/Miserlou/SoundScrape) [![Python 2](https://img.shields.io/badge/Python-2-brightgreen.svg)](https://pypi.python.org/pypi/soundscrape/) [![Python 3](https://img.shields.io/badge/Python-3-brightgreen.svg)](https://pypi.python.org/pypi/soundscrape/) [![PyPI](https://img.shields.io/pypi/v/soundscrape.svg)](https://pypi.python.org/pypi/SoundScrape)
+SoundScrape [![Build Status](https://github.com/Miserlou/SoundScrape/workflows/SoundScrape%20CI/badge.svg)](https://github.com/Miserlou/SoundScrape/actions) [![Python 3](https://img.shields.io/badge/Python-3-brightgreen.svg)](https://pypi.python.org/pypi/soundscrape/) [![PyPI](https://img.shields.io/pypi/v/soundscrape.svg)](https://pypi.python.org/pypi/SoundScrape)
 ==============
 
-**SoundScrape** makes it super easy to download artists from SoundCloud (and Bandcamp and MixCloud) - even those which don't have download links! It automatically creates ID3 tags as well (including album art), which is handy.
+**SoundScrape** makes it super easy to download artists from SoundCloud (and others) - even those which don't have download links! It automatically creates ID3 tags as well (including album art), which is handy.
 
 Usage
 ---------
@@ -91,15 +91,6 @@ By default, SoundScrape will try to rip everything it can. However, if you only
 soundscrape sly-dogg -d
 ```
 
-Keep Preview Tracks
---------
-
-By default, SoundScrape will skip the 30-second preview tracks that SoundCloud now provides. You can choose to keep these preview snippets with the *-k* argument.
-
-```bash
-soundscrape chromeo -k
-```
-
 Folders
 --------
 
@@ -134,19 +125,6 @@ soundscrape -b http://music.monstercat.com/
 
 Note that the full URL must be included.
 
-Mixcloud
---------
-
-SoundScrape can also grab mixes from Mixcloud. This feature is extremely expermental and is in no way guaranteed to work!
-
-Finds the original mp3 of a mix and grabs that (with tags and album art) if it can, or else just gets the raw m4a stream.
-
-Mixcloud currently only takes an invidiual mix. Capacity for a whole artist's profile due shortly.
-
-```bash
-soundscrape https://www.mixcloud.com/corenewsuploads/flume-essential-mix-2015-10-03/ -of
-```
-
 Audiomack
 --------
 

requirements.txt

@@ -1,11 +1,10 @@
 args>=0.1.0
+atoma>=0.0.17
 clint>=0.3.2
 demjson>=2.2.2
-fudge>=1.0.3
-nose>=1.3.7
 requests[security]>=2.9.0
+sanitize-filename>=1.2.0
 setuptools>=18.0.0
-simplejson>=3.3.1
 soundcloud>=0.4.1
 wheel>=0.24.0
 mutagen>=1.31.0

setup.py

@@ -1,58 +1,46 @@
+"""Package setup for SoundScrape."""
 import os
-import setuptools
-import soundscrape
-import sys
 
 from setuptools import setup
 
-# To support 2/3 installation
-setup_version = int(setuptools.__version__.split('.')[0])
-if setup_version < 18:
-    print("Please upgrade your setuptools to install SoundScrape: ")
-    print("pip install -U pip wheel setuptools")
-    quit()
+import soundscrape
 
 # Set external files
 try:
     from pypandoc import convert
-    README = convert('README.md', 'rst')	 
+
+    README = convert("README.md", "rst")
 except ImportError:
-    README = open(os.path.join(os.path.dirname(__file__), 'README.md')).read()
+    README = open(os.path.join(os.path.dirname(__file__), "README.md")).read()
 
-with open(os.path.join(os.path.dirname(__file__), 'requirements.txt')) as f:
+with open(os.path.join(os.path.dirname(__file__), "requirements.txt")) as f:
     required = f.read().splitlines()
 
 # allow setup.py to be run from any path
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 setup(
-    name='soundscrape',
+    name="soundscrape",
     version=soundscrape.__version__,
-    packages=['soundscrape'],
+    packages=["soundscrape"],
     install_requires=required,
-    extras_require={ ':python_version < "3.0"': [ 'wsgiref>=0.1.2', ], },    
+    extras_requires={"tests": ["pytest", "coverage"],},
     include_package_data=True,
-    license='MIT License',
-    description='Scrape an artist from SoundCloud',
+    license="MIT License",
+    description="Scrape an artist from SoundCloud",
     long_description=README,
-    url='https://github.com/Miserlou/SoundScrape',
-    author='Rich Jones',
-    author_email='rich@openwatch.net',
-    entry_points={
-        'console_scripts': [
-            'soundscrape = soundscrape.soundscrape:main',
-        ]
-    },
+    url="https://github.com/Miserlou/SoundScrape",
+    author="Rich Jones",
+    author_email="rich@openwatch.net",
+    entry_points={"console_scripts": ["soundscrape = soundscrape.soundscrape:main",]},
     classifiers=[
-        'Environment :: Console',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Topic :: Internet :: WWW/HTTP',
-        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+        "Environment :: Console",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Topic :: Internet :: WWW/HTTP",
+        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
     ],
 )

soundscrape/__init__.py

@@ -1 +1,5 @@
-__version__ = '0.30.2'
+"""SoundScrape initialization."""
+
+# Semantic versioning
+# (reference: https://packaging.python.org/guides/distributing-packages-using-setuptools/#semantic-versioning-preferred)
+__version__ = "1.00"