Skip to content

Commit f7baf01

Browse files
authored
Merge pull request #9 from piwheels/dev
Release v0.4.6
2 parents 1c36740 + a0a33a9 commit f7baf01

File tree

17 files changed

+276
-135
lines changed

17 files changed

+276
-135
lines changed

README.rst

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ View the information about Pis in your account from the command line:
3434

3535
.. code-block:: console
3636
37-
$ hostedpi list
37+
$ hostedpi ls
3838
pi123
3939
pi234
4040
pi345
@@ -56,23 +56,22 @@ View the information about Pis in your account from the command line:
5656
└───────┴───────┴────────┴───────────┘
5757
5858
$ hostedpi table pi345 --full
59-
┏━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┓
60-
┃ Name ┃ Model ┃ Memory ┃ CPU Speed ┃ NIC Speed ┃ Disk size ┃ Status ┃ Initialised keys ┃ IPv4 SSH port ┃
61-
┡━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━┩
62-
│ pi345 │ 4B │ 8 GB │ 2.0 GHz │ 1 Gbps │ 50 GB │ Powered on │ Yes │ 5387
63-
└───────┴───────┴────────┴───────────┴───────────┴───────────┴────────────┴──────────────────┴───────────────┘
59+
┏━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━
60+
┃ Name ┃ Model ┃ Memory ┃ CPU Speed ┃ NIC Speed ┃ Disk size ┃ Status ┃ Initialised keys ┃ IPv4 SSH port ┃ IPv6 Address ┃
61+
┡━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━
62+
│ pi345 │ 4B │ 8 GB │ 2.0 GHz │ 1 Gbps │ 50 GB │ Powered on │ Yes │ 5381 │ 2a00:1098:8:17d::1
63+
└───────┴───────┴────────┴───────────┴───────────┴───────────┴────────────┴──────────────────┴───────────────┴────────────────────
6464
6565
Provision a new Pi with your public key and SSH into it:
6666

6767
.. code-block:: console
6868
6969
$ hostedpi create mypi --model 3 --ssh-key-path ~/.ssh/id_rsa.pub --wait
70-
Server provisioned
71-
┏━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━┓
72-
┃ Name ┃ Model ┃ Memory ┃ CPU Speed ┃
73-
┡━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━┩
74-
│ mypi | 3 │ 1 GB │ 1.2 GHz │
75-
└──────┴───────┴────────┴───────────┘
70+
┏━━━━━━┳━━━━━━━━━━━━━┓
71+
┃ Name ┃ Status ┃
72+
┡━━━━━━╇━━━━━━━━━━━━━┩
73+
│ mypi │ Provisioned │
74+
└──────┴─────────────┘
7675
$ hostedpi ssh command mypi
7776
ssh -p 5063 [email protected]
7877
$ ssh -p 5063 [email protected]

docs/changelog.rst

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,31 @@ Changelog
88
Once the library reaches v1.0, it will be considered stable. Please consider giving feedback to
99
help stabilise the API.
1010

11+
Release 0.4.6 (2025-10-18)
12+
==========================
13+
14+
- Allowed ``user`` to be ``None`` in :meth:`~hostedpi.pi.Pi.get_ipv4_ssh_command()`,
15+
:meth:`~hostedpi.pi.Pi.get_ipv6_ssh_command()`, :meth:`~hostedpi.pi.Pi.get_ipv4_ssh_config()` and
16+
:meth:`~hostedpi.pi.Pi.get_ipv6_ssh_config()` methods to :class:`~hostedpi.pi.Pi`
17+
- Allowed ``user`` to be ``None`` in :meth:`~hostedpi.picloud.PiCloud.get_ipv4_ssh_config()` and
18+
:meth:`~hostedpi.picloud.PiCloud.get_ipv6_ssh_config()` method to
19+
:class:`~hostedpi.picloud.PiCloud`
20+
- Removed ``--full`` option from :doc:`cli/create` command, and simplified the output to a single
21+
table
22+
23+
Release 0.4.5 (2025-10-11)
24+
==========================
25+
26+
- Fixup release
27+
1128
Release 0.4.4 (2025-10-10)
1229
==========================
1330

14-
- Added :meth:`~hostedpi.pi.Pi.get_ipv6_ssh_command()` and
31+
- Added :meth:`~hostedpi.pi.Pi.get_ipv4_ssh_command()`,
32+
:meth:`~hostedpi.pi.Pi.get_ipv6_ssh_command()`, :meth:`~hostedpi.pi.Pi.get_ipv4_ssh_config()` and
1533
:meth:`~hostedpi.pi.Pi.get_ipv6_ssh_config()` methods to :class:`~hostedpi.pi.Pi`
16-
- Added :meth:`~hostedpi.picloud.PiCloud.get_ipv6_ssh_config()` method to
34+
- Added :meth:`~hostedpi.picloud.PiCloud.get_ipv4_ssh_config()` and
35+
:meth:`~hostedpi.picloud.PiCloud.get_ipv6_ssh_config()` method to
1736
:class:`~hostedpi.picloud.PiCloud`
1837

