New release: 0.2.1 → 0.2.2

Bumps [requests](https://github.com/psf/requests) from 2.25.1 to 2.26.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.25.1...v2.26.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/cli_setup.yml

@@ -24,20 +24,8 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install Python dependencies
-      run: |
-        python3 -m pip install wheel
-        echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-    - name: Install QMK CLI from source
-      run: |
-        python3 -m pip install -r requirements.txt
-        python3 setup.py sdist bdist_wheel
-        cd ..
-        python3 -m pip install --force-reinstall --no-index --no-deps --prefix=~/.local --find-links qmk_cli/dist qmk
-
-    - name: Run qmk setup -y
-      run: qmk setup -y
+    - name: Run ci_tests
+      run: ./ci_tests -a
 
   test_cli_win:
     runs-on: windows-latest
@@ -57,7 +45,6 @@ jobs:
       shell: msys2 {0}
       run: |
         python3 -m pip install wheel
-
     - name: (MSYS2) Install QMK CLI from source
       shell: msys2 {0}
       run: |
@@ -65,7 +52,6 @@ jobs:
         python3 setup.py sdist bdist_wheel
         cd ..
         python3 -m pip install --force-reinstall --no-index --no-deps --find-links qmk_cli/dist qmk
-
     - name: (MSYS2) Run qmk setup -y
       shell: msys2 {0}
       run: qmk setup -y

.github/workflows/python-publish.yml

@@ -22,6 +22,8 @@ jobs:
       uses: actions/setup-python@v2.2.2
       with:
         python-version: '3.7'
+    - name: Run ci_tests
+      run: ./ci_tests
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -40,8 +42,19 @@ jobs:
         tags: true
     - name: Build and publish
       env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_USERNAME: qmk
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
         python setup.py sdist bdist_wheel
         twine upload dist/*
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v1.10.0
+      with:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+    - name: Build and Push to Docker Hub
+      uses: docker/build-push-action@v2.6.1
+      with:
+        context: .
+        push: true
+        tags: qmkfm/qmk_cli:latest

Dockerfile

@@ -0,0 +1,13 @@
+FROM qmkfm/base_container
+
+# Copy package in
+ADD dist /tmp/dist
+
+# Install python packages
+RUN python3 -m pip uninstall -y qmk || true
+RUN python3 -m pip install --upgrade pip setuptools wheel nose2 && \
+    python3 -m pip install /tmp/dist/qmk-*.whl && \
+    rm -rf /tmp/dist
+
+# Set the default location for qmk_firmware
+ENV QMK_HOME /qmk_firmware

ci_tests

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+set -e
+#set -x
+
+ADVANCED=false
+TMPDIR=$(mktemp -d)
+QMK_HOME="$TMPDIR/qmk_firmware"
+export QMK_HOME
+
+for arg in $@; do
+    if [ "$arg" = "-a" ]; then
+        ADVANCED=true
+    fi
+done
+
+if [ $ADVANCED = true ]; then
+    echo "*** Running in advanced mode with tmp files in $TMPDIR"
+else
+    echo "*** Running in basic mode with tmp files in $TMPDIR"
+fi
+
+# Setup our virtualenv
+if [ -e .ci_venv ]; then
+    rm -rf .ci_venv
+fi
+
+python3 -m venv .ci_venv
+source .ci_venv/bin/activate
+
+# Install dependencies
+python3 -m pip install -U pip wheel
+python3 -m pip install .
+python3 -m pip install -r requirements-dev.txt
+
+# Ensure that qmk works
+echo "*** Testing 'qmk clone -h'"
+qmk clone -h
+echo "*** Testing 'qmk config -a'"
+qmk config -a
+echo "*** Testing 'qmk setup -n'"
+qmk setup -n
+
+echo
+echo "*** Basic tests completed successfully!"
+
+# Run advanced test if requested
+if [ $ADVANCED = true ]; then
+    echo
+    echo "*** Testing 'qmk setup -y'"
+    qmk setup -y
+
+    echo
+    echo "*** Advanced tests completed successfully!"
+fi
+
+# Cleanup
+deactivate
+rm -rf .ci_venv $TMPDIR

qmk_cli/__init__.py

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

qmk_cli/subcommands/setup.py

@@ -83,6 +83,8 @@ def setup(cli):
                 git_upstream(cli.args.home)
             else:
                 exit(1)
+        else:
+            cli.log.warning('Not cloning qmk_firmware due to user input or --no flag.')
 
     # Offer to set `user.qmk_home` for them.
     if str(cli.args.home) != os.environ['QMK_HOME'] and yesno(home_prompt):
@@ -91,14 +93,15 @@ def setup(cli):
         cli.write_config_option('user', 'qmk_home')
 
     # Run `qmk doctor` to check the rest of the environment out
-    color = '--color' if cli.config.general.color else '--no-color'
-    unicode = '--unicode' if cli.config.general.unicode else '--no-unicode'
-    doctor_command = [Path(sys.argv[0]).as_posix(), color, unicode, 'doctor']
+    if cli.args.home.exists():
+        color = '--color' if cli.config.general.color else '--no-color'
+        unicode = '--unicode' if cli.config.general.unicode else '--no-unicode'
+        doctor_command = [Path(sys.argv[0]).as_posix(), color, unicode, 'doctor']
 
-    if cli.args.no:
-        doctor_command.append('--no')
+        if cli.args.no:
+            doctor_command.append('-n')
 
-    if cli.args.yes:
-        doctor_command.append('--yes')
+        if cli.args.yes:
+            doctor_command.append('-y')
 
-    cli.run(doctor_command, stdin=None, capture_output=False)
+        cli.run(doctor_command, stdin=None, capture_output=False)

requirements-dev.txt

@@ -1,29 +1,29 @@
-bleach==3.3.0
+bleach==3.3.1
 bump2version==1.0.1
 bumpversion==0.6.0
 certifi==2021.5.30
-cffi==1.14.5
+cffi==1.14.6
 chardet==4.0.0
 colorama==0.4.4
 cryptography==3.4.7
 docutils==0.17.1
 idna==2.10
-importlib-metadata==4.5.0
-jeepney==0.6.0
+importlib-metadata==4.6.1
+jeepney==0.7.0
 keyring==23.0.1
-packaging==20.9
-pkginfo==1.7.0
+packaging==21.0
+pkginfo==1.7.1
 pycparser==2.20
 Pygments==2.9.0
 pyparsing==2.4.7
 readme-renderer==29.0
-requests==2.25.1
+requests==2.26.0
 requests-toolbelt==0.9.1
 rfc3986==1.5.0
 SecretStorage==3.3.1
 six==1.16.0
-tqdm==4.61.1
+tqdm==4.61.2
 twine==3.4.1
 urllib3==1.26.6
 webencodings==0.5.1
-zipp==3.4.1
+zipp==3.5.0

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.0
+current_version = 0.2.2
 commit = True
 tag = True
 tag_name = {new_version}

setup.py

@@ -45,7 +45,7 @@ if __name__ == "__main__":
             "attrs==21.2.0",
             "colorama==0.4.4",
             "coverage==5.5",
-            "dotty-dict==1.3.0",
+            "qmk-dotty-dict==1.3.0.post1",
             "flake8==3.9.2",
             "halo==0.0.31",
             "hid==1.0.4",
@@ -58,8 +58,8 @@ if __name__ == "__main__":
             "pycodestyle==2.7.0",
             "pyflakes==2.3.1",
             "Pygments==2.9.0",
-            "pyrsistent==0.17.3",
-            "pyusb==1.1.1",
+            "pyrsistent==0.18.0",
+            "pyusb==1.2.1",
             "setuptools>=45",
             "six==1.16.0",
             "spinners==0.0.24",