Merge branch 'dev'

CHANGELOG.md

@@ -2,17 +2,27 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
 Maybe your next idea?
 
+## [0.3.2] - 2022-07-04
+
+Integrates [#13](https://github.com/chvolkmann/code-connect/pull/13) contributed by [@typedrat](https://github.com/typedrat)
+
+### Changed
+- Update `code_connect.py` to use `shutil` instead of the deprecated `distutils`
+
 ## [0.3.1] - 2022-04-04
 
+
+Integrates [#11](https://github.com/chvolkmann/code-connect/pull/11) contributed by [@frecks](https://github.com/frecks)
+
 ### Changed
 
+
 - Updated to reflect the VS Code binary location change from `~/.vscode-server/bin/<commit-id>/bin/code` to
 `~/.vscode-server/bin/<commit-id>/bin/remote-cli/code` in [commit
 f4ba7dd12b684b144457c6fc6ccc9f4fe71bde3c](microsoft/vscode@f4ba7dd),
@@ -90,7 +100,9 @@ which was released in [March 2022 (version
 
 - Initial release of `code-connect` and the corresponding fish plugin
 
-[unreleased]: https://github.com/chvolkmann/code-connect/compare/v0.3.0...HEAD
+[unreleased]: https://github.com/chvolkmann/code-connect/compare/v0.3.2...HEAD
+[0.3.2]: https://github.com/chvolkmann/code-connect/compare/v0.3.1...v0.3.2
+[0.3.1]: https://github.com/chvolkmann/code-connect/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/chvolkmann/code-connect/compare/v0.2.2...v0.3.0
 [0.2.2]: https://github.com/chvolkmann/code-connect/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/chvolkmann/code-connect/compare/v0.2.0...v0.2.1

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Christian Volkmann
+Copyright (c) 2022 Christian Volkmann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

bin/code_connect.py

@@ -6,8 +6,8 @@
 import subprocess as sp
 import sys
 import time
-from distutils.spawn import find_executable
 from pathlib import Path
+from shutil import which
 from typing import Iterable, List, NoReturn, Sequence, Tuple
 
 # IPC sockets will be filtered based when they were last accessed
@@ -59,7 +59,7 @@ def next_open_socket(socks: Sequence[Path]) -> Path:
 
 def check_for_binaries() -> None:
     """ Verifies that all required binaries are available in $PATH. """
-    if not find_executable("socat"):
+    if not which("socat"):
         fail('"socat" not found in $PATH, but is required for code-connect')
 
 

pyproject.toml

@@ -5,7 +5,7 @@ keywords = ["vscode"]
 license = "MIT"
 name = "code-connect"
 repository = "https://github.com/chvolkmann/code-connect"
-version = "0.3.1"
+version = "0.3.2"
 
 [tool.poetry.dependencies]
 python = "^3.8"