summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmjith Ramanujam <amjith.r@gmail.com>2019-05-04 11:30:15 -0700
committerGitHub <noreply@github.com>2019-05-04 11:30:15 -0700
commit30c788917bf083aae6c4331ee102f8785c69432a (patch)
tree2a48de6687020fef612f81bff590b39359bf1c14
parent6d1b653e24278111d82b761c2ea1e66a0621a27d (diff)
parentf1fc86428191eabd0b5e7a8710765ed25cb16c6d (diff)
Merge pull request #1026 from dbcli/j-bennet/python37
[WIP] Build pgcli with 3.7.
-rw-r--r--.travis.yml8
-rw-r--r--changelog.rst5
-rw-r--r--setup.py1
-rw-r--r--tox.ini11
4 files changed, 18 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 04e570f2..2bb738e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,15 @@
+dist: xenial
+
+sudo: required
+
language: python
+
python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
+ - "3.7"
before_install:
- which python
@@ -43,4 +49,4 @@ services:
- postgresql
addons:
- postgresql: "9.3"
+ postgresql: "9.6"
diff --git a/changelog.rst b/changelog.rst
index cf86b06e..1546ff8d 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -9,6 +9,11 @@ Bug fixes:
* Pgcli no longer works with password containing spaces (#1043). (Thanks: `Irina Truong`_)
* Load keyring only when keyring is enabled in the config file (#1041). (Thanks: `Zhaolong Zhu`_)
+Internal:
+---------
+
+* Add python 3.7 to travis build matrix. (Thanks: `Irina Truong`_)
+
2.1.0
=====
diff --git a/setup.py b/setup.py
index 13c76c02..6c25b7a4 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
'Programming Language :: SQL',
'Topic :: Database',
'Topic :: Database :: Front-Ends',
diff --git a/tox.ini b/tox.ini
index 712db9cb..c8c75517 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,10 @@
[tox]
-envlist = py27, py34, py35, py36
+envlist = py27, py34, py35, py36, py37
[testenv]
-deps = pytest
- mock
- pgspecial
- humanize
- psycopg2
+deps = pytest>=2.7.0,<=3.0.7
+ mock>=1.0.1
+ behave>=1.2.4
+ pexpect==3.3
commands = py.test
behave tests/features
passenv = PGHOST