From eae2dc3158da1a0230c223108dde8a8d066d20ea Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Thu, 22 Dec 2022 16:28:24 +0300 Subject: [PATCH] Rebranding Signed-off-by: Stanislav Bogatyrev --- .github/CODEOWNERS | 2 +- CHANGELOG.md | 7 ++++++- Makefile | 6 +++--- README.md | 32 +++++++++++++++----------------- VERSION | 2 +- debian/changelog | 5 ++--- debian/control | 18 +++++++++--------- debian/copyright | 7 ++++--- debian/frostfs-locode-db.install | 1 + debian/neofs-locode-db.install | 1 - 10 files changed, 42 insertions(+), 39 deletions(-) create mode 100644 debian/frostfs-locode-db.install delete mode 100644 debian/neofs-locode-db.install diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f076210..29c4211 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @alexvanin @carpawell @fyrchik @cthulhu-rider @realloc +* @alexvanin @realloc @fyrchik @anatoly-bogatyrev diff --git a/CHANGELOG.md b/CHANGELOG.md index 3456c52..dba576f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog -Changelog for NeoFS LOCODE database +Changelog for FrostFS LOCODE database + +## 0.3.1 - 2022-12-22 + +### Changed +- Rebranding to FrostFS ## 0.3.0 - 2022-10-28 diff --git a/Makefile b/Makefile index a86cf2d..014742a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f VERSION ?= "$(shell git describe --tags --match "v*" --dirty --always --abbrev=8 2>/dev/null || cat VERSION 2>/dev/null || echo "develop")" -NEOFSCLI ?= neofs-cli +FROST ?= frost .PHONY: all clean version help unlocode debpackage @@ -35,7 +35,7 @@ unlocode: unzip -u tmp/loc221csv.zip -d in/ locode_db: unlocode in/continents.geojson in/airports.dat in/countries.dat - $(NEOFSCLI) util locode generate \ + $(FROST) util locode generate \ --airports in/airports.dat \ --continents in/continents.geojson \ --countries in/countries.dat \ @@ -66,7 +66,7 @@ clean: # Package for Debian debpackage: - dch --package neofs-locode-db \ + dch --package frostfs-locode-db \ --controlmaint \ --newversion $(PKG_VERSION) \ --force-bad-version \ diff --git a/README.md b/README.md index 60ae31b..c86c08b 100644 --- a/README.md +++ b/README.md @@ -2,27 +2,25 @@ NeoFS

- UN/LOCODE database for NeoFS + UN/LOCODE database for ForstFS

