From 74706d603132b442623c0872e12dc35f7d214b2f Mon Sep 17 00:00:00 2001 From: Paul Ganssle Date: Sun, 3 May 2020 16:08:51 -0400 Subject: [PATCH 1/7] Add pre-commit file --- .pre-commit-config.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..d2870e8 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,25 @@ +repos: + - repo: https://github.com/psf/black + rev: stable + hooks: + - id: black + language_version: python3.8 + + - repo: https://github.com/pre-commit/mirrors-isort + rev: v4.3.21 + hooks: + - id: isort + additional_dependencies: [toml] + language_version: python3.8 + + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.4.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: debug-statements + + - repo: https://github.com/asottile/setup-cfg-fmt + rev: v1.9.0 + hooks: + - id: setup-cfg-fmt From 57e65217b2eb2687d009e3e9902633f8baacdbcd Mon Sep 17 00:00:00 2001 From: Paul Ganssle Date: Sun, 3 May 2020 15:56:56 -0400 Subject: [PATCH 2/7] Bump from alpha to beta --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ddb6c20..1a48a5c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,7 +12,7 @@ url = https://github.com/python/tzdata author = Python Software Foundation author_email = paul@ganssle.io classifiers = - Development Status :: 3 - Alpha + Development Status :: 4 - Beta Intended Audience :: Developers License :: OSI Approved :: Apache Software License Programming Language :: Python :: 2 From 9270bb5d948d5fd6972edf8c1074d3978fa8e18c Mon Sep 17 00:00:00 2001 From: Paul Ganssle Date: Sun, 3 May 2020 16:05:13 -0400 Subject: [PATCH 3/7] Fix setup.cfg formatting --- setup.cfg | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/setup.cfg b/setup.cfg index 1a48a5c..ca8f021 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,31 +4,30 @@ version = attr:tzdata.__version__ description = Provider of IANA time zone data long_description = file: README.md long_description_content_type = text/markdown +url = https://github.com/python/tzdata +author = Python Software Foundation +author_email = paul@ganssle.io license = Apache-2.0 +license_file = LICENSE license_files = LICENSE licenses/LICENSE_APACHE -url = https://github.com/python/tzdata -author = Python Software Foundation -author_email = paul@ganssle.io classifiers = Development Status :: 4 - Beta Intended Audience :: Developers License :: OSI Approved :: Apache Software License Programming Language :: Python :: 2 Programming Language :: Python :: 3 - -python_requires = *.* # This is a data-only package - project_urls = Bug Reports = https://github.com/python/tzdata/issues Source = https://github.com/python/tzdata +python_requires = *.* # This is a data-only package [options] packages = tzdata -include_package_data=True -package_dir= +include_package_data = True +package_dir = =src [bdist_wheel] -universal=1 +universal = 1 From 4047fb544e8ca7002df9e10c1a501dc853380081 Mon Sep 17 00:00:00 2001 From: Paul Ganssle Date: Sun, 3 May 2020 16:09:10 -0400 Subject: [PATCH 4/7] Update pyproject.toml settings --- pyproject.toml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 2f21011..d780681 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,11 @@ [build-system] requires = ["setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" + +[tool.isort] +atomic=true +force_grid_wrap=0 +include_trailing_comma=true +multi_line_output=3 +not_skip="__init__.py" +use_parentheses=true From 5d4f7fa86dc3fa4971b721a6557d45d28e39fe78 Mon Sep 17 00:00:00 2001 From: Paul Ganssle Date: Sun, 3 May 2020 16:09:27 -0400 Subject: [PATCH 5/7] Drop unnecessary newline --- src/tzdata/__init__.py | 1 - templates/__init__.py.in | 1 - 2 files changed, 2 deletions(-) diff --git a/src/tzdata/__init__.py b/src/tzdata/__init__.py index 2e6c9af..bcf2eff 100644 --- a/src/tzdata/__init__.py +++ b/src/tzdata/__init__.py @@ -4,4 +4,3 @@ # This exposes the original IANA version number. IANA_VERSION = "2020a" - diff --git a/templates/__init__.py.in b/templates/__init__.py.in index b6cf3c7..32b11f7 100644 --- a/templates/__init__.py.in +++ b/templates/__init__.py.in @@ -4,4 +4,3 @@ __version__ = %%PACKAGE_VERSION%% # This exposes the original IANA version number. IANA_VERSION = %%IANA_VERSION%% - From 93d611523ba852b680d3983927c665d677b3838c Mon Sep 17 00:00:00 2001 From: Paul Ganssle Date: Tue, 5 May 2020 09:46:36 -0400 Subject: [PATCH 6/7] Fix python_requires --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ca8f021..fe0ce8f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,10 +21,10 @@ classifiers = project_urls = Bug Reports = https://github.com/python/tzdata/issues Source = https://github.com/python/tzdata -python_requires = *.* # This is a data-only package [options] packages = tzdata +python_requires = >=2 include_package_data = True package_dir = =src From eec9f806cee517fdf8012ba12b9eadcf6237936c Mon Sep 17 00:00:00 2001 From: Paul Ganssle Date: Tue, 5 May 2020 10:52:46 -0400 Subject: [PATCH 7/7] Change author_email to datetime-SIG --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fe0ce8f..77d03f1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,7 @@ long_description = file: README.md long_description_content_type = text/markdown url = https://github.com/python/tzdata author = Python Software Foundation -author_email = paul@ganssle.io +author_email = datetime-sig@python.org license = Apache-2.0 license_file = LICENSE license_files =