1938
Release 0.4.3 (2025-07-25)

docs/cli/create.rst

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Arguments
1717

1818
Names of the Raspberry Pi servers to provision
1919

20-
If no names are provided, a generated name will be generated. Use in combination with
21-
:option:`--number` to create multiple servers with generated names.
20+
If no names are provided, a name will be generated. Use in combination with :option:`--number`
21+
to create multiple servers with generated names.
2222

2323
Options
2424
=======
@@ -58,9 +58,6 @@ Options
5858

5959
Wait and poll for status to be available before returning
6060

61-
Supply with :option:`--full` to show the full table of Raspberry Pi server info when the server
62-
is provisioned
63-
6461
.. option:: --ssh-key-path [path]
6562

6663
Path to the SSH key to install on the Raspberry Pi server
@@ -77,12 +74,6 @@ Options
7774

7875
Can be provided multiple times
7976

80-
.. option:: --full
81-
82-
Show full table of Raspberry Pi server info when the server is provisioned
83-
84-
Can only provided along with :option:`--wait`
85-
8677
.. option:: --help
8778

8879
Show this message and exit
@@ -95,30 +86,23 @@ Provision a new Pi 3 using the default Pi 3 spec, and wait for it to be provisio
9586
.. code-block:: console
9687
9788
$ hostedpi create mypi --model 3 --wait
98-
Server provisioned
99-
┏━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━┓
100-
┃ Name ┃ Model ┃ Memory ┃ CPU Speed ┃
101-
┡━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━┩
102-
│ mypi │ 3 │ 1 GB │ 1.2 GHz │
103-
└───────┴───────┴────────┴───────────┘
89+
┏━━━━━━┳━━━━━━━━━━━━━┓
90+
┃ Name ┃ Status ┃
91+
┡━━━━━━╇━━━━━━━━━━━━━┩
92+
│ mypi │ Provisioned │
93+
└──────┴─────────────┘
10494
10595
Provision two new Pi 4 servers with generated names, using the default Pi 4 spec:
10696

10797
.. code-block:: console
10898
10999
$ hostedpi create --model 4 --number 2 --wait
110-
Server provisioned
111-
┏━━━━━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━┓
112-
┃ Name ┃ Model ┃ Memory ┃ CPU Speed ┃
113-
┡━━━━━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━┩
114-
│ c8046pxjf │ 4 │ 4 GB │ 1.5 GHz │
115-
└───────────┴───────┴────────┴───────────┘
116-
Server provisioned
117-
┏━━━━━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━┓
118-
┃ Name ┃ Model ┃ Memory ┃ CPU Speed ┃
119-
┡━━━━━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━┩
120-
│ c8046pg5e │ 4 │ 4 GB │ 1.5 GHz │
121-
└───────────┴───────┴────────┴───────────┘
100+
┏━━━━━━━━━━━┳━━━━━━━━━━━━━┓
101+
┃ Name ┃ Status ┃
102+
┡━━━━━━━━━━━╇━━━━━━━━━━━━━┩
103+
│ c8046pxjf │ Provisioned │
104+
│ c8046pg5e │ Provisioned │
105+
└───────────┴─────────────┘
122106
123107
.. warning::
124108
If no :option:`names` are provided, and :option:`--wait` is not provided, the command will return
@@ -129,12 +113,11 @@ Provision a new Pi 4 using custom settings:
129113
.. code-block:: console
130114
131115
$ hostedpi create mypi4 --model 4 --memory 8192 --cpu-speed 2000 --disk 60 --os-image rpi-jammy-arm64 --ssh-key-path ~/.ssh/id_rsa.pub --wait
132-
Server provisioned
133-
┏━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━┓
134-
┃ Name ┃ Model ┃ Memory ┃ CPU Speed ┃
135-
┡━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━┩
136-
│ mypi4 │ 4 │ 8 GB │ 2.0 GHz │
137-
└───────┴───────┴────────┴───────────┘
116+
┏━━━━━━━┳━━━━━━━━━━━━━┓
117+
┃ Name ┃ Status ┃
118+
┡━━━━━━━╇━━━━━━━━━━━━━┩
119+
│ mypi4 │ Provisioned │
120+
└───────┴─────────────┘
138121
139122
.. note::
140123

docs/cli/ssh/command.rst

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,18 @@ Options
3232

3333
The username to use when connecting
3434

35+
.. option:: --no-user
36+
37+
Don't include a username in SSH command
38+
3539
.. option:: --help
3640

3741
Show this message and exit
3842

3943
Usage
4044
=====
4145

42-
Output the IPv4 SSH command for a Pi:
46+
Output the default IPv4 SSH command for a Pi:
4347

