From e7a5eb86bb90dc029110f87d6b9a2f039508f405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Boros=20G=C3=A1bor?= <gabor.brs@gmail.com>
Date: Wed, 27 Mar 2019 22:43:35 +0100
Subject: [PATCH 1/2] Update issue templates and add PR template

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 47 +++++++++++------------
 .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++
 .github/PULL_REQUEST_TEMPLATE.md          | 15 ++++++++
 3 files changed, 57 insertions(+), 25 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index bd3133ce..e2f14929 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,32 +1,29 @@
-Issue tracker is **ONLY** used for reporting bugs. NO NEW FEATURE ACCEPTED! Use [spectrum](https://spectrum.chat/rethinkdb) for supporting issues.
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug, not qualified
+assignees: gabor-boros
 
-<!--- Provide a general summary of the issue in the Title above -->
+---
 
-## Expected Behavior
-<!--- Tell us what should happen -->
+**Describe the bug**
+A clear and concise description of what the bug is.
 
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
+**To Reproduce**
+Steps to reproduce the behavior:
+1. TODO
 
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+**Expected behavior**
+A clear and concise description of what you expected to happen.
 
-## Steps to Reproduce
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
 
-## Context (Environment)
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+**System info**
+ - OS: [e.g. macOS Mojave 10.14.3]
+ - RethinkDB Version: [e.g. 2.4.0]
+ - Python client version: [e.g. 2.4.1
 
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Detailed Description
-<!--- Provide a detailed description of the change or addition you are proposing -->
-
-## Possible Implementation
-<!--- Not obligatory, but suggest an idea for implementing addition or change -->
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..817faa03
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement, not qualified, question
+assignees: gabor-boros
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..18768cbf
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+**Reason for the change**
+If applicable, link the related issue/bug report or write down in few sentences the motivation.
+
+**Description**
+A clear and concise description of what did you changed and why.
+
+**Code examples**
+If applicable, add code examples to help explain your changes.
+
+**Checklist**
+- [ ] Unit tests created/modified
+- [ ] Integration tests created/modified
+
+**References**
+Anything else related to the change e.g. documentations, RFCs, etc.

From 6521d78d3bcbcfad9bd0b228011825179c7ac495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Boros?= <gabor.brs@gmail.com>
Date: Thu, 18 Apr 2019 20:20:19 +0200
Subject: [PATCH 2/2] Cleanup a bit after #111 and #108 and add Python 3.8-dev
 to the build matrix

---
 .travis.yml      | 7 ++++---
 requirements.txt | 6 ++++--
 setup.py         | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 48a482e1..832d2cd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,14 @@ python:
     - "3.5"
     - "3.6"
     - "3.7"
+    - "3.7-dev"
+    - "3.8-dev"
 
 allow_failure:
-    - python: "3.7"
+    - python: "3.8-dev"
 
 install:
     - pip install -r requirements.txt
-    - pip install -r requirements-dev.txt
 
 before_script:
     - make prepare
@@ -30,7 +31,7 @@ deploy:
     provider: script
     script: make upload-pypi
     on:
-        python: 3.6
+        python: 3.7
         tags: true
 
 notifications:
diff --git a/requirements.txt b/requirements.txt
index 42acbbc8..9b0e0ed6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,10 @@
+async-generator==1.10; python_version>="3.6"
 codacy-coverage==1.3.11
 mock==2.0.0
 pytest-cov==2.6.1
+pytest-tornasync; python_version >= '3.5'
+pytest-trio==0.5.2; python_version>="3.6"
 pytest==4.4.0
 six==1.12.0
+tornado>=5.0
 trio==0.11.0; python_version>="3.6"
-pytest-trio==0.5.2; python_version>="3.6"
-async-generator==1.10; python_version>="3.6"
diff --git a/setup.py b/setup.py
index 6315914f..e9d5894c 100644
--- a/setup.py
+++ b/setup.py
@@ -69,10 +69,10 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     packages=[
         'rethinkdb',