From 795a0d88ebe310407e434bf198a7bc1b49d3e055 Mon Sep 17 00:00:00 2001
From: Jacob Alexander <haata@kiibohd.com>
Date: Wed, 11 Dec 2019 22:20:44 -0800
Subject: [PATCH] Merge pycapnp-async into pycapnp

- Remove references to pycapnp-async
- Cleanup README.md and setup.py
---
 README.md | 19 +++++++------------
 setup.py  | 17 +++++++++--------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index a441a66..6dda653 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
-# pycapnp-async
+# pycapnp
 
-[![Actions Status](https://github.com/haata/pycapnp-async/workflows/Python%20Test%20Packaging/badge.svg)](https://github.com/haata/pycapnp-async/actions)
+[![Actions Status](https://github.com/capnproto/pycapnp/workflows/Python%20Test%20Packaging/badge.svg)](https://github.com/capnproto/pycapnp/actions)
+
+[Cap'n'proto Mailing List](https://groups.google.com/forum/#!forum/capnproto)
 
 
 ## Requirements
@@ -23,13 +25,13 @@ pycapnp has additional development dependencies, including cython and pytest. Se
 
 ## Building and installation
 
-Install with `pip install pycapnp-async`. You can set the CC environment variable to control which compiler is used, ie `CC=gcc-8.2 pip install pycapnp-async`.
+Install with `pip install pycapnp`. You can set the CC environment variable to control which compiler is used, ie `CC=gcc-8.2 pip install pycapnp`.
 
 Or you can clone the repo like so:
 
 ```bash
-git clone https://github.com/haata/pycapnp-async.git
-cd pycapnp-async
+git clone https://github.com/capnproto/pycapnp.git
+cd pycapnp
 pip install .
 ```
 
@@ -82,13 +84,6 @@ python setup.py bdist_wheel
 ```
 
 
-### Pypi Upload Instructions
-
-Only necessary if uploading release to pypi.org.
-
-TODO
-
-
 ## Documentation/Example
 
 There is some basic documentation [here](http://jparyani.github.io/pycapnp/).
diff --git a/setup.py b/setup.py
index 4e2f100..f6f6ac3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 '''
-pycapnp-async distutils setup.py
+pycapnp distutils setup.py
 '''
 
 from __future__ import print_function
@@ -29,7 +29,7 @@ VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
 # Write version info
 def write_version_py(filename=None):
     '''
-    Generate pycapnp-async version
+    Generate pycapnp version
     '''
     cnt = """\
 version = '%s'
@@ -176,7 +176,7 @@ extensions = [Extension(
 )]
 
 setup(
-    name="pycapnp-async",
+    name="pycapnp",
     packages=["capnp"],
     version=VERSION,
     package_data={
@@ -195,14 +195,14 @@ setup(
         'console_scripts' : ['capnpc-cython = capnp._gen:main']
     },
     # PyPi info
-    description="A cython wrapping of the C++ Cap'n Proto library with support for asyncio",
+    description="A cython wrapping of the C++ Cap'n Proto library",
     long_description=long_description,
     license='BSD',
-    author="Jacob Alexander",
+    author="Jacob Alexander", # <- Current maintainer; Original author -> Jason Paryani (setup.py only supports 1 author...)
     author_email="haata@kiibohd.com",
-    url='https://github.com/haata/pycapnp-async',
-    download_url='https://github.com/haata/pycapnp-async/archive/v%s.zip' % VERSION,
-    keywords=['capnp', 'capnproto', "Cap'n Proto", 'pycapnp', 'pycapnp-async'],
+    url='https://github.com/capnproto/pycapnp',
+    download_url='https://github.com/haata/pycapnp/archive/v%s.zip' % VERSION,
+    keywords=['capnp', 'capnproto', "Cap'n Proto", 'pycapnp'],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
@@ -213,6 +213,7 @@ setup(
         'Programming Language :: C++',
         'Programming Language :: Cython',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Communications'],
 )