Merge branch 'develop'

.github/workflows/build-golang-macos-test.yaml

@@ -22,8 +22,8 @@ jobs:
  strategy:
  fail-fast: true
  matrix:
- go-version: [1.21.x]
- # go-version: [ '1.19', '1.20', '1.21.x' ]
+ go-version: [1.22.x]
+ # go-version: [ '1.19', '1.20', '1.22.x' ]
 
  steps:
  - uses: actions/checkout@v4
@@ -98,7 +98,7 @@ jobs:
  - name: Test Python wheel
  run: |
  # Test wheel installation
- pip install dist/ohpygossh-0.0.3-py3-none-any.whl
+ pip install dist/ohpygossh-0.0.4-py3-none-any.whl
 
  # Test wheel functionality
  python3 validate_ohpygossh.py

.github/workflows/build-golang-macos.yaml

@@ -22,8 +22,8 @@ jobs:
  strategy:
  fail-fast: true
  matrix:
- go-version: [1.21.x]
- # go-version: [ '1.19', '1.20', '1.21.x' ]
+ go-version: [1.22.x]
+ # go-version: [ '1.19', '1.20', '1.22.x' ]
 
  steps:
  - uses: actions/checkout@v4
@@ -98,7 +98,7 @@ jobs:
  - name: Test Python wheel
  run: |
  # Test wheel installation
- pip install dist/ohpygossh-0.0.3-py3-none-any.whl
+ pip install dist/ohpygossh-0.0.4-py3-none-any.whl
 
  # Test wheel functionality
  python3 validate_ohpygossh.py

.github/workflows/build-golang-ubuntu.yaml

@@ -15,8 +15,8 @@ jobs:
  strategy:
  fail-fast: true
  matrix:
- go-version: [1.21.x]
- # go-version: [ '1.19', '1.20', '1.21.x' ]
+ go-version: [1.22.x]
+  # go-version: [ '1.19', '1.20', '1.22.x' ]
 
  steps:
  - uses: actions/checkout@v4
@@ -127,7 +127,7 @@ jobs:
  - name: Test Python wheel
  run: |
  # Test wheel installation
- pip install dist/ohpygossh-0.0.3-py3-none-any.whl
+ pip install dist/ohpygossh-0.0.4-py3-none-any.whl
 
  # DISABLED: Need to figure out Ubuntu nested VM
  # Test wheel functionality

.github/workflows/build-python.yaml

@@ -12,8 +12,8 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- go-version: [1.21.x]
- # go-version: [ '1.19', '1.20', '1.21.x' ]
+ go-version: [1.22.x]
+ # go-version: [ '1.19', '1.20', '1.22.x' ]
 
  steps:
  - uses: actions/checkout@v4

.github/workflows/lint-on-macos.yaml

@@ -12,8 +12,8 @@ jobs:
  strategy:
  fail-fast: true
  matrix:
- go-version: [1.21.x]
- # go-version: [ '1.19', '1.20', '1.21.x' ]
+ go-version: [1.22.x]
+ # go-version: [ '1.19', '1.20', '1.22.x' ]
 
  steps:
  - uses: actions/checkout@v4

.github/workflows/lint-on-ubuntu.yaml

@@ -12,8 +12,8 @@ jobs:
  strategy:
  fail-fast: true
  matrix:
- go-version: [1.21.x]
- # go-version: [ '1.19', '1.20', '1.21.x' ]
+ go-version: [1.22.x]
+ # go-version: [ '1.19', '1.20', '1.22.x' ]
 
  steps:
  - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -33,7 +33,7 @@ repos:
  # - id: validate-toml
  - id: no-go-testing
  - repo: https://github.com/codespell-project/codespell
- rev: v2.2.6
+ rev: v2.3.0
  hooks:
  - id: codespell
  args: [-L, blong, gohpygossh]

README.md

@@ -30,7 +30,7 @@ and/or cause debate without offerinig solutions.
 ## Build wheel
 
 The following steps should produce a wheel,
