Merge pull request #408 from github/rel-0-9-8

Rel 0.9.8 with a bunch of pypi readme/description fixes

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.9.8 - 2019-09-30 - One with no changes b/c PyPi description problems
+
+* No material changes
+
 ## v0.9.7 - 2019-09-30 - It's about time
 
 * AkamaiProvider, ConstellixProvider, MythicBeastsProvider, SelectelProvider,

README.md

@@ -90,8 +90,8 @@ Now that we have something to tell OctoDNS about our providers & zones we need t
   ttl: 60
   type: A
   values:
-    - 1.2.3.4
-    - 1.2.3.5
+  - 1.2.3.4
+  - 1.2.3.5
 ```
 
 Further information can be found in [Records Documentation](/docs/records.md).

octodns/__init__.py

@@ -3,4 +3,4 @@
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
-__VERSION__ = '0.9.7'
+__VERSION__ = '0.9.8'

requirements-dev.txt

@@ -5,5 +5,6 @@ pycodestyle==2.4.0
 pycountry>=18.12.8
 pycountry_convert>=0.7.2
 pyflakes==1.6.0
+readme_renderer[md]==24.0
 requests_mock
 twine==1.13.0

script/release

@@ -22,5 +22,6 @@ git tag -s "v$VERSION" -m "Release $VERSION"
 git push origin "v$VERSION"
 echo "Tagged and pushed v$VERSION"
 python setup.py sdist
+twine check dist/*$VERSION.tar.gz
 twine upload dist/*$VERSION.tar.gz
 echo "Uploaded $VERSION"

setup.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from StringIO import StringIO
 from os.path import dirname, join
 import octodns
 
@@ -21,6 +22,39 @@ console_scripts = {
     for name in cmds
 }
 
+
+def long_description():
+    buf = StringIO()
+    yaml_block = False
+    supported_providers = False
+    with open('README.md') as fh:
+        for line in fh:
+            if line == '```yaml\n':
+                yaml_block = True
+                continue
+            elif yaml_block and line == '---\n':
+                # skip the line
+                continue
+            elif yaml_block and line == '```\n':
+                yaml_block = False
+                continue
+            elif supported_providers:
+                if line.startswith('## '):
+                    supported_providers = False
+                    # write this line out, no continue
+                else:
+                    # We're ignoring this one
+                    continue
+            elif line == '## Supported providers\n':
+                supported_providers = True
+                continue
+            buf.write(line)
+    buf = buf.getvalue()
+    with open('/tmp/mod', 'w') as fh:
+        fh.write(buf)
+    return buf
+
+
 setup(
     author='Ross McFarland',
     author_email='[email protected]',
@@ -40,7 +74,7 @@ setup(
         'requests>=2.20.0'
     ],
     license='MIT',
-    long_description=open('README.md').read(),
+    long_description=long_description(),
     long_description_content_type='text/markdown',
     name='octodns',
     packages=find_packages(),