Merge pull request #532 from JamieMagee/master

Add python 3.5
praw-dev · Sep 22, 2015 · 42e6374 · 42e6374
2 parents 2b4cfe2 + a802b0c
commit 42e6374
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: python
 python:
-  - 2.6
   - 2.7
-  - 3.2
   - 3.3
   - 3.4
+  - 3.5
   - nightly
   - pypy
   - pypy3

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -51,6 +51,7 @@ Unreleased
  * **[FEATURE]** New :meth:`praw.objects.Redditor.get_friend_info` to see info
    about one of your friends. Includes their name, ID, when you added them, and
    if you have reddit Gold, your note about them.
+ * **[CHANGE]** Removed support for Python 2.6 and Python 3.2 (#532).
 
 PRAW 3.2.1
 ----------

diff --git a/setup.py b/setup.py
@@ -33,13 +33,10 @@
                  'License :: OSI Approved :: GNU General Public License (GPL)',
                  'Natural Language :: English',
                  'Operating System :: OS Independent',
-                 'Programming Language :: Python :: 2.6',
                  'Programming Language :: Python :: 2.7',
-                 'Programming Language :: Python :: 3',
-                 'Programming Language :: Python :: 3.1',
-                 'Programming Language :: Python :: 3.2',
                  'Programming Language :: Python :: 3.3',
                  'Programming Language :: Python :: 3.4',
+                 'Programming Language :: Python :: 3.5',
                  'Topic :: Utilities'],
     license='GPLv3',
     keywords='reddit api wrapper',

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py31,py32,py33,py34
+envlist = py27,py33,py34,py35
 skip_missing_interpreters = true
 
 [testenv]
-Original file line number
+Diff line change
@@ -1,10 +1,9 @@
     language: python
     python:
-      - 2.6
       - 2.7
-      - 3.2
       - 3.3
       - 3.4
+      - 3.5
       - nightly
       - pypy
       - pypy3
@@ Expand Down @@