New release: 0.0.9 → 0.0.10

MANIFEST.in

@@ -1,5 +1,4 @@
 include *.md
-include *.toml
 include *.txt
 include LICENSE
 include qmk

pyproject.toml

@@ -1,40 +0,0 @@
-#[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"
-module = "qmk_cli"
-author = "skullydazed"
-author-email = "skullydazed@gmail.com"
-description-file = "README.md"
-home-page = "https://github.com/qmk/qmk_cli"
-classifiers = [
-    'Development Status :: 3 - Alpha',
-    'Environment :: Console',
-    'Intended Audience :: Developers',
-    'Intended Audience :: System Administrators',
-    'Intended Audience :: End Users/Desktop',
-    'License :: OSI Approved :: MIT License',
-    'Natural Language :: English',
-    'Programming Language :: Python :: 3 :: Only',
-    'Topic :: Scientific/Engineering',
-    'Topic :: Software Development',
-    'Topic :: Utilities',
-]
-requires-python = ">=3.5"
-requires = [
-    #"milc", #FIXME(skullydazed): Included in the repo for now.
-    "argcomplete",
-    "colorama",
-    #"halo"
-]
-
-[tool.flit.scripts]
-qmk = "qmk_cli.script_qmk:main"

qmk_cli/__init__.py

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

release

@@ -3,10 +3,13 @@
 set -e
 set -x
 
-FLIT_USERNAME=${FLIT_USERNAME:=skully}
+PYPI_USERNAME=${PYPI_USERNAME:=skully}
+FLIT_USERNAME=$PYPI_USERNAME
+TWINE_USERNAME=$PYPI_USERNAME
 
-export FLIT_USERNAME
+export FLIT_USERNAME TWINE_USERNAME
 
+rm dist/*
 bumpversion patch
 git push origin master --tags
 

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.6
+current_version = 0.0.10
 commit = True
 tag = True
 tag_name = {new_version}
@@ -16,7 +16,17 @@ universal = 1
 ignore = E501,E226
 
 [metadata]
+author = skullydazed
+author-email = skullydazed@gmail.com
+description-file = README.md
+dist-name = qmk
 license_file = LICENSE
+module = qmk_cli
+home-page = https://github.com/qmk/qmk_cli
+requires-python = >=3.5
+
+[entry_points]
+qmk = qmk_cli.script_qmk:main
 
 [yapf]
 align_closing_bracket_with_visual_indent = True

setup.py

@@ -1,19 +1,16 @@
 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']
+metadata = setup_cfg['metadata']
 
 if __name__ == "__main__":
     setup(
         name=metadata['dist-name'],
-        description=open(metadata['description-file']).read(),
+        description='A program to help users work with QMK Firmware.',
         entry_points={
-            'console_scripts': ['%s = %s' % l for l in pyproject['tool']['flit']['scripts'].items()]
+            'console_scripts': ['%s = %s' % l for l in setup_cfg['entry_points'].items()]
         },
         license='MIT License',
         url=metadata['home-page'],
@@ -25,6 +22,24 @@ if __name__ == "__main__":
         long_description=open('README.md').read(),
         long_description_content_type="text/markdown",
         packages=find_packages(),
-        classifiers=metadata['classifiers'],
-        install_requires=metadata['requires'],
+        classifiers=[
+            'Development Status :: 3 - Alpha',
+            'Environment :: Console',
+            'Intended Audience :: Developers',
+            'Intended Audience :: System Administrators',
+            'Intended Audience :: End Users/Desktop',
+            'License :: OSI Approved :: MIT License',
+            'Natural Language :: English',
+            'Programming Language :: Python :: 3 :: Only',
+            'Topic :: Scientific/Engineering',
+            'Topic :: Software Development',
+            'Topic :: Utilities',
+        ],
+        requires_python=metadata['requires-python'],
+        install_requires=[
+            #"milc", #FIXME(skullydazed): Included in the repo for now.
+            "argcomplete",
+            "colorama",
+            #"halo"
+        ],
     )