Merge branch 'updatePackaging' into nullforce

Author: nullforce

README.md

@@ -4,7 +4,7 @@ Python bindings for Derpibooru's API
 
 License: **Simplified BSD License**
 
-Version: **0.7**
+Version: **0.8**
 
 ## Features
 
@@ -18,6 +18,13 @@ Version: **0.7**
 - python2.7 or newer
 - requests
 
+## About this Fork
+
+This is a fork of the DerPyBooru package; it is meant to be a drop in replacement
+for the modules in that package.
+
+To use, use `derpybooru_nullforce` where you see `derpybooru` used below.
+
 ## How to install
 
 ### Python 2.7
@@ -27,7 +34,7 @@ Version: **0.7**
 ### Python 3.x
 
     $ pip3 install derpybooru
- 
+
 ## Checking documentation
 
 ### Python 2.7
@@ -112,6 +119,7 @@ q = {
 
 wallpapers = [image for image in Search().query(*q)]
 ```
+
 ### Getting the latest images from a watchlist
 
 ```python
@@ -123,4 +131,10 @@ key = "your_api_key"
 for post in Search().key(key).watched(user.ONLY):
   id_number, score, tags = post.id, post.score, ", ".join(post.tags)
   print("#{} - score: {:>3} - {}".format(id_number, score, tags))
+```
+
+## Changelog
+
+**0.8.0**
 
+* Updated sort to include *wilson* and *width*

derpibooru/__init__.py

@@ -19,10 +19,10 @@
 """
 
 __title__ = "DerPyBooru"
-__version__ = "0.7.2"
+__version__ = "0.8.0"
 __author__ = "Joshua Stone"
 __license__ = "Simplified BSD Licence"
-__copyright__ = "Copyright (c) 2014, Joshua Stone"
+__copyright__ = "Copyright (c) 2014-2018, Joshua Stone, Nullforce"
 
 from .search import Search
 from .query import query

setup.py

@@ -1,21 +1,33 @@
 #!/usr/bin/env python
 
+from os import path
 from setuptools import setup
 from setuptools import find_packages
 
+here = path.abspath(path.dirname(__file__))
+
+# Get the long description from the README file
+with open(path.join(here, 'README.md'), encoding='utf-8') as f:
+  long_description = f.read()
+
 setup(
-  name = "DerPyBooru",
+  name = "DerPyBooru_Nullforce",
+  # Versions should comply with PEP 440:
+  # https://www.python.org/dev/peps/pep-0440/
+  version = "0.8.0",
   description = "Python bindings for Derpibooru's API",
-  url = "https://github.com/joshua-stone/DerPyBooru",
-  version = "0.7.2",
-  author = "Joshua Stone",
-  author_email = "joshua.gage.stone@gmail.com",
+  long_description = long_description,
+  long_description_content_type = "text/markdown",
+  url = "https://github.com/nullforce-forks/NF-DerPyBooru",
+  author = "Nullforce",
+  author_email = "glenngit@nullforce.com",
   license = "Simplified BSD License",
   platforms = ["any"],
-  packages = find_packages(),
+  packages = find_packages(exclude=["tests"]),
   install_requires = ["requests"],
   include_package_data = True,
-  download_url = "https://github.com/joshua-stone/DerPyBooru/tarball/0.7.2",
+  #download_url = "https://github.com/joshua-stone/DerPyBooru/tarball/0.7.2",
+  # For a list of valid classifiers, see https://pypi.org/classifiers/
   classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
@@ -24,5 +36,6 @@
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3"
-  ]
+  ],
+  keywords = "derpibooru ponies pony mlp"
 )