Merge pull request #726 from cdce8p/misc

takluyver · web-flow · commit ad93dbb1d6cd · 2025-03-01T12:57:35.000Z
Formatting improvements
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,6 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
diff --git a/SECURITY.md b/SECURITY.md
@@ -21,4 +21,3 @@ You can use the
 fix and disclosure.
 
 If you are a tidelift subscriber, this is the preferred  path
-
diff --git a/doc/cmdline.rst b/doc/cmdline.rst
@@ -227,7 +227,7 @@ Environment variables
    Set a username, password, and index URL for uploading packages.
    See :ref:`uploading packages with environment variables <upload_envvars>`
    for more information.
-   
+
    Token-based upload to PyPI is supported. To upload using a PyPI token,
    set ``FLIT_USERNAME`` to ``__token__``, and ``FLIT_PASSWORD`` to the
    token value.
@@ -270,4 +270,3 @@ Environment variables
 
       `The SOURCE_DATE_EPOCH specification
       <https://reproducible-builds.org/specs/source-date-epoch/>`__
-
diff --git a/doc/development.rst b/doc/development.rst
@@ -23,4 +23,3 @@ To run the tests in separate environments for each available Python version::
 To run the tests in your current environment, run::
 
     pytest
-
diff --git a/doc/index.rst b/doc/index.rst
@@ -31,4 +31,3 @@ Indices and tables
 
 * :ref:`genindex`
 * :ref:`search`
-
diff --git a/flit/__main__.py b/flit/__main__.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import 
+from __future__ import absolute_import
 
 from . import main
 
diff --git a/flit/logo.py b/flit/logo.py
@@ -2,7 +2,7 @@
 
 
 logo = """
-    ._  ._   
+    ._  ._
      ```. ```.      .--.______
       `. `-.  `.   /  °,-—´
         `.  `~-.>.'   /
@@ -12,7 +12,7 @@
              /r_,.´|     |     |    |
            ,'  `/  |——   |     |    |
          .´  ,'/   |     |__   |    |
-       .´ / . /                 
+       .´ / . /
       '__/|/ V         {version}
 
 """
diff --git a/flit/sdist.py b/flit/sdist.py
@@ -244,4 +244,3 @@ def make_setup_py(self):
             url=self.metadata.home_page,
             extra='\n      '.join(extra),
         ).encode('utf-8')
-
diff --git a/flit/validate.py b/flit/validate.py
@@ -298,4 +298,3 @@ def validate_config(config_info):
     for p in problems:
         log.error(p)
     return problems
-
diff --git a/flit/wheel.py b/flit/wheel.py
@@ -9,4 +9,3 @@ def make_wheel_in(ini_path, wheel_directory, editable=False):
 
 class WheelBuilder(core_wheel.WheelBuilder):
     pass
-
diff --git a/flit_core/flit_core/common.py b/flit_core/flit_core/common.py
@@ -378,7 +378,7 @@ def _extract_extras(self, req):
             return [item.strip() for item in list_str.split(',')]
         else:
             return None
-    
+
     def _normalise_requires_dist(self, req):
         extras = self._extract_extras(req)
         if extras:
diff --git a/flit_core/flit_core/config.py b/flit_core/flit_core/config.py
@@ -92,7 +92,7 @@ def __str__(self):
 
 def prep_toml_config(d, path):
     """Validate config loaded from pyproject.toml and prepare common metadata
-    
+
     Returns a LoadedConfig object.
     """
     dtool = d.get('tool', {}).get('flit', {})
@@ -310,11 +310,11 @@ def description_from_file(rel_path: str, proj_dir: Path, guess_mimetype=True):
 
 def _prep_metadata(md_sect, path):
     """Process & verify the metadata from a config file
-    
+
     - Pull out the module name we're packaging.
     - Read description-file and check that it's valid rst
     - Convert dashes in key names to underscores
-      (e.g. home-page in config -> home_page in metadata) 
+      (e.g. home-page in config -> home_page in metadata)
     """
     if not set(md_sect).issuperset(metadata_required_fields):
         missing = metadata_required_fields - set(md_sect)
diff --git a/flit_core/flit_core/vendor/tomli-1.2.3.dist-info/METADATA b/flit_core/flit_core/vendor/tomli-1.2.3.dist-info/METADATA
@@ -205,4 +205,3 @@ Parsing data.toml 5000 times:
 The parsers are ordered from fastest to slowest, using the fastest parser as baseline.
 Tomli performed the best out of all pure Python TOML parsers,
 losing only to pytomlpp (wraps C++) and rtoml (wraps Rust).
-
diff --git a/flit_core/flit_core/versionno.py b/flit_core/flit_core/versionno.py
@@ -124,4 +124,3 @@ def normalise_version(orig_version):
         log.warning("Version number normalised: {!r} -> {!r} (see PEP 440)"
                     .format(orig_version, version))
     return version
-
diff --git a/flit_core/tests_core/samples/imported_version/package1/__init__.py b/flit_core/tests_core/samples/imported_version/package1/__init__.py
@@ -2,4 +2,4 @@
 
 from ._version import __version__
 
