summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Sztolcman <marcin@urzenia.net>2017-12-16 07:51:59 +0100
committerMarcin Sztolcman <marcin@urzenia.net>2017-12-16 07:51:59 +0100
commitb4962c95d82df7a48e6ce220c81da64571378da5 (patch)
treeb64a07e53103bd6d86db7a0d4573ef5586ebe492
parentd8f310dd571f66458a7fce1635549c3a48c5dad5 (diff)
parentee3ea177a8550d43e8dc2020dfb3f86045d3d5a8 (diff)
Merge branch 'master' of github.com:dbcli/pgcli
-rw-r--r--changelog.rst8
-rw-r--r--setup.py1
2 files changed, 8 insertions, 1 deletions
diff --git a/changelog.rst b/changelog.rst
index 93d8f853..a7a1f66c 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -2,9 +2,14 @@ Upcoming
========
* Use other prompt (prompt_dsn) when connecting using --dsn parameter. (Thanks: `Marcin Sztolcman`_)
+TODO
+
+1.8.2
+=====
+
Internal changes:
-----------------
-* Use temporary dir as config location in tests
+* Use temporary dir as config location in tests. (Thanks: `Dmitry B`_)
* Fix errors in the ``tee`` test (#795 and #797). (Thanks: `Irina Truong`_)
* Increase timeout for quitting pgcli. (Thanks: `Dick Marinus`_)
@@ -757,3 +762,4 @@ Improvements:
.. _`Gustavo Castro`: https://github.com/gustavo-castro
.. _`Alexander Schmolck`: https://github.com/aschmolck
.. _`Andrew Speed`: https://github.com/AndrewSpeed
+.. _`Dmitry B`: https://github.com/oxitnik
diff --git a/setup.py b/setup.py
index d8ecb182..ed1f8bac 100644
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@ setup(
'License :: OSI Approved :: BSD License',
'Operating System :: Unix',
'Programming Language :: Python',
+ 'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',