From 4ed04fed1b9179bbe2acc73b92f68d5dbbaee1e7 Mon Sep 17 00:00:00 2001
From: Emmanuelle Vargas-Gonzalez <emmanuelle@mitre.org>
Date: Wed, 13 Jun 2018 14:52:21 -0400
Subject: [PATCH 1/3] Add FAQ section to python-stix. closes #352

---
 docs/index.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/index.rst b/docs/index.rst
index 30c11946..9d61b71d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -71,6 +71,18 @@ API Reference
    api/index
    api/coverage
 
+FAQ
+===
+
+- My RAM consumption rises when processing a large amount of files.
+    This problem is caused by a python-cybox_ caching mechanism that is enabled
+    by default. To prevent this issue from happening use the
+    ``cybox.utils.caches.cache_clear()`` method in your code/script to release
+    the cached resources as appropriate. Refer to the ``cybox`` documentation
+    for more details.
+
+.. _python-cybox: http://cybox.readthedocs.io/
+
 Contributing
 ============
 If a bug is found, a feature is missing, or something just isn't behaving the way you'd expect it to, please submit an issue to our `tracker`_. If you'd like to contribute code to our repository, you can do so by issuing a `pull request`_ and we will work with you to try and integrate that code into our repository.

From 288bbd11c0a1baae38b1e742e0cb604ba3d9b1c2 Mon Sep 17 00:00:00 2001
From: Emmanuelle Vargas-Gonzalez <emmanuelle@mitre.org>
Date: Wed, 13 Jun 2018 15:06:19 -0400
Subject: [PATCH 2/3] Add .pytest_cache/ to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9a9c7d31..a5ba1ac5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 # pycharm
 .idea/ 
 .idea
+.pytest_cache/
 
 # python setuptools
 build/

From aa0178099f45c606e20e2a35aa196422fa644dca Mon Sep 17 00:00:00 2001
From: Emmanuelle Vargas-Gonzalez <emmanuelle@mitre.org>
Date: Wed, 13 Jun 2018 15:34:10 -0400
Subject: [PATCH 3/3] Update Tox and Travis CI configuration

---
 .travis.yml | 1 -
 tox.ini     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d38a6fa1..05fdf8f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
diff --git a/tox.ini b/tox.ini
index c62be2ae..8067c9d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py33, py34, py35, py36, lxml23, no-maec
+envlist = py27, py34, py35, py36, lxml23, no-maec
 
 [testenv]
 commands =
@@ -33,7 +33,6 @@ deps =
 [travis]
 python =
   2.7: py27, docs, lxml23, no-maec
-  3.3: py33, no-maec
   3.4: py34, no-maec
   3.5: py35, no-maec
   3.6: py36, no-maec