4448
.. code-block:: console
4549
@@ -53,13 +57,24 @@ Output the IPv4 SSH command for a Pi, with a custom username:
5357
$ hostedpi ssh command mypi --username pi
5458
ssh -p 5091 [email protected]
5559
60+
Output the IPv4 SSH command for a Pi, with no specified username:
61+
62+
.. code-block:: console
63+
64+
$ hostedpi ssh command mypi --no-user
65+
ssh -p 5091 ssh.mypi.hostedpi.com
66+
5667
Output the IPv6 SSH command for a Pi:
5768

5869
.. code-block:: console
5970
6071
$ hostedpi ssh command mypi --ipv6
6172
6273
74+
.. warning::
75+
76+
You will need IPv6 connectivity to connect using the IPv6 address.
77+
6378
Output the IPv6 SSH command for a Pi, with a custom username and numeric address:
6479

6580
.. code-block:: console

docs/cli/ssh/config.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ Options
3636

3737
The username to use when connecting
3838

39+
.. option:: --no-user
40+
41+
Don't include a username in SSH command
42+
3943
.. option:: --help
4044

4145
Show this message and exit
@@ -71,6 +75,10 @@ Output the IPv6 SSH config for a Pi:
7175
user root
7276
hostname mypi.hostedpi.com
7377
78+
.. warning::
79+
80+
You will need IPv6 connectivity to connect using the IPv6 address.
81+
7482
Output the IPv6 SSH config for a Pi, using a custom username and numeric address:
7583

7684
.. code-block:: console
@@ -80,6 +88,14 @@ Output the IPv6 SSH config for a Pi, using a custom username and numeric address
8088
user pi
8189
hostname 2a00:1098:8:14b::1
8290
91+
Output the IPv6 SSH config for a Pi, using the numeric address and specifying no username:
92+
93+
.. code-block:: console
94+
95+
$ hostedpi ssh config mypi --ipv6 --numeric --no-user
96+
Host mypi
97+
hostname 2a00:1098:8:14b::1
98+
8399
Output the IPv4 SSH config for multiple Pis:
84100

85101
.. code-block:: console

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import sphinx_rtd_theme
88

99

10-
hostedpi_version = "0.4.5"
10+
hostedpi_version = "0.4.6"
1111

1212

1313
# -- General configuration ------------------------------------------------

docs/index.rst

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ View the information about Pis in your account from the command line:
3434

3535
.. code-block:: console
3636
37-
$ hostedpi list
37+
$ hostedpi ls
3838
pi123
3939
pi234
4040
pi345
@@ -56,23 +56,22 @@ View the information about Pis in your account from the command line:
5656
└───────┴───────┴────────┴───────────┘
5757
5858
$ hostedpi table pi345 --full
59-
┏━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┓
60-
┃ Name ┃ Model ┃ Memory ┃ CPU Speed ┃ NIC Speed ┃ Disk size ┃ Status ┃ Initialised keys ┃ IPv4 SSH port ┃
61-
┡━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━┩
62-
│ pi345 │ 4B │ 8 GB │ 2.0 GHz │ 1 Gbps │ 50 GB │ Powered on │ Yes │ 5387
63-
└───────┴───────┴────────┴───────────┴───────────┴───────────┴────────────┴──────────────────┴───────────────┘
59+
┏━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━
60+
┃ Name ┃ Model ┃ Memory ┃ CPU Speed ┃ NIC Speed ┃ Disk size ┃ Status ┃ Initialised keys ┃ IPv4 SSH port ┃ IPv6 Address ┃
61+
┡━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━
62+
│ pi345 │ 4B │ 8 GB │ 2.0 GHz │ 1 Gbps │ 50 GB │ Powered on │ Yes │ 5381 │ 2a00:1098:8:17d::1
63+
└───────┴───────┴────────┴───────────┴───────────┴───────────┴────────────┴──────────────────┴───────────────┴────────────────────
6464
6565
Provision a new Pi with your public key and SSH into it:
6666

6767
.. code-block:: console
6868
6969
$ hostedpi create mypi --model 3 --ssh-key-path ~/.ssh/id_rsa.pub --wait
70-
Server provisioned
71-
┏━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━┓
72-
┃ Name ┃ Model ┃ Memory ┃ CPU Speed ┃
73-
┡━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━┩
74-
│ mypi | 3 │ 1 GB │ 1.2 GHz │
75-
└──────┴───────┴────────┴───────────┘
70+
┏━━━━━━┳━━━━━━━━━━━━━┓
71+
┃ Name ┃ Status ┃
72+
┡━━━━━━╇━━━━━━━━━━━━━┩
73+
│ mypi │ Provisioned │
74+
└──────┴─────────────┘
7675
$ hostedpi ssh command mypi
7776
ssh -p 5063 [email protected]
7877
$ ssh -p 5063 [email protected]

0 commit comments

Comments
 (0)