From 5fc02df33d3032521b7d8ca351588e1ea3fe6ac1 Mon Sep 17 00:00:00 2001
From: Takafumi Arakaki <aka.tkf@gmail.com>
Date: Tue, 23 Oct 2018 23:47:29 -0700
Subject: [PATCH] Teak setup.py

* Pass markdown directly to `long_description` and specify
  `long_description_content_type`.  Don't use pandoc.
* Load version from `julia/release.py`.  This number can be accessed via
  `julia.__version__` at runtime now.
* Bump version number to 0.2.0.dev.
* Pass `zip_safe=False`.
---
 julia/__init__.py |  1 +
 julia/release.py  |  5 +++++
 setup.py          | 49 ++++++++++++++++++++++++++++++++++-------------
 3 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 julia/release.py

diff --git a/julia/__init__.py b/julia/__init__.py
index fd4a2346..885a235b 100644
--- a/julia/__init__.py
+++ b/julia/__init__.py
@@ -1 +1,2 @@
+from .release import __version__
 from .core import JuliaError, LegacyJulia as Julia
diff --git a/julia/release.py b/julia/release.py
new file mode 100644
index 00000000..76bf8259
--- /dev/null
+++ b/julia/release.py
@@ -0,0 +1,5 @@
+# This file is executed via setup.py and imported via __init__.py
+
+__version__ = "0.2.0.dev"
+# For Python versioning scheme, see:
+# https://www.python.org/dev/peps/pep-0440/#version-scheme
diff --git a/setup.py b/setup.py
index 66ab2a92..bc9ed41f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,23 +1,41 @@
 #!/usr/bin/env python
-"""Julia/Python bridge with IPython support.
-"""
 
 from setuptools import setup
-import sys
+import os
 
-doc = __doc__
+
+def pyload(name):
+    ns = {}
+    with open(name) as f:
+        exec(compile(f.read(), name, "exec"), ns)
+    return ns
+
+# In case it's Python 2:
 try:
-    import pypandoc
-    with open('README.md') as f:
-        desc = f.read()
-    print('will convert description from markdown to rst.')
-    doc = pypandoc.convert(desc, 'rst', format='markdown')
-except Exception:
-    print('Unable to convert markdown to rst. Please install `pypandoc` and `pandoc` to use markdown long description.')
+    execfile
+except NameError:
+    pass
+else:
+    def pyload(path):
+        ns = {}
+        execfile(path, ns)
+        return ns
+
+
+repo_root = os.path.abspath(os.path.dirname(__file__))
+
+with open(os.path.join(repo_root, "README.md")) as f:
+    long_description = f.read()
+# https://packaging.python.org/guides/making-a-pypi-friendly-readme/
+
+ns = pyload(os.path.join(repo_root, "julia", "release.py"))
+version = ns["__version__"]
 
 setup(name='julia',
-      version='0.1.5',
-      description=doc,
+      version=version,
+      description="Julia/Python bridge with IPython support.",
+      long_description=long_description,
+      long_description_content_type="text/markdown",
       author='The Julia and IPython development teams.',
       author_email='julia@julialang.org',
       license='MIT',
@@ -42,6 +60,7 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
       ],
       url='http://julialang.org',
       packages=['julia'],
@@ -51,4 +70,8 @@
               "python-jl = julia.python_jl:main",
           ],
       },
+      # We bundle Julia scripts etc. inside `julia` directory.  Thus,
+      # this directory must exist in the file system (not in a zip
+      # file):
+      zip_safe=False,
       )