diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d84fd753..4acd2e99 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,6 @@ env: jobs: build: runs-on: ubuntu-20.04 - container: ${{ matrix.container }} strategy: fail-fast: false matrix: @@ -22,24 +21,12 @@ jobs: - "3.10" - "3.11" - "3.12" - include: - - python: "2.7" - container: "python:2.7" steps: - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} - if: matrix.container == null - - name: Install sudo - run: apt-get update && apt-get install -y sudo debian-archive-keyring - if: matrix.container != null - - name: Install git and git-annex from backports - run: | - echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list - apt-get update && apt-get install -y git/buster-backports git-annex/buster-backports - if: matrix.container != null - name: Install dependencies run: pip install -r requirements-test.txt - name: Install RPM tools diff --git a/docs/source/development.rst b/docs/source/development.rst index c69d32e1..be9f5ece 100644 --- a/docs/source/development.rst +++ b/docs/source/development.rst @@ -1,7 +1,7 @@ Developing Obal =============== -Obal is written with support for Python 2.7 and Python 3.5 or higher. To provide the command line we rely on the Python built in `argparse`_ and `Ansible`_. For testing we use `Pytest`_ but this is wrapped up with `Tox`_ to test multiple environments. +Obal is written with support for Python 3.5 or higher. To provide the command line we rely on the Python built in `argparse`_ and `Ansible`_. For testing we use `Pytest`_ but this is wrapped up with `Tox`_ to test multiple environments. .. _argparse: https://docs.python.org/3/library/argparse.html .. _Ansible: https://www.ansible.com/ diff --git a/setup.py b/setup.py index 52065246..d37fa1ef 100644 --- a/setup.py +++ b/setup.py @@ -50,8 +50,6 @@ def find_package_data(package, data_dir): 'Intended Audience :: Developers', 'Topic :: Software Development :: Build Tools', 'License :: OSI Approved :: GNU General Public License v2 (GPLv2)', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', diff --git a/tox.ini b/tox.ini index 5d4d8d3d..926f379d 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py27,py36,py37,py38,py39,py310,py311,py312,ansible-lint +envlist = py36,py37,py38,py39,py310,py311,py312,ansible-lint [testenv] deps = @@ -31,7 +31,6 @@ select = E,W,F [gh-actions] python = - 2.7: py27 3.6: py36 3.7: py37 3.8: py38