-located at `dist/ohpygossh-0.0.3-py3-none-any.whl`
+located at `dist/ohpygossh-0.0.4-py3-none-any.whl`
 
 ```bash
 ./make_and_validate_script.sh

go.mod

@@ -1,17 +1,9 @@
 module gohpygossh
 
-go 1.21.4
+go 1.22
 
-require (
- // github.com/aitorfernandez/go-by-example/gmachine v0.0.0-20211027100751-fc19fe9ca82e
- github.com/go-python/gopy v0.4.7
- golang.org/x/crypto v0.21.0
-// github.com/debarshibasak/go-multipass v1.0.5
+require golang.org/x/crypto v0.21.0
 
-)
+require github.com/larstobi/go-multipass v1.2.1
 
-require (
- github.com/debarshibasak/go-multipass v1.0.5 // indirect
- github.com/larstobi/go-multipass v1.2.1 // indirect
- golang.org/x/sys v0.18.0 // indirect
-)
+require golang.org/x/sys v0.18.0 // indirect

go.sum

@@ -1,19 +1,8 @@
-github.com/aitorfernandez/go-by-example/gmachine v0.0.0-20211027100751-fc19fe9ca82e h1:He0z5dj3rCDY5CJEIG5BKYkwrz9jzhIwQxiCUE7tKqc=
-github.com/aitorfernandez/go-by-example/gmachine v0.0.0-20211027100751-fc19fe9ca82e/go.mod h1:qtiTEYvGKFC1OVU7q9Yk6hCGzY3811uVB+4vm+QoAhU=
-github.com/debarshibasak/go-multipass v1.0.5 h1:V7emd0i0qySy5/xISY1rTDcbhWDMmmDndKQWlXReKvs=
-github.com/debarshibasak/go-multipass v1.0.5/go.mod h1:b0JjZSmbnrGrnsD/vtESeBM6W3PLqRweVjU2xbbFISA=
-github.com/go-python/gopy v0.4.7 h1:VkJmTmzioBIRWca7+3EBN9W8/yPQavC8VNg+CMINHHQ=
-github.com/go-python/gopy v0.4.7/go.mod h1:SqsDVtw9SG+TJNwJOnnnU/myD76uOhO8w5jehFewoVc=
 github.com/larstobi/go-multipass v1.2.1 h1:9OJKnGBlUvCPkCrS6MOzfRavGRDNMYRDAHHQPggsh0Y=
 github.com/larstobi/go-multipass v1.2.1/go.mod h1:RkIg1w+XE1w+BVRVIZCPjtUWyT+p9R3Bdyn+MUkGiNg=
-golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
-golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=

make_and_validate_script.sh

@@ -39,7 +39,7 @@ python3 -m pip install --upgrade setuptools wheel
 python3 setup.py bdist_wheel
 
 # Prove that the wheel can be installed
-pip install dist/ohpygossh-0.0.3-py3-none-any.whl
+pip install dist/ohpygossh-0.0.4-py3-none-any.whl
 
 # Validate functionality
 python3 validate_ohpygossh.py

only_validate.sh

@@ -30,7 +30,7 @@ fi
 source .venv/bin/activate
 
 # Prove that the wheel can be installed
-pip install dist/ohpygossh-0.0.3-py3-none-any.whl
+pip install dist/ohpygossh-0.0.4-py3-none-any.whl
 
 # Validate functionality
 python validate_ohpygossh.py

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "gohpygossh"
 # Should match 'setup.py' version number (used for gopy/pybindgen)
-version = "0.0.3"
+version = "0.0.4"
 description = ""
 authors = ["b-long <[email protected]>"]
 readme = "README.md"

setup.py

@@ -6,6 +6,6 @@
  py_modules = ["ohpygossh.gohpygossh"],
  package_data={"ohpygossh": ["*.so"]},
  # Should match 'pyproject.toml' version number
- version="0.0.3",
+ version="0.0.4",
  include_package_data=True,
 )

validate_ohpygossh.py

@@ -120,7 +120,7 @@ def test_with_keys_only():
  commands=f"""
 
 echo "Testing generated keypair"
-echo "Performing authenticaton as 'vagrant' user"
+echo "Performing authentication as 'vagrant' user"
 
 ssh -o StrictHostKeyChecking=no -i {keys.PrivKeyAbsPath} vagrant@{ssh_hostname} -p {ssh_port} 'echo "We did it!"'
 
@@ -132,7 +132,7 @@ def test_with_keys_only():
 # commands=f"""
 
 # echo "Testing generated keypair"
-# echo "Performing authenticaton as '{keys_only_user}' user"
+# echo "Performing authentication as '{keys_only_user}' user"
 
 # ssh -i {keys.PrivKeyAbsPath} {keys_only_user}@{ssh_hostname} -p {ssh_port} -c 'echo "We did it!"'