Drop support for Python 3.6.

This commit is contained in:
Catherine 2022-04-04 09:39:28 +00:00
parent 9a5a6142d9
commit 64771a065a
6 changed files with 15 additions and 12 deletions

View file

@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', pypy3] python-version: ['3.7', '3.8', '3.9', '3.10', pypy3]
steps: steps:
- name: Check out source code - name: Check out source code
uses: actions/checkout@v2 uses: actions/checkout@v2

View file

@ -19,7 +19,7 @@ def build_cxx(*, cxx_sources, output_name, include_dirs, macros):
with warnings.catch_warnings(): with warnings.catch_warnings():
warnings.filterwarnings(action="ignore", category=DeprecationWarning) warnings.filterwarnings(action="ignore", category=DeprecationWarning)
# This emits a DeprecationWarning on Python 3.6 and 3.10. # This emits a DeprecationWarning on Python 3.10.
from setuptools import distutils from setuptools import distutils
cc_driver = distutils.ccompiler.new_compiler() cc_driver = distutils.ccompiler.new_compiler()

View file

@ -12,14 +12,11 @@ except ImportError:
except ImportError: except ImportError:
importlib_metadata = None # not installed importlib_metadata = None # not installed
try: try:
from importlib import resources as importlib_resources
try: try:
from importlib import resources as importlib_resources importlib_resources.files # py3.9+ stdlib
try: except AttributeError:
importlib_resources.files # py3.9+ stdlib import importlib_resources # py3.8- shim
except AttributeError:
import importlib_resources # py3.8- shim
except ImportError:
import importlib_resources # py3.6- shim
except ImportError: except ImportError:
importlib_resources = None importlib_resources = None

View file

@ -4,6 +4,12 @@ Changelog
This document describes changes to the public interfaces in the Amaranth language and standard library. It does not include most bug fixes or implementation changes. This document describes changes to the public interfaces in the Amaranth language and standard library. It does not include most bug fixes or implementation changes.
Next version
============
Support for Python 3.6 has been dropped.
Version 0.3 Version 0.3
============ ============

View file

@ -6,7 +6,7 @@ System requirements
.. |yosys-version| replace:: 0.10 (or newer) .. |yosys-version| replace:: 0.10 (or newer)
Amaranth HDL requires Python 3.6; it works on CPython_ 3.6 (or newer), and works faster on PyPy3.6_ 7.2 (or newer). Amaranth HDL requires Python 3.7; it works on CPython_ 3.7 (or newer), and works faster on PyPy3.7_ 7.3.2 (or newer).
For most workflows, Amaranth requires Yosys_ |yosys-version|. A compatible version of Yosys is distributed via PyPI_ for most popular platforms. For most workflows, Amaranth requires Yosys_ |yosys-version|. A compatible version of Yosys is distributed via PyPI_ for most popular platforms.
@ -17,7 +17,7 @@ Synthesizing, placing and routing an Amaranth design for an FPGA requires the FP
.. TODO: Link to FPGA family docs here .. TODO: Link to FPGA family docs here
.. _CPython: https://www.python.org/ .. _CPython: https://www.python.org/
.. _PyPy3.6: https://www.pypy.org/ .. _PyPy3.7: https://www.pypy.org/
.. _Yosys: https://yosyshq.net/yosys/ .. _Yosys: https://yosyshq.net/yosys/
.. _PyPI: https://pypi.org/ .. _PyPI: https://pypi.org/
.. _GTKWave: http://gtkwave.sourceforge.net/ .. _GTKWave: http://gtkwave.sourceforge.net/

View file

@ -37,7 +37,7 @@ setup(
description="Amaranth hardware definition language", description="Amaranth hardware definition language",
#long_description="""TODO""", #long_description="""TODO""",
license="BSD", license="BSD",
python_requires="~=3.6", python_requires="~=3.7",
setup_requires=["wheel", "setuptools", "setuptools_scm"], setup_requires=["wheel", "setuptools", "setuptools_scm"],
install_requires=[ install_requires=[
"importlib_metadata; python_version<'3.8'", # for __version__ and amaranth._toolchain.yosys "importlib_metadata; python_version<'3.8'", # for __version__ and amaranth._toolchain.yosys