Skip to content

Commit

Permalink
Test also with Python 3.12 but no longer test with 3.8 and 3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
kyhau committed May 21, 2024
1 parent 2a63d00 commit 902f537
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 27 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8, 3.9, "3.10", 3.11]
python-version: [3.12, 3.11, "3.10"]

steps:
- name: Checkout source
Expand All @@ -42,18 +42,15 @@ jobs:
- id: ToxSetting
run: |
if [[ "${{ matrix.python-version }}" == "3.8" ]]
if [[ "${{ matrix.python-version }}" == "3.12" ]]
then
echo "toxenv=py38" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.python-version }}" == "3.9" ]]
echo "toxenv=py312" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.python-version }}" == "3.11" ]]
then
echo "toxenv=py39" >> $GITHUB_OUTPUT
echo "toxenv=py311" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.python-version }}" == "3.10" ]]
then
echo "toxenv=py310" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.python-version }}" == "3.11" ]]
then
echo "toxenv=py311" >> $GITHUB_OUTPUT
else
exit 1
fi
Expand Down
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,17 @@ sudo: false

matrix:
include:
- python: 3.8
dist: focal
env: TOXENV=py38
- python: 3.9
dist: focal
env: TOXENV=py39
- python: 3.10
dist: focal
env: TOXENV=py310
- python: nightly
- python: 3.11
dist: focal
env: TOXENV=py311
- python: nightly
dist: focal
env: TOXENV=py312
allow_failures:
- env: TOXENV=py311
- env: TOXENV=py312

before_install:
- python -m pip install --upgrade setuptools pip virtualenv
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Change Log
All notable changes to this project will be documented in this file.

1.0.1 - 2024-05-21
==================
- Test with Python 3.12.
- No longer test with Python 3.8 and Python 3.9.


1.0.0 - 2023-02-15
==================
- Replaced `PyInquirer` with [InquirerPy](https://github.com/kazhala/InquirerPy) - https://github.com/kyhau/saml2aws-multi/issues/20
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ All notable changes to this project will be documented in [CHANGELOG](./CHANGELO

---
## Built with
- Python - support Python 3.8, 3.9, 3.10, 3.11.
- Python - support Python 3.10, 3.11, 3.12.
- [CodeQL](https://codeql.github.com) is [enabled](.github/workflows/codeql-analysis.yml) in this repository.
- [Dependabot](https://docs.github.com/en/code-security/dependabot/dependabot-version-updates) is [enabled](.github/dependabot.yml) for auto dependency updates.
- [Gitleaks](https://github.com/gitleaks/gitleaks) and [TruffleHog](https://github.com/trufflesecurity/trufflehog) are enabled in this GitHub Actions [workflow](.github/workflows/secrets-scan.yml) for detecting and preventing hardcoded secrets.
Expand Down
2 changes: 1 addition & 1 deletion requirements-build.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is used for running tox, flake8 and building the wheel
pip~=24.0
virtualenv~=20.26
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
setuptools~=69.5
logilab-common~=2.0
tox~=4.15
1 change: 1 addition & 0 deletions requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ pytest~=8.2
pytest-cov~=5.0
pytest-gitignore~=1.3
pytest-mock~=3.14
setuptools~=69.5
wheel~=0.43
-e.
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
__summary__ = "A helper script using saml2aws to login and retrieve AWS temporary credentials for multiple roles in different accounts."

__requirements__ = [
"boto3~=1.17",
"click~=8.0",
"boto3~=1.34",
"click~=8.1",
"InquirerPy~=0.3",
]

Expand All @@ -21,10 +21,9 @@

CLASSIFIERS = [
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3 :: Only",
]

Expand All @@ -40,7 +39,7 @@
install_requires=__requirements__,
name=__title__,
packages=find_packages(exclude=["tests"]),
python_requires=">=3.8",
python_requires=">=3.10",
url=__uri__,
version=__version__,
zip_safe=False,
Expand Down
7 changes: 3 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[tox]
envlist = py38,py39,py310,py311
envlist = py310,py311,py312
skip_missing_interpreters = True

[testenv]
basepython =
py38: python3.8
py39: python3.9
py310: python3.10
py311: python3.11
py312: python3.12
install_command =
python -m pip install {opts} {packages} -cconstraints.txt
deps =
Expand All @@ -23,7 +22,7 @@ commands =
pip check
python -m pytest --junit-xml "junit-{envname}.xml"

[testenv:py311]
[testenv:py312]
commands =
pip check
python -m pytest --cov . --cov-config=tox.ini --cov-report xml:coverage-{envname}.xml --junit-xml "junit-{envname}.xml" saml2awsmulti
Expand Down

0 comments on commit 902f537

Please sign in to comment.