Merge pull request #256 from eclecticiq/dependency_cleanup

Update Python versions, pin Ubuntu and service database images

Author: saaj

.github/workflows/tox.yml

@@ -7,29 +7,29 @@ on:
       - master
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "pypy-3.10"]
     services:
       mariadb:
-        image: mariadb
+        image: mariadb:10.11
         env:
           MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
           MARIADB_DATABASE: test
         ports:
           - 3307:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
       mysql:
-        image: mysql
+        image: mysql:8.1
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_DATABASE: test
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
       postgres:
-        image: postgres
+        image: postgres:15.4
         env:
           POSTGRES_PASSWORD: test
           POSTGRES_USER: test
@@ -44,7 +44,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install lxml dependencies
-      if: ${{ matrix.python-version == 'pypy-3.7' }}
+      if: ${{ matrix.python-version == 'pypy-3.10' }}
       run: |
         sudo apt-get install libxml2-dev libxslt-dev
     - name: Install dependencies

CHANGES.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.10.0 (unreleased)
+-------------------
+* Drop EOL Python 3.6 and 3.7 support
+* Add Python 3.11 support
+
 0.9.3 (2022-10-11)
 ------------------
 * Add public write support.

docs/installation.rst

@@ -7,9 +7,12 @@ Installation
 Install Python
 --------------
 
-OpenTAXII works with Python versions 3.6 - 3.10. You can download Python `here <http://www.python.org/download/>`_ or install it with your operating system’s package manager.
+OpenTAXII works with Python versions 3.8 - 3.11. You can download Python
+`here <http://www.python.org/download/>`_ or install it with your operating system’s
+package manager.
 
-You can verify that Python is installed by typing ``python`` or ``python3`` in your shell. You should see something like::
+You can verify that Python is installed by typing ``python`` or ``python3`` in your
+shell. You should see something like::
 
     $ python3
     Python 3.10.1 (main, Dec 11 2021, 17:22:55) [GCC 11.1.0] on linux
@@ -18,7 +21,10 @@ You can verify that Python is installed by typing ``python`` or ``python3`` in y
 
 Install OpenTAXII
 -----------------
-To sandbox the project and protect system-wide python it is recommended to install OpenTAXII into a `virtual environment <https://virtualenv.pypa.io/en/latest/installation.html>`_ (*virtualenv*).
+To sandbox the project and protect system-wide python it is recommended to install
+OpenTAXII into a
+`virtual environment <https://virtualenv.pypa.io/en/latest/installation.html>`_
+(*virtualenv*).
 
 Create a virtual environment named venv::
 
@@ -41,23 +47,29 @@ Without the virtual environment it's just::
    $ pip install opentaxii
 
 .. note::
-    Since OpenTAXII has `libtaxii <https://github.com/TAXIIProject/libtaxii>`_ as a dependency, the system libraries
-    `libtaxii` will be installed. Check
-    `libtaxii documentation <http://libtaxii.readthedocs.org/en/latest/installation.html#dependencies>`_ for the details.
+    Since OpenTAXII has `libtaxii <https://github.com/TAXIIProject/libtaxii>`_ as a
+    dependency, the system libraries `libtaxii` will be installed. Check
+    `libtaxii documentation
+    <http://libtaxii.readthedocs.org/en/latest/installation.html#dependencies>`_ for the
+    details.
 
-To install OpenTAXII from source files: download tarball, unpack it and install it manually with::
+To install OpenTAXII from source files: download tarball, unpack it and install it
+manually with::
 
    $ python setup.py install
 
 
 Versioning
 ----------
 
-Releases of OpenTAXII are given major.minor.revision version numbers, where major and minor correspond to the roadmap EclecticIQ has. The revision number is used to indicate a bug fix only release.
+Releases of OpenTAXII are given major.minor.revision version numbers, where major and
+minor correspond to the roadmap EclecticIQ has. The revision number is used to indicate
+a bug fix only release.
 
 
 .. rubric:: Next steps
 
-Continue to :doc:`Configuration <configuration>` page to learn how to configure OpenTAXII.
+Continue to :doc:`Configuration <configuration>` page to learn how to configure
+OpenTAXII.
 
 .. vim: set spell spelllang=en:

opentaxii/_version.py

@@ -3,4 +3,4 @@
 This module defines the package version for use in __init__.py and setup.py.
 """
 
-__version__ = '0.9.3'
+__version__ = '0.10.0'

setup.py

@@ -53,11 +53,10 @@ def get_file_contents(filename):
         'Intended Audience :: Information Technology',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Internet',
         'Topic :: Security',

tox.ini

@@ -1,16 +1,14 @@
 [tox]
 skipsdist = True
-envlist = py36-sqlalchemy{13,14}-werkzeuglt21-{sqlite,mysql,mariadb,postgres},
-          py{37,38,39,310,py3,ston}-sqlalchemy{13,14}-werkzeug{lt21,gte21}-{sqlite,mysql,mariadb,postgres}
+envlist = py{38,39,310,311,py3}-sqlalchemy{13,14}-werkzeug{lt21,gte21}-{sqlite,mysql,mariadb,postgres}
 
 [gh-actions]
 python =
-    3.6: py36
-    3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
-    pypy-3.7: pypy3
+    3.11: py311
+    pypy-3.10: pypy3
 
 [testenv]
 commands =