Merge pull request #54 from nschloe/flit

flit

Author: nschloe

.github/workflows/ci.yml

@@ -20,8 +20,8 @@ jobs:
         uses: pre-commit/[email protected]
 
   build:
-    runs-on: ${{ matrix.os }}
     needs: [lint]
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest]

justfile

@@ -1,21 +1,12 @@
-version := `python3 -c "from configparser import ConfigParser; p = ConfigParser(); p.read('setup.cfg'); print(p['metadata']['version'])"`
-name := `python3 -c "from configparser import ConfigParser; p = ConfigParser(); p.read('setup.cfg'); print(p['metadata']['name'])"`
-
+version := `python3 -c "from src.blacktex.__about__ import __version__; print(__version__)"`
 
 default:
 	@echo "\"just publish\"?"
 
-tag:
-	@if [ "$(git rev-parse --abbrev-ref HEAD)" != "main" ]; then exit 1; fi
-	curl -H "Authorization: token `cat ~/.github-access-token`" -d '{"tag_name": "v{{version}}"}' https://api.github.com/repos/nschloe/{{name}}/releases
-
-upload: clean
+publish:
 	@if [ "$(git rev-parse --abbrev-ref HEAD)" != "main" ]; then exit 1; fi
-	# https://stackoverflow.com/a/58756491/353337
-	python3 -m build --sdist --wheel .
-	twine upload dist/*
-
-publish: tag upload
+	gh release create "v{{version}}"
+	flit publish
 
 clean:
 	@find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf

pyproject.toml

@@ -1,6 +1,41 @@
 [build-system]
-requires = ["setuptools>=42", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["flit_core >=3.2,<4"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "blacktex"
+authors = [{name = "Nico Schlömer", email = "[email protected]"}]
+description = "Clean up your LaTeX files"
+readme = "README.md"
+license = {file = "LICENSE"}
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python",
+  "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",
+  "Topic :: Text Editors :: Text Processing",
+  "Topic :: Text Processing",
+  "Topic :: Text Processing :: Markup",
+  "Topic :: Text Processing :: Markup :: LaTeX",
+  "Topic :: Utilities",
+]
+keywords = ["latex", "linting"]
+dynamic = ["version"]
+requires-python = ">=3.6"
+
+[project.urls]
+Code = "https://github.com/nschloe/blacktex"
+Issues = "https://github.com/nschloe/blacktex/issues"
+Funding = "https://github.com/sponsors/nschloe"
+
+[project.scripts]
+blacktex = "blacktex.cli:main"
 
 [tool.isort]
 profile = "black"

setup.cfg

@@ -1,10 +1 @@
-try:
-    # Python 3.8
-    from importlib import metadata
-except ImportError:
-    import importlib_metadata as metadata
-
-try:
-    __version__ = metadata.version("blacktex")
-except Exception:
-    __version__ = "unknown"
+__version__ = "0.5.3"

src/blacktex/__about__.py

@@ -1,7 +1,8 @@
 import argparse
-import sys
+from sys import version_info as vi
 
-import blacktex
+from .__about__ import __version__
+from .main import clean
 
 
 def main(argv=None):
@@ -13,7 +14,7 @@ def main(argv=None):
     for fl in args.infiles:
         with open(fl.name, encoding=args.encoding) as f:
             content = f.read()
-        out = blacktex.clean(content, args.keep_comments, args.keep_dollar_math)
+        out = clean(content, args.keep_comments, args.keep_dollar_math)
         if args.in_place:
             return_code = return_code or int(content != out)
             with open(fl.name, "w", encoding=args.encoding) as f:
@@ -60,12 +61,11 @@ def _get_parser():
         help="keep inline math with $...$",
     )
 
-    version_text = "blacktex {}, Python {}.{}.{}".format(
-        blacktex.__version__,
-        sys.version_info.major,
-        sys.version_info.minor,
-        sys.version_info.micro,
+    parser.add_argument(
+        "--version",
+        "-v",
+        action="version",
+        version=f"blacktex {__version__}, Python {vi.major}.{vi.minor}.{vi.micro}",
     )
-    parser.add_argument("--version", "-v", action="version", version=version_text)
 
     return parser