Merge pull request #731 from serokell/krendelhoff/chore-v18.0-3-release

[Chore] Bump release version
serokell · Oct 4, 2023 · b3b7f3a · b3b7f3a
2 parents 1234f8e + 9b802af
commit b3b7f3a
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 75 deletions.
diff --git a/Formula/tezos-node-oxfordnet.rb b/Formula/tezos-node-oxfordnet.rb
diff --git a/baking/pyproject.toml b/baking/pyproject.toml
@@ -14,7 +14,7 @@ description = "Package that provides systemd services that orchestrate other ser
 license = { text = "LicenseRef-MIT-OA" }
 requires-python = ">=3.8"
 readme = "README.md"
-version = "v18.0a"
+version = "v18.0b"
 
 [tool.setuptools.packages.find]
 where= ["src"]

diff --git a/baking/src/tezos_baking/steps.py b/baking/src/tezos_baking/steps.py
@@ -107,7 +107,6 @@ def pprint_options(self):
     "mainnet": "Main Tezos network",
     "ghostnet": "Long running test network, currently using the Nairobi Tezos protocol",
     "nairobinet": "Test network using the Nairobi Tezos protocol",
-    "oxfordnet": "Test network using the Oxford Tezos protocol",
 }
 
 # Steps

diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py
@@ -201,7 +201,7 @@ def get_node_version():
     id="network",
     prompt="Which Tezos network would you like to use?\nCurrently supported:",
     help="The selected network will be used to set up all required services.\n"
-    "The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`) and Proxford (used on `oxfordnet`).\n"
+    "The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`).\n"
     "Keep in mind that you must select the test network (e.g. ghostnet)\n"
     "if you plan on baking with a faucet JSON file.\n",
     options=networks,

diff --git a/docker/package/model.py b/docker/package/model.py
@@ -585,7 +585,7 @@ class TezosBakingServicesPackage(AbstractPackage):
     # native releases, so we append an extra letter to the version of
     # the package.
     # This should be reset to "" whenever the native version is bumped.
-    letter_version = "a"
+    letter_version = "b"
 
     buildfile = "setup.py"
 

diff --git a/docker/package/packages.py b/docker/package/packages.py
@@ -20,13 +20,11 @@
     "mainnet": "mainnet",
     "ghostnet": "ghostnet",
     "nairobinet": "https://teztnets.xyz/nairobinet",
-    "oxfordnet": "https://teztnets.xyz/oxfordnet",
 }
 networks_protos = {
     "mainnet": ["PtNairob"],
     "ghostnet": ["PtNairob"],
     "nairobinet": ["PtNairob"],
-    "oxfordnet": ["Proxford"],
 }
 
 protocol_numbers = {

diff --git a/docs/baking.md b/docs/baking.md
@@ -30,7 +30,7 @@ that you can use by following the [installation instructions](https://www.raspbe
 In order to run a baking instance, you'll need the following Tezos binaries:
 `tezos-client`, `tezos-node`, `tezos-baker-<proto>`.
 
-The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`) and `Proxford` (used on `oxfordnet`).
+The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`).
 Also, note that the corresponding packages have protocol
 suffix in lowercase, e.g. the list of available baker packages can be found
 [here](https://launchpad.net/~serokell/+archive/ubuntu/tezos/+packages?field.name_filter=tezos-baker&field.status_filter=published).

diff --git a/docs/systemd.md b/docs/systemd.md
@@ -63,7 +63,6 @@ networks.
 
 `tezos-node` packages provide multiple services out of the box:
 - `tezos-node-nairobinet`
-- `tezos-node-oxfordnet`
 - `tezos-node-ghostnet`
 - `tezos-node-mainnet`
 

diff --git a/meta.json b/meta.json
@@ -1,5 +1,5 @@
 {
-  "release": "2",
+  "release": "3",
   "maintainer": "Serokell <[email protected]>",
   "tezos_ref": "v18.0"
 }