Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for py36 and py37 #3436

Merged
merged 4 commits into from
Feb 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,9 @@ jobs:
matrix:
include:
- tox_env: lint
python-version: 3.6
python-version: 3.8
- tox_env: docs
python-version: 3.9
- tox_env: py36
PREFIX: PYTEST_REQPASS=448
python-version: 3.6
cover: true
- tox_env: py37
PREFIX: PYTEST_REQPASS=448
python-version: 3.7
cover: true
- tox_env: py38
PREFIX: PYTEST_REQPASS=448
python-version: 3.8
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ci:
# https://github.com/pre-commit-ci/issues/issues/55
- pip-compile
default_language_version:
python: python3.6
python: python3.8
exclude: |
(?x)(
^docs/conf.py$
Expand Down Expand Up @@ -91,7 +91,7 @@ repos:
- pexpect
- testinfra
- repo: https://github.com/jazzband/pip-tools
rev: 6.4.0
rev: 6.5.1
hooks:
- id: pip-compile
entry: pip-compile -q --strip-extras --no-annotate --output-file=requirements.txt tools/opts.txt setup.cfg --extra docs --extra test --extra yamllint
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build:
image: latest

python:
version: 3.7
version: 3.8
install:
- method: pip
path: .
Expand Down
4 changes: 2 additions & 2 deletions docs/ci.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ and run ``molecule test`` in ubuntu.
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.7]
python-version: [3.8, 3.9]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -248,7 +248,7 @@ setting up a virtualenv and testing an Ansible role via Molecule.
sh '''
export HTTP_PROXY=http://10.123.123.123:8080
export HTTPS_PROXY=http://10.123.123.123:8080
pip3.6 install virtualenv
python3 -m pip install virtualenv
virtualenv virtenv
source virtenv/bin/activate
python3 -m pip install --upgrade ansible molecule docker
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Requirements
Depending on the driver chosen, you may need to install additional OS packages.
See ``INSTALL.rst``, which is created when initializing a new scenario.

* Python >= 3.6 with :std:doc:`Ansible <ansible:index>` >= 2.8
* Python >= 3.8 with :std:doc:`Ansible <ansible:index>` >= 2.8

CentOS 8
--------
Expand Down
2 changes: 1 addition & 1 deletion mypy.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[mypy]
python_version = 3.6
python_version = 3.8
color_output = True
error_summary = True
disallow_untyped_calls = True
Expand Down
7 changes: 1 addition & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.6
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile --extra=docs --extra=test --extra=yamllint --no-annotate --output-file=requirements.txt --strip-extras setup.cfg tools/opts.txt
Expand All @@ -13,7 +13,6 @@ attrs==21.4.0
babel==2.9.1
bcrypt==3.2.0
binaryornot==0.4.4
cached-property==1.5.2
cerberus==1.3.2
certifi==2021.10.8
cffi==1.15.0
Expand All @@ -26,15 +25,13 @@ commonmark==0.9.1
cookiecutter==1.7.3
coverage==6.2
cryptography==36.0.1
dataclasses==0.8 ; python_version < "3.7"
distro==1.6.0
docutils==0.17.1
enrich==1.2.7
execnet==1.9.0
filelock==3.4.1
idna==3.3
imagesize==1.3.0
importlib-metadata==4.8.3 ; python_version < "3.8"
iniconfig==1.1.1
jinja2==3.0.3
jinja2-time==0.2.0
Expand Down Expand Up @@ -83,9 +80,7 @@ subprocess-tee==0.3.5
text-unidecode==1.3
toml==0.10.2
tomli==1.2.3
typing-extensions==4.0.1
urllib3==1.26.8
zipp==3.6.0

# The following packages are considered to be unsafe in a requirements file:
# setuptools
2 changes: 1 addition & 1 deletion runtime.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# See https://github.com/dependabot/dependabot-core/issues/4062
python-3.6.15
python-3.8.12
6 changes: 1 addition & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ classifiers =
Operating System :: OS Independent

Programming Language :: Python :: 3
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
Expand All @@ -50,7 +48,7 @@ keywords =

[options]
use_scm_version = True
python_requires = >=3.6
python_requires = >=3.8
package_dir =
= src
packages = find:
Expand All @@ -64,9 +62,7 @@ install_requires =
click >= 8.0, < 9
click-help-colors >= 0.9
cookiecutter >= 1.7.3 # dependency issues in older versions
dataclasses; python_version<"3.7"
enrich >= 1.2.7
importlib-metadata; python_version<"3.8"
Jinja2 >= 2.11.3
packaging
paramiko >= 2.5.0, < 3
Expand Down
8 changes: 1 addition & 7 deletions src/molecule/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@

from __future__ import absolute_import, division, print_function

__metaclass__ = type
try:
# py38+
from importlib.metadata import version # type: ignore
except ImportError:
# py36-py37
from importlib_metadata import version
from importlib.metadata import version

__version__ = version("molecule")
6 changes: 2 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ envlist =
packaging
dockerfile
# keep only N,N-1 ansible versions
py{36,37,38,39,310}
py{38,39,310}
py{38,39,310}-{devel}

# do not enable skip missing to avoid CI false positives
Expand Down Expand Up @@ -54,7 +54,6 @@ deps =
# pytest-molecule not used but we want to check that it does not conflict
devel: git+https://github.com/ansible-community/pytest-molecule#egg=pytest-molecule
dockerfile: ansible>=2.10
py{36,37}: importlib-metadata>=0.12
py: ansible-core
; commands_pre =
; find {toxinidir} -type f -not -path '{toxinidir}/.tox/*' -path '*/__pycache__/*' -name '*.py[c|o]' -delete
Expand All @@ -77,7 +76,7 @@ allowlist_externals =
[testenv:lint]
description = Runs all linting tasks
# python pinned in order to have pip-compile output reproducible
basepython = python3.6
basepython = python3.8
commands =
# to run a single linter you can do "pre-commit run flake8"
python -m pre_commit run {posargs:--all --show-diff-on-failure}
Expand All @@ -91,7 +90,6 @@ skip_install = true
usedevelop = false

[testenv:deps]
basepython = python3.6
description = Bump all test dependencies
skip_install = true
deps = {[testenv:lint]deps}
Expand Down