pypi (pre) release

README.md

@@ -1,13 +1,15 @@
 # neworder
 
+![PyPI](https://img.shields.io/pypi/v/neworder)
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/neworder)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/neworder)
+
 [![Build Status](https://travis-ci.org/virgesmith/neworder.png?branch=master)](https://travis-ci.org/virgesmith/neworder) 
 [![Build status](https://ci.appveyor.com/api/projects/status/oycn4is2insoiun7?svg=true)](https://ci.appveyor.com/project/virgesmith/neworder)
 [![License](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT)
 [![Documentation Status](https://readthedocs.org/projects/neworder/badge/?version=latest)](https://neworder.readthedocs.io/en/latest/?badge=latest)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/2f3d4cbf0d174b07b527c64b700db77f)](https://www.codacy.com/app/virgesmith/neworder?utm_source=github.com&utm_medium=referral&utm_content=virgesmith/neworder&utm_campaign=Badge_Grade)
 
-![Mortality histogram](./docs/examples/img/mortality_hist_100k.gif)
-
 *neworder* is a microsimulation framework inspired by [openm++](https://openmpp.org/), [MODGEN](https://www.statcan.gc.ca/eng/microsimulation/modgen/modgen) and, to a lesser extent, the python-based [LIAM2](http://liam2.plan.be/pages/about.html) tool, and can be thought of powerful best-of-both-worlds hybrid of MODGEN and LIAM2. Modellers can define their models in a a simple. well-known language, yet benefit from the efficiency of compiled code and parallel execution:
 
 - **python module**: easy to install and integrate, available on all common platforms
@@ -36,10 +38,10 @@ but the module will work perfectly well in serial mode without these.
 
 ### PyPI
 
-Pre-release now available on [test.pypi.org](https://test.pypi.org/project/neworder/):
+Pre-release now available:
 
 ```bash
-pip install -i https://test.pypi.org/simple/ neworder
+pip install neworder
 ```
 
 ### Conda

VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

setup.py

@@ -86,31 +86,6 @@ def __str__(self):
   ),
 ]
 
-
-# # # cf http://bugs.python.org/issue26689
-# def has_flag(compiler, flagname):
-#   """Return a boolean indicating whether a flag name is supported on
-#   the specified compiler.
-#   """
-#   import tempfile
-#   import os
-#   with tempfile.NamedTemporaryFile('w', suffix='.cpp', delete=False) as f:
-#       f.write('int main (int argc, char **argv) { return 0; }')
-#       fname = f.name
-#   try:
-#       compiler.compile([fname], extra_postargs=[flagname])
-#   except setuptools.distutils.errors.CompileError:
-#       return False
-#   finally:
-#       try:
-#           os.remove(fname)
-#       except OSError:
-#           pass
-#   return True
-
-
-
-
 class BuildExt(build_ext):
   """A custom build extension for adding compiler-specific options."""
   # c_opts = {
@@ -145,17 +120,22 @@ def build_extensions(self):
     build_ext.build_extensions(self)
 
 setup(
-    name='neworder',
-    version=version(),
-    author='Andrew P Smith',
-    author_email='a.p.smith@leeds.ac.uk',
-    url='https://github.com/virgesmith/neworder',
-    description='A dynamic microsimulation framework',
-    long_description = readme(),
-    long_description_content_type="text/markdown",
-    ext_modules=ext_modules,
-    setup_requires=['pybind11>=2.5.0', 'pytest-runner'],
-    tests_require=['pytest'],    
-    cmdclass={'build_ext': BuildExt},
-    zip_safe=False,
+  name='neworder',
+  version=version(),
+  author='Andrew P Smith',
+  author_email='a.p.smith@leeds.ac.uk',
+  url='https://github.com/virgesmith/neworder',
+  description='A dynamic microsimulation framework',
+  long_description = readme(),
+  long_description_content_type="text/markdown",
+  ext_modules=ext_modules,
+  setup_requires=['pybind11>=2.5.0', 'pytest-runner'],
+  tests_require=['pytest'],    
+  cmdclass={'build_ext': BuildExt},
+  classifiers=(
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+  ),    
+  zip_safe=False,
 )