--- -![GitHub release](https://img.shields.io/github/release/nspcc-dev/neofs-locode-db.svg) -![GitHub license](https://img.shields.io/github/license/nspcc-dev/neofs-locode-db.svg?style=popout) +![GitHub release](https://img.shields.io/github/release/TrueCloudLab/frostfs-locode-db.svg) +![GitHub license](https://img.shields.io/github/license/TrueCloudLab/frostfs-locode-db.svg?style=popout) # Overview -This repository contains instructions to generate UN/LOCODE database for NeoFS -and raw representation of it. NeoFS uses UN/LOCODE in storage node attributes +This repository contains instructions to generate UN/LOCODE database for FrostFS +and raw representation of it. FrostFS uses UN/LOCODE in storage node attributes and storage policies. Inner ring nodes converts UN/LOCODE into human-readable -set of attributes such as continent, country name, etc. You can find out -more in [NeoFS Specification](https://github.com/nspcc-dev/neofs-spec). - +set of attributes such as continent, country name, etc. # Build ## Prerequisites -- Latest [neofs-cli](https://github.com/nspcc-dev/neofs-node) +- Latest [frost] tool(https://github.com/TrueCloudLab/frostfs-node) - [UN/LOCODE](https://unece.org/trade/cefact/UNLOCODE-Download) database in CSV format - [OpenFlight Airports](https://raw.githubusercontent.com/jpatokal/openflights/master/data/airports.dat) @@ -32,7 +30,7 @@ more in [NeoFS Specification](https://github.com/nspcc-dev/neofs-spec). ## Quick start -Just run `make` to generate `locode_db` file for use with NeoFS InnerRing nodes. +Just run `make` to generate `locode_db` file for use with FrostFS InnerRing nodes. ``` shell $ make @@ -47,13 +45,13 @@ First unzip file with GeoJSON continents from this repository. $ gunzip continents.geojson ``` -Then run neofs-cli command to generate boltDB file. +Then run frost command to generate boltDB file. ``` -$ neofs-cli util locode generate --help -generate UN/LOCODE database for NeoFS +$ frost util locode generate --help +generate UN/LOCODE database for FrostFS Usage: - neofs-cli util locode generate [flags] + frost util locode generate [flags] Flags: --airports string Path to OpenFlights airport database (csv) @@ -64,7 +62,7 @@ Flags: --out string Target path for generated database --subdiv string Path to UN/LOCODE subdivision database (csv) -$ ./neofs-cli util locode generate \ +$ ./frost util locode generate \ --airports airports.dat \ --continents continents.geojson \ --countries countries.dat \ @@ -75,9 +73,9 @@ $ ./neofs-cli util locode generate \ **Database generation might take some time!** -You can test generated database with neofs-cli. +You can test generated database with `frost`. ``` -$ neofs-cli util locode info --db locode_db --locode 'RU LED' +$ frost util locode info --db locode_db --locode 'RU LED' Country: Russia Location: Saint Petersburg (ex Leningrad) Continent: Europe diff --git a/VERSION b/VERSION index 268b033..937cd78 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.3.0 +v0.3.1 diff --git a/debian/changelog b/debian/changelog index c2f9d09..7192079 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -neofs-locode-db (0.3.0) stable; urgency=medium +frostfs-locode-db (0.3.0) stable; urgency=medium * Initial change. - -- NeoSPCC Wed, 19 Oct 2022 12:33:04 +0300 - + -- TrueCloudLab Wed, 19 Oct 2022 12:33:04 +0300 diff --git a/debian/control b/debian/control index 7875bd5..fa5057a 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,17 @@ -Source: neofs-locode-db +Source: frostfs-locode-db Section: misc Priority: optional -Maintainer: NeoSPCC -Build-Depends: debhelper-compat (= 13), git, devscripts, wget, neofs-cli +Maintainer: NeoSPCC +Build-Depends: debhelper-compat (= 13), git, devscripts, wget, frost Standards-Version: 4.5.1 -Homepage: https://fs.neo.org/ -Vcs-Git: https://github.com/nspcc-dev/neofs-locode-db.git -Vcs-Browser: https://github.com/nspcc-dev/neofs-locode-db +Homepage: https://frostfs.info/ +Vcs-Git: https://github.com/TrueCloudLab/frostfs-locode-db.git +Vcs-Browser: https://github.com/TrueCloudLab/frostfs-locode-db -Package: neofs-locode-db +Package: frostfs-locode-db Architecture: any Depends: ${misc:Depends} -Description: Compiled UN/LOCODE database for NeoFS - NeoFS uses UN/LOCODE in storage node attributes and storage policies. +Description: Compiled UN/LOCODE database for FrostFS + Frostfs uses UN/LOCODE in storage node attributes and storage policies. Inner ring nodes converts UN/LOCODE into human-readable set of attributes such as continent, country name, etc. diff --git a/debian/copyright b/debian/copyright index a2dffe6..e222a23 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,10 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: neofs-locode-db -Upstream-Contact: tech@nspcc.ru -Source: https://github.com/nspcc-dev/neofs-locode-db +Upstream-Name: frostfs-locode-db +Upstream-Contact: tech@frostfs.info +Source: https://github.com/TrueCloudLab/frostfs-locode-db Files: * +Copyright: 2022 TrueCloudLab (@TrueCloudLab) Copyright: 2018-2022 NeoSPCC (@nspcc-dev) License: CC-BY-SA-4.0 diff --git a/debian/frostfs-locode-db.install b/debian/frostfs-locode-db.install new file mode 100644 index 0000000..0146177 --- /dev/null +++ b/debian/frostfs-locode-db.install @@ -0,0 +1 @@ +locode_db var/lib/frostfs/ir diff --git a/debian/neofs-locode-db.install b/debian/neofs-locode-db.install deleted file mode 100644 index 9b15438..0000000 --- a/debian/neofs-locode-db.install +++ /dev/null @@ -1 +0,0 @@ -locode_db var/lib/neofs/ir