Skip to content

Commit

Permalink
Drop support for python 3.7 (#502)
Browse files Browse the repository at this point in the history
* Drop support for python 3.7

Support for this version ends on 27 June 2023; there's no reason not to
use a newer version (or the container, which is based on python 3.11)
unless your OS vendor has stuck you with an earlier one.

* Update authors

Dylan Ayrey is the original author of trufflehog, the source of tartufo,
but he's never contributed to this codebase and we've diverged fairly
significantly at this point. It seems saner to change the author entry
to GoDaddy, while continuing to credit Dylan in the README.md.

* Fix overlooked references

Remove references to python 3.7 from workflows

---------

Co-authored-by: Scott Bailey <scott.bailey@godaddy.com>
  • Loading branch information
rbailey-godaddy and rscottbailey authored Mar 14, 2024
1 parent d3b9c59 commit 16cf947
Showing 6 changed files with 17 additions and 117 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.7, 3.8, 3.9, "3.10", 3.11]
python-version: [3.8, 3.9, "3.10", 3.11]
include:
- os: ubuntu-latest
path: ~/.cache/pypoetry
@@ -51,9 +51,6 @@ jobs:
uses: actions/setup-python@db9987b4c1f10f0404fa60ee629f675fafbd6763
with:
python-version: ${{ matrix.python-version }}
- name: Install Enchant
run: brew install enchant
if: ${{ matrix.os == 'macos-latest' && matrix.python-version == '3.7' }}
- name: Install dependencies
run: |
pip install -U pip
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
- name: Set up Python 3.7
- name: Set up Python 3.8
uses: actions/setup-python@db9987b4c1f10f0404fa60ee629f675fafbd6763
with:
python-version: 3.7
python-version: 3.8
- name: Install dependencies
run: |
pip install --upgrade pip
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
vT.B.D - Month D 2023
---------------------

* [#502](https://github.com/godaddy/tartufo/pull/502) - Drop support for
python 3.7; this version reached end of support on 27 June 2023.

v4.1.0 - April 3 2023
--------------------
---------------------

Features:
* [#473](https://github.com/godaddy/tartufo/pull/473) - Introduces new flag `--target-config/--no-target-config` to enable or disable processing of the config file in the repository or folder being scanned
105 changes: 2 additions & 103 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ build-backend = "poetry.core.masonry.api"
requires = ["poetry_core>=1.0.0"]

[tool.poetry]
authors = ["Dylan Ayrey <dxa4481@rit.edu>"]
authors = ["GoDaddy <oss@godaddy.com>"]
classifiers = [
"Development Status :: 5 - Production/Stable",
"Environment :: Console",
@@ -12,7 +12,6 @@ classifiers = [
"Natural Language :: English",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -39,10 +38,10 @@ tartufo = "tartufo.cli:main"

[tool.poetry.dependencies]
GitPython = "^3.1.30"
pygit2 = [{version = "^1.10.0", python = "~3.7"}, {version = "^1.11.0", python = "^3.8"}]
pygit2 = "^1.11.0"
click = "^8.1.0"
colorama = {version = "*", markers = "sys_platform == 'win32'"}
python = "^3.7.2"
python = "^3.8"
tomlkit = "^0.11.4"
cached-property = "^1.5.2"

5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[tox]
minversion = 3.7.0
minversion = 3.8.0
toxworkdir = {env:TOX_WORK_DIR:.tox}
skip_missing_interpreters = True
envlist = py{37,38,39,py3,310,311},black,mypy,pylint,vulture,docs
envlist = py{38,39,py3,310,311},black,mypy,pylint,vulture,docs
parallel_show_output = True
isolated_build = True

[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310

0 comments on commit 16cf947

Please sign in to comment.