From 918bd331501de42be32666bd5140d04d00b39386 Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Thu, 24 Mar 2022 18:23:18 -0400 Subject: [PATCH] Drop support for Python 3.6 (#165) --- .github/workflows/test.yml | 2 +- setup.py | 86 ++++++++++++++------------------------ tox.ini | 2 +- 3 files changed, 34 insertions(+), 56 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1be5c09..4e3efde4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: test: strategy: matrix: - python: ['3.6', '3.7', '3.8', '3.9', '3.10'] + python: ['3.7', '3.8', '3.9', '3.10'] platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/setup.py b/setup.py index 6b3ee7a2..217a8b21 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ here = pathlib.Path(__file__).parent.resolve() # Get the long description from the README file -long_description = (here / 'README.md').read_text(encoding='utf-8') +long_description = (here / "README.md").read_text(encoding="utf-8") # Arguments marked as "Required" below must be included for upload to PyPI. # Fields marked as "Optional" may be commented out. @@ -29,21 +29,18 @@ # There are some restrictions on what makes a valid project name # specification here: # https://packaging.python.org/specifications/core-metadata/#name - name='sampleproject', # Required - + name="sampleproject", # Required # Versions should comply with PEP 440: # https://www.python.org/dev/peps/pep-0440/ # # For a discussion on single-sourcing the version across setup.py and the # project code, see # https://packaging.python.org/guides/single-sourcing-package-version/ - version='2.0.0', # Required - + version="2.0.0", # Required # This is a one-line description or tagline of what your project does. This # corresponds to the "Summary" metadata field: # https://packaging.python.org/specifications/core-metadata/#summary - description='A sample Python project', # Optional - + description="A sample Python project", # Optional # This is an optional longer description of your project that represents # the body of text which users will see when they visit PyPI. # @@ -53,7 +50,6 @@ # This field corresponds to the "Description" metadata field: # https://packaging.python.org/specifications/core-metadata/#description-optional long_description=long_description, # Optional - # Denotes that our long_description is in Markdown; valid values are # text/plain, text/x-rst, and text/markdown # @@ -64,22 +60,18 @@ # # This field corresponds to the "Description-Content-Type" metadata field: # https://packaging.python.org/specifications/core-metadata/#description-content-type-optional - long_description_content_type='text/markdown', # Optional (see note above) - + long_description_content_type="text/markdown", # Optional (see note above) # This should be a valid link to your project's main homepage. # # This field corresponds to the "Home-Page" metadata field: # https://packaging.python.org/specifications/core-metadata/#home-page-optional - url='https://github.com/pypa/sampleproject', # Optional - + url="https://github.com/pypa/sampleproject", # Optional # This should be your name or the name of the organization which owns the # project. - author='A. Random Developer', # Optional - + author="A. Random Developer", # Optional # This should be a valid email address corresponding to the author listed # above. - author_email='author@example.com', # Optional - + author_email="author@example.com", # Optional # Classifiers help users find your project by categorizing it. # # For a list of valid classifiers, see https://pypi.org/classifiers/ @@ -88,39 +80,32 @@ # 3 - Alpha # 4 - Beta # 5 - Production/Stable - 'Development Status :: 3 - Alpha', - + "Development Status :: 3 - Alpha", # Indicate who your project is intended for - 'Intended Audience :: Developers', - 'Topic :: Software Development :: Build Tools', - + "Intended Audience :: Developers", + "Topic :: Software Development :: Build Tools", # Pick your license as you wish - 'License :: OSI Approved :: MIT License', - + "License :: OSI Approved :: MIT License", # Specify the Python versions you support here. In particular, ensure # that you indicate you support Python 3. These classifiers are *not* # checked by 'pip install'. See instead 'python_requires' below. - '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", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", - 'Programming Language :: Python :: 3 :: Only', + "Programming Language :: Python :: 3 :: Only", ], - # This field adds keywords for your project which will appear on the # project page. What does your project relate to? # # Note that this is a list of additional keywords, separated # by commas, to be used to assist searching for the distribution in a # larger catalog. - keywords='sample, setuptools, development', # Optional - + keywords="sample, setuptools, development", # Optional # When your source code is in a subdirectory under the project root, e.g. # `src/`, it is necessary to specify the `package_dir` argument. - package_dir={'': 'src'}, # Optional - + package_dir={"": "src"}, # Optional # You can just specify package directories manually here if your project is # simple. Or you can use find_packages(). # @@ -130,22 +115,19 @@ # # py_modules=["my_module"], # - packages=find_packages(where='src'), # Required - + packages=find_packages(where="src"), # Required # Specify which Python versions you support. In contrast to the # 'Programming Language' classifiers above, 'pip install' will check this # and refuse to install the project if the version does not match. See # https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires - python_requires='>=3.6, <4', - + python_requires=">=3.7, <4", # This field lists other packages that your project depends on to run. # Any package you put here will be installed by pip when your project is # installed, so they must be valid existing projects. # # For an analysis of "install_requires" vs pip's requirements files see: # https://packaging.python.org/discussions/install-requires-vs-requirements/ - install_requires=['peppercorn'], # Optional - + install_requires=["peppercorn"], # Optional # List additional groups of dependencies here (e.g. development # dependencies). Users will be able to install these using the "extras" # syntax, for example: @@ -155,23 +137,20 @@ # Similar to `install_requires` above, these must be valid existing # projects. extras_require={ # Optional - 'dev': ['check-manifest'], - 'test': ['coverage'], + "dev": ["check-manifest"], + "test": ["coverage"], }, - # If there are data files included in your packages that need to be # installed, specify them here. package_data={ # Optional - 'sample': ['package_data.dat'], + "sample": ["package_data.dat"], }, - # Although 'package_data' is the preferred approach, in some case you may # need to place data files outside of your packages. See: # http://docs.python.org/distutils/setupscript.html#installing-additional-files # # In this case, 'data_file' will be installed into '/my_data' - data_files=[('my_data', ['data/data_file'])], # Optional - + data_files=[("my_data", ["data/data_file"])], # Optional # To provide executable scripts, use entry points in preference to the # "scripts" keyword. Entry points provide cross-platform support and allow # `pip` to create the appropriate form of executable for the target @@ -180,11 +159,10 @@ # For example, the following would provide a command called `sample` which # executes the function `main` from this package when invoked: entry_points={ # Optional - 'console_scripts': [ - 'sample=sample:main', + "console_scripts": [ + "sample=sample:main", ], }, - # List additional URLs that are relevant to your project as a dict. # # This field corresponds to the "Project-URL" metadata fields: @@ -195,9 +173,9 @@ # maintainers, and where to support the project financially. The key is # what's used to render the link text on PyPI. project_urls={ # Optional - 'Bug Reports': 'https://github.com/pypa/sampleproject/issues', - 'Funding': 'https://donate.pypi.org', - 'Say Thanks!': 'http://saythanks.io/to/example', - 'Source': 'https://github.com/pypa/sampleproject/', + "Bug Reports": "https://github.com/pypa/sampleproject/issues", + "Funding": "https://donate.pypi.org", + "Say Thanks!": "http://saythanks.io/to/example", + "Source": "https://github.com/pypa/sampleproject/", }, ) diff --git a/tox.ini b/tox.ini index 5e7832c6..ab06581f 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ # and also to help confirm pull requests to this project. [tox] -envlist = py{36,37,38,39,310} +envlist = py{37,38,39,310} # Define the minimal tox version required to run; # if the host tox is less than this the tool with create an environment and