New release: 0.0.5 → 0.0.6

MANIFEST.in

@@ -1 +1,7 @@
-include *.md LICENSE
+include *.md
+include *.toml
+include *.txt
+include LICENSE
+include qmk
+include release
+recursive-include qmk_cli *.py

pyproject.toml

@@ -1,6 +1,12 @@
-[build-system]
-requires = ["flit"]
-build-backend = "flit.buildapi"
+#[build-system]
+# Use setuptools for now until this PR is merged and available in homebrew:
+#
+#     https://github.com/pypa/pip/pull/6606
+#
+# We still pull our build metadata from this file so we can easily go back to flit.
+#
+#requires = ["flit"]
+#build-backend = "flit.buildapi"
 
 [tool.flit.metadata]
 dist-name = "qmk"

qmk_cli/__init__.py

@@ -1,3 +1,3 @@
 """A program to help you work with qmk_firmware."""
 
-__version__ = '0.0.5'
+__version__ = '0.0.6'

qmk_cli/subcommands/doctor.py

@@ -2,11 +2,6 @@
 
 Check up for QMK environment.
 """
-import shutil
-import platform
-import os
-from pathlib import Path
-
 import qmk_cli.doctor
 from qmk_cli.milc import cli
 

qmk_cli/subcommands/setup.py

@@ -46,7 +46,6 @@ def main(cli):
             if process.returncode == 0:
                 setup_successful = True
 
-
     # fin
     if setup_successful:
         cli.log.info('QMK setup complete!')

release

@@ -9,4 +9,10 @@ export FLIT_USERNAME
 
 bumpversion patch
 git push origin master --tags
-flit publish
+
+# For now we don't use flit
+#flit publish
+
+# Use setuptools until flit works with homebrew
+python3 setup.py sdist bdist_wheel
+twine upload dist/qmk-*

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.5
+current_version = 0.0.6
 commit = True
 tag = True
 tag_name = {new_version}
@@ -12,6 +12,9 @@ message = New release: {current_version} → {new_version}
 [bdist_wheel]
 universal = 1
 
+[flake8]
+ignore = E501,E226
+
 [metadata]
 license_file = LICENSE
 

setup.py

@@ -0,0 +1,30 @@
+from configparser import ConfigParser
+from setuptools import setup, find_packages
+
+import toml
+
+setup_cfg = ConfigParser()
+setup_cfg.read('setup.cfg')
+pyproject = toml.load('pyproject.toml')
+metadata = pyproject['tool']['flit']['metadata']
+
+if __name__ == "__main__":
+    setup(
+        name=metadata['dist-name'],
+        description=open(metadata['description-file']).read(),
+        entry_points={
+            'console_scripts': ['%s = %s' % l for l in pyproject['tool']['flit']['scripts'].items()]
+        },
+        license='MIT License',
+        url=metadata['home-page'],
+        version=setup_cfg['bumpversion']['current_version'],
+        author=metadata['author'],
+        author_email=metadata['author-email'],
+        maintainer=metadata['author'],
+        maintainer_email=metadata['author-email'],
+        long_description=open('README.md').read(),
+        long_description_content_type="text/markdown",
+        packages=find_packages(),
+        classifiers=metadata['classifiers'],
+        install_requires=metadata['requires'],
+    )