From 904c42da298f7fda932d9ac774517c20e2667fb8 Mon Sep 17 00:00:00 2001 From: Josh Bialkowski Date: Wed, 19 Aug 2020 10:04:23 -0700 Subject: [PATCH] hotfix python distribution missing packages --- cmakelang/__init__.py | 2 +- cmakelang/doc/CMakeLists.txt | 2 +- cmakelang/doc/changelog.rst | 5 +++++ cmakelang/doc/installation.rst | 6 +++--- cmakelang/doc/release_notes.rst | 7 +++++++ cmakelang/pypi/setup.py | 5 +++-- cmakelang/tools/ensure_docker_tag.py | 3 +++ cmakelang/tools/ensure_precommit_tag.py | 3 +++ cmakelang/vscode_extension/package-lock.json | 2 +- cmakelang/vscode_extension/package.json | 2 +- 10 files changed, 28 insertions(+), 9 deletions(-) diff --git a/cmakelang/__init__.py b/cmakelang/__init__.py index 8688919..9ac86ea 100644 --- a/cmakelang/__init__.py +++ b/cmakelang/__init__.py @@ -3,4 +3,4 @@ """ from __future__ import unicode_literals -__version__ = "0.6.12.dev0" +__version__ = "0.6.13" diff --git a/cmakelang/doc/CMakeLists.txt b/cmakelang/doc/CMakeLists.txt index 01335cb..99b338f 100644 --- a/cmakelang/doc/CMakeLists.txt +++ b/cmakelang/doc/CMakeLists.txt @@ -359,7 +359,7 @@ add_custom_target( --scratch-tree ${CMAKE_CURRENT_BINARY_DIR}/scratch-tree --stage ${_stage} --deploy-key "${_deploykey}" - --tag "${_src_version}" + --tag "v${_src_version}" # cmake-format: on DEPENDS clean-cmakelang-sphinx-stage ${_sphinx_manifest} ${_deploykey} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} diff --git a/cmakelang/doc/changelog.rst b/cmakelang/doc/changelog.rst index 62ddcec..bc09e7e 100644 --- a/cmakelang/doc/changelog.rst +++ b/cmakelang/doc/changelog.rst @@ -8,6 +8,11 @@ Changelog v0.6 series ----------- +v0.6.13 +------- + +* Fix subpackages missing from python distribution + v0.6.12 ------- diff --git a/cmakelang/doc/installation.rst b/cmakelang/doc/installation.rst index f2fee26..d9849d8 100644 --- a/cmakelang/doc/installation.rst +++ b/cmakelang/doc/installation.rst @@ -5,7 +5,7 @@ Installation All of the tools are included as part of the ``cmakelang`` python distribution package. -.. note:: Until verion 0.6.12 the software was distributed under the +.. note:: Until verion 0.6.13 the software was distributed under the ``cmake-format`` python package. As the project grew to include multiple tools beyond the formatter, the name was changed to something more appropriate. The ``cmake-format`` package will be maintained @@ -58,7 +58,7 @@ Install from source You can also install from source with pip. You can download a release package from github__ or pypi__ and then install it directly with pip. For example:: - pip install v0.6.12.tar.gz + pip install v0.6.13.tar.gz .. __: https://github.com/cheshirekow/cmake_format/releases .. __: https://pypi.org/project/cmake-format/#files @@ -104,7 +104,7 @@ formatter, ``cmake-format``, to your hooks with the following addition to your repos: - repo: https://github.com/cheshirekow/cmake-format-precommit - rev: v0.6.12 + rev: v0.6.13 hooks: - id: cmake-format diff --git a/cmakelang/doc/release_notes.rst b/cmakelang/doc/release_notes.rst index 7d5eba6..00c8502 100644 --- a/cmakelang/doc/release_notes.rst +++ b/cmakelang/doc/release_notes.rst @@ -10,6 +10,13 @@ some high level notes and highlights from each release. v0.6 series =========== +------- +v0.6.13 +------- + +This is a hotfix on v0.6.12. The python distribution package was missing some +modules. + ------- v0.6.12 ------- diff --git a/cmakelang/pypi/setup.py b/cmakelang/pypi/setup.py index b2ae572..36ad4c7 100644 --- a/cmakelang/pypi/setup.py +++ b/cmakelang/pypi/setup.py @@ -20,10 +20,11 @@ name="cmakelang", packages=[ "cmakelang", - "cmakelang.command_tests", + "cmakelang.format", + "cmakelang.lex", + "cmakelang.lint", "cmakelang.parse", "cmakelang.parse.funs", - "cmakelang.lint", ], version=VERSION, description="Language tools for cmake (format, lint, etc)", diff --git a/cmakelang/tools/ensure_docker_tag.py b/cmakelang/tools/ensure_docker_tag.py index 5b0c869..d5315ee 100644 --- a/cmakelang/tools/ensure_docker_tag.py +++ b/cmakelang/tools/ensure_docker_tag.py @@ -22,6 +22,9 @@ def get_env(deploykey_path): env = os.environ.copy() if deploykey_path: + if not os.path.exists(deploykey_path): + raise RuntimeError( + "Supplied deploy key {} does not exist".format(deploykey_path)) env["GIT_SSH_COMMAND"] = ( "ssh -o IdentitiesOnly=yes -i {} -F /dev/null".format(deploykey_path)) return env diff --git a/cmakelang/tools/ensure_precommit_tag.py b/cmakelang/tools/ensure_precommit_tag.py index 99c5d19..69a70f5 100644 --- a/cmakelang/tools/ensure_precommit_tag.py +++ b/cmakelang/tools/ensure_precommit_tag.py @@ -23,6 +23,9 @@ def get_env(deploykey_path): env = os.environ.copy() if deploykey_path: + if not os.path.exists(deploykey_path): + raise RuntimeError( + "Supplied deploy key {} does not exist".format(deploykey_path)) env["GIT_SSH_COMMAND"] = ( "ssh -o IdentitiesOnly=yes -i {} -F /dev/null".format(deploykey_path)) return env diff --git a/cmakelang/vscode_extension/package-lock.json b/cmakelang/vscode_extension/package-lock.json index d71f47c..49d2f02 100644 --- a/cmakelang/vscode_extension/package-lock.json +++ b/cmakelang/vscode_extension/package-lock.json @@ -1,6 +1,6 @@ { "name": "cmake-format", - "version": "0.6.12-dev0", + "version": "0.6.13", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/cmakelang/vscode_extension/package.json b/cmakelang/vscode_extension/package.json index c46317e..7a53979 100644 --- a/cmakelang/vscode_extension/package.json +++ b/cmakelang/vscode_extension/package.json @@ -2,7 +2,7 @@ "name": "cmake-format", "displayName": "cmake-format", "description": "Format listfiles so they don't look like crap", - "version": "0.6.12-dev0", + "version": "0.6.13", "publisher": "cheshirekow", "repository": "https://github.com/cheshirekow/cmakelang", "icon": "images/cmake-format-logo.png",