Skip to content

Commit 8ee624a

Browse files
committed
Remove py26 from our CI tests
1 parent 4916e5a commit 8ee624a

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: python
22
python:
3-
- "2.6"
43
- "2.7"
54
- "3.3"
65
- "3.4"

docs/getting_started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This page gives an introduction to **python-stix** and how to use it.
1010
Prerequisites
1111
-------------
1212

13-
The python-stix library provides an API for creating or processing STIX content. As such, it is a developer tool that can be leveraged by those who know Python 2.6/2.7 and are familiar with object-oriented programming practices, Python package layouts, and are comfortable with the installation of Python libraries. To contribute code to the python-stix repository, users must be familiar with `git`_ and `GitHub pull request`_ methodologies. Understanding XML, XML Schema, and the STIX language is also incredibly helpful when using python-stix in an application.
13+
The python-stix library provides an API for creating or processing STIX content. As such, it is a developer tool that can be leveraged by those who know Python 2.7/3.3+ and are familiar with object-oriented programming practices, Python package layouts, and are comfortable with the installation of Python libraries. To contribute code to the python-stix repository, users must be familiar with `git`_ and `GitHub pull request`_ methodologies. Understanding XML, XML Schema, and the STIX language is also incredibly helpful when using python-stix in an application.
1414

1515
.. _git: http://git-scm.com/documentation
1616
.. _GitHub pull request: https://help.github.com/articles/using-pull-requests

tox.ini

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py26, py27, py33, py34, py35, py36, lxml23, no-maec
2+
envlist = py27, py33, py34, py35, py36, lxml23, no-maec
33

44
[testenv]
55
commands =
@@ -13,7 +13,7 @@ deps =
1313
# We call this "lxml23" instead of "rhel6", since RHEL6 ships with LXML 2.2.3.
1414
# python-stix requires at least 2.3.
1515
[testenv:lxml23]
16-
basepython=python2.6
16+
basepython=python2.7
1717
commands =
1818
nosetests stix
1919
deps =
@@ -32,8 +32,7 @@ deps =
3232

3333
[travis]
3434
python =
35-
2.6: py26, lxml23, no-maec
36-
2.7: py27, docs, no-maec
35+
2.7: py27, docs, lxml23, no-maec
3736
3.3: py33, no-maec
3837
3.4: py34, no-maec
3938
3.5: py35, no-maec

0 commit comments

Comments
 (0)