-import a_package_that_doesnt_exist
+import a_package_that_doesnt_exist
diff --git a/flit_core/tests_core/samples/invalid_version1.py b/flit_core/tests_core/samples/invalid_version1.py
@@ -1,3 +1,3 @@
 """Sample module with invalid __version__ string"""
 
-__version__ = "not starting with a number"
+__version__ = "not starting with a number"
diff --git a/flit_core/tests_core/samples/ns1-pkg/ns1/pkg/__init__.py b/flit_core/tests_core/samples/ns1-pkg/ns1/pkg/__init__.py
@@ -5,4 +5,3 @@
 """
 
 __version__ = '0.1'
-
diff --git a/flit_core/tests_core/test_wheel.py b/flit_core/tests_core/test_wheel.py
@@ -39,7 +39,7 @@ def test_main(tmp_path):
     with ZipFile(wheels[0], 'r') as zf:
         assert 'module1a.py' in zf.namelist()
 
-        
+
 def test_data_dir(tmp_path):
     info = make_wheel_in(samples_dir / 'with_data_dir' / 'pyproject.toml', tmp_path)
     assert_isfile(info.file)
diff --git a/prepare_license_list.py b/prepare_license_list.py
@@ -21,4 +21,3 @@
 
     f.write("licenses = \\\n")
     pprint.pprint(condensed, f)
-
diff --git a/tests/samples/altdistname/pyproject.toml b/tests/samples/altdistname/pyproject.toml
@@ -8,4 +8,3 @@ author = "Sir Robin"
 author-email = "robin@camelot.uk"
 home-page = "http://github.com/sirrobin/package1"
 dist-name = "package-Dist1"
-
diff --git a/tests/samples/entrypoints_conflict/console_entry_points.txt b/tests/samples/entrypoints_conflict/console_entry_points.txt
@@ -1,2 +1,2 @@
 [console_scripts]
-foo=bar:baz
+foo=bar:baz
diff --git a/tests/samples/invalid_version1.py b/tests/samples/invalid_version1.py
@@ -1,3 +1,3 @@
 """Sample module with invalid __version__ string"""
 
-__version__ = "not starting with a number"
+__version__ = "not starting with a number"
diff --git a/tests/samples/module3/pyproject.toml b/tests/samples/module3/pyproject.toml
@@ -7,4 +7,3 @@ module = "module3"
 author = "Sir Robin"
 author-email = "robin@camelot.uk"
 home-page = "http://github.com/sirrobin/module3"
-
diff --git a/tests/samples/modulewithlocalversion/pyproject.toml b/tests/samples/modulewithlocalversion/pyproject.toml
@@ -7,4 +7,3 @@ module = "modulewithlocalversion"
 author = "Sir Robin"
 author-email = "robin@camelot.uk"
 home-page = "http://github.com/sirrobin/modulewithlocalversion"
-
diff --git a/tests/samples/ns1-pkg-mod/ns1/module.py b/tests/samples/ns1-pkg-mod/ns1/module.py
@@ -2,4 +2,3 @@
 """
 
 __version__ = '0.1'
-
diff --git a/tests/samples/ns1-pkg/ns1/pkg/__init__.py b/tests/samples/ns1-pkg/ns1/pkg/__init__.py
@@ -5,4 +5,3 @@
 """
 
 __version__ = '0.1'
-
diff --git a/tests/samples/ns1-pkg2/ns1/pkg2/__init__.py b/tests/samples/ns1-pkg2/ns1/pkg2/__init__.py
@@ -5,4 +5,3 @@
 """
 
 __version__ = '0.1'
-
diff --git a/tests/samples/with_flit_ini/some_entry_points.txt b/tests/samples/with_flit_ini/some_entry_points.txt
@@ -1,2 +1,2 @@
 [myplugins]
-package1=package1:main
+package1=package1:main
diff --git a/tests/test_vcs.py b/tests/test_vcs.py
@@ -24,4 +24,3 @@ def test_identify_git_parent():
         subdir.mkdir()
         with cwd(subdir):
             assert vcs.identify_vcs(Path('.')).name == 'git'
-

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,3 @@ You can use the`
`21`	`21`	`fix and disclosure.`
`22`	`22`
`23`	`23`	`If you are a tidelift subscriber, this is the preferred path`
`24`		`-`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,3 @@ To run the tests in separate environments for each available Python version::`
`23`	`23`	`To run the tests in your current environment, run::`
`24`	`24`
`25`	`25`	`pytest`
`26`		`-`
Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,3 @@ Indices and tables`
`31`	`31`
`32`	`32`	* :ref:`genindex`
`33`	`33`	* :ref:`search`
`34`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from __future__ import absolute_import`
	`1`	`+from __future__ import absolute_import`
`2`	`2`
`3`	`3`	`from . import main`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,3 @@ def make_wheel_in(ini_path, wheel_directory, editable=False):`
`9`	`9`
`10`	`10`	`class WheelBuilder(core_wheel.WheelBuilder):`
`11`	`11`	`pass`
`12`		`-`