From f22657170559749637957cafbbb70e73a1175407 Mon Sep 17 00:00:00 2001 From: M Milligan Date: Tue, 24 Apr 2018 17:50:02 -0500 Subject: [PATCH] prep for release 0.8.0 --- MANIFEST.in | 2 ++ README.md | 4 ++-- setup.py | 17 ++++++++++++++--- version.py | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..7d43f806 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +include *.md +include LICENSE diff --git a/README.md b/README.md index 7fb53f8c..2f4cfe20 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/jupyterhub/batchspawner.svg?branch=master)](https://travis-ci.org/jupyterhub/batchspawner) -This is a custom spawner for Jupyterhub that is designed for installations on clusters using batch scheduling software. +This is a custom spawner for [Jupyterhub](https://jupyterhub.readthedocs.io/) that is designed for installations on clusters using batch scheduling software. This began as a generalization of [mkgilbert's batchspawner](https://github.com/mkgilbert/slurmspawner) which in turn was inspired by [Andrea Zonca's blog post](http://zonca.github.io/2015/04/jupyterhub-hpc.html 'Run jupyterhub on a Supercomputer') where he explains his implementation for a spawner that uses SSH and Torque. His github repo is found [here](http://www.github.com/zonca/remotespawner 'RemoteSpawner'). @@ -12,7 +12,7 @@ This package formerly included WrapSpawner and ProfilesSpawner, which provide me 1. from root directory of this repo (where setup.py is), run `pip install -e .` If you don't actually need an editable version, you can simply run - `pip install git+https://github.com/jupyterhub/batchspawner` + `pip install batchspawner` 2. add lines in jupyterhub_config.py for the spawner you intend to use, e.g. diff --git a/setup.py b/setup.py index f556c1eb..d84d92e1 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ import os import sys -from distutils.core import setup +from setuptools import setup pjoin = os.path.join here = os.path.abspath(os.path.dirname(__file__)) @@ -23,18 +23,23 @@ with open(pjoin(here, 'version.py')) as f: exec(f.read(), {}, version_ns) +with open(pjoin(here, 'README.md'), encoding='utf-8') as f: + long_desc = f.read() + setup_args = dict( name = 'batchspawner', packages = ['batchspawner'], version = version_ns['__version__'], description = """Batchspawner: A spawner for Jupyterhub to spawn notebooks using batch resource managers.""", - long_description = "", + long_description = long_desc, + long_description_content_type = 'text/markdown', author = "Michael Milligan, Andrea Zonca, Mike Gilbert", author_email = "milligan@umn.edu, m code@andreazonca.com, mike@nau.edu", url = "http://jupyter.org", license = "BSD", platforms = "Linux, Mac OS X", - keywords = ['Interactive', 'Interpreter', 'Shell', 'Web'], + python_requires = '~=3.3', + keywords = ['Interactive', 'Interpreter', 'Shell', 'Web', 'Jupyter'], classifiers = [ 'Intended Audience :: Developers', 'Intended Audience :: System Administrators', @@ -43,6 +48,12 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 3', ], + project_urls = { + 'Bug Reports': 'https://github.com/jupyterhub/batchspawner/issues', + 'Source': 'https://github.com/jupyterhub/batchspawner/', + 'About Jupyterhub': 'http://jupyterhub.readthedocs.io/en/latest/', + 'Jupyter Project': 'http://jupyter.org', + } ) # setuptools requirements diff --git a/version.py b/version.py index c7d55736..52d33d49 100644 --- a/version.py +++ b/version.py @@ -5,7 +5,7 @@ 0, 8, 0, - 'rc0', # comment-out this line for a release +# 'rc0', # comment-out this line for a release ) __version__ = '.'.join(map(str, version_info))