From c402617760e59d77969d41a47fdb7a76473596b4 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 14 Mar 2022 13:12:58 +0000 Subject: [PATCH] Initial re-arrangement of files * Move the service scripts out of src/eddn/ into src/ * Move the schemas/ to src/schemas/ * Some updates to setup.py, i.e. source of files, but the setuptools part isn't yet work. --- setup.py | 12 ++++++------ src/{eddn => }/Gateway.py | 2 +- src/{eddn => }/Monitor.py | 0 src/{eddn => }/Relay.py | 0 {schemas => src/schemas}/README-EDDN-schemas.md | 0 .../schemas}/TEMPLATES/journalevent-README.md | 0 .../schemas}/TEMPLATES/journalevent-v1.0.json | 0 .../schemas}/approachsettlement-README.md | 0 .../schemas}/approachsettlement-v1.0.json | 0 {schemas => src/schemas}/blackmarket-README.md | 0 {schemas => src/schemas}/blackmarket-v1.0.json | 0 {schemas => src/schemas}/codexentry-README.md | 0 {schemas => src/schemas}/codexentry-v1.0.json | 0 {schemas => src/schemas}/commodity-README.md | 0 {schemas => src/schemas}/commodity-v3.0.json | 0 {schemas => src/schemas}/fssallbodiesfound-README.md | 0 {schemas => src/schemas}/fssallbodiesfound-v1.0.json | 0 {schemas => src/schemas}/fssdiscoveryscan-README.md | 0 {schemas => src/schemas}/fssdiscoveryscan-v1.0.json | 0 {schemas => src/schemas}/journal-README.md | 0 {schemas => src/schemas}/journal-v1.0.json | 0 {schemas => src/schemas}/navbeaconscan-README.md | 0 {schemas => src/schemas}/navbeaconscan-v1.0.json | 0 {schemas => src/schemas}/navroute-README.md | 0 {schemas => src/schemas}/navroute-v1.0.json | 0 {schemas => src/schemas}/outfitting-README.md | 0 {schemas => src/schemas}/outfitting-v2.0.json | 0 {schemas => src/schemas}/scanbarycentre-README.md | 0 {schemas => src/schemas}/scanbarycentre-v1.0.json | 0 {schemas => src/schemas}/shipyard-README.md | 0 {schemas => src/schemas}/shipyard-v2.0.json | 0 31 files changed, 7 insertions(+), 7 deletions(-) rename src/{eddn => }/Gateway.py (99%) rename src/{eddn => }/Monitor.py (100%) rename src/{eddn => }/Relay.py (100%) rename {schemas => src/schemas}/README-EDDN-schemas.md (100%) rename {schemas => src/schemas}/TEMPLATES/journalevent-README.md (100%) rename {schemas => src/schemas}/TEMPLATES/journalevent-v1.0.json (100%) rename {schemas => src/schemas}/approachsettlement-README.md (100%) rename {schemas => src/schemas}/approachsettlement-v1.0.json (100%) rename {schemas => src/schemas}/blackmarket-README.md (100%) rename {schemas => src/schemas}/blackmarket-v1.0.json (100%) rename {schemas => src/schemas}/codexentry-README.md (100%) rename {schemas => src/schemas}/codexentry-v1.0.json (100%) rename {schemas => src/schemas}/commodity-README.md (100%) rename {schemas => src/schemas}/commodity-v3.0.json (100%) rename {schemas => src/schemas}/fssallbodiesfound-README.md (100%) rename {schemas => src/schemas}/fssallbodiesfound-v1.0.json (100%) rename {schemas => src/schemas}/fssdiscoveryscan-README.md (100%) rename {schemas => src/schemas}/fssdiscoveryscan-v1.0.json (100%) rename {schemas => src/schemas}/journal-README.md (100%) rename {schemas => src/schemas}/journal-v1.0.json (100%) rename {schemas => src/schemas}/navbeaconscan-README.md (100%) rename {schemas => src/schemas}/navbeaconscan-v1.0.json (100%) rename {schemas => src/schemas}/navroute-README.md (100%) rename {schemas => src/schemas}/navroute-v1.0.json (100%) rename {schemas => src/schemas}/outfitting-README.md (100%) rename {schemas => src/schemas}/outfitting-v2.0.json (100%) rename {schemas => src/schemas}/scanbarycentre-README.md (100%) rename {schemas => src/schemas}/scanbarycentre-v1.0.json (100%) rename {schemas => src/schemas}/shipyard-README.md (100%) rename {schemas => src/schemas}/shipyard-v2.0.json (100%) diff --git a/setup.py b/setup.py index f757122..65379a1 100644 --- a/setup.py +++ b/setup.py @@ -84,7 +84,7 @@ setup( package_dir={"": "src"}, # This includes them for the running code, but that doesn't help # serve them up for reference. - data_files=[("eddn/schemas", glob.glob("schemas/*.json"))], + data_files=[("eddn/src/schemas", glob.glob("src/schemas/*.json"))], # Yes, we pin versions. With python2.7 the latest pyzmq will NOT # work, for instance. install_requires=[ @@ -99,10 +99,10 @@ setup( ], entry_points={ "console_scripts": [ - "eddn-gateway = eddn.Gateway:main", - "eddn-relay = eddn.Relay:main", - "eddn-monitor = eddn.Monitor:main", - "eddn-bouncer = eddn.Bouncer:main", + "eddn-gateway = Gateway:main", + "eddn-relay = Relay:main", + "eddn-monitor = Monitor:main", + "eddn-bouncer = Bouncer:main", ], }, ) @@ -220,7 +220,7 @@ except OSError: pass shutil.copytree( - "schemas", + "src/schemas", SHARE_EDDN_FILES / "schemas", copy_function=shutil.copyfile, # type: ignore ) diff --git a/src/eddn/Gateway.py b/src/Gateway.py similarity index 99% rename from src/eddn/Gateway.py rename to src/Gateway.py index a644119..03ef34d 100644 --- a/src/eddn/Gateway.py +++ b/src/Gateway.py @@ -127,7 +127,7 @@ def configure() -> None: sender.bind(binding) for schema_ref, schema_file in Settings.GATEWAY_JSON_SCHEMAS.items(): - validator.add_schema_resource(schema_ref, resource_string("eddn.Gateway", schema_file)) + validator.add_schema_resource(schema_ref, resource_string("Gateway", schema_file)) def push_message(parsed_message: Dict, topic: str) -> None: diff --git a/src/eddn/Monitor.py b/src/Monitor.py similarity index 100% rename from src/eddn/Monitor.py rename to src/Monitor.py diff --git a/src/eddn/Relay.py b/src/Relay.py similarity index 100% rename from src/eddn/Relay.py rename to src/Relay.py diff --git a/schemas/README-EDDN-schemas.md b/src/schemas/README-EDDN-schemas.md similarity index 100% rename from schemas/README-EDDN-schemas.md rename to src/schemas/README-EDDN-schemas.md diff --git a/schemas/TEMPLATES/journalevent-README.md b/src/schemas/TEMPLATES/journalevent-README.md similarity index 100% rename from schemas/TEMPLATES/journalevent-README.md rename to src/schemas/TEMPLATES/journalevent-README.md diff --git a/schemas/TEMPLATES/journalevent-v1.0.json b/src/schemas/TEMPLATES/journalevent-v1.0.json similarity index 100% rename from schemas/TEMPLATES/journalevent-v1.0.json rename to src/schemas/TEMPLATES/journalevent-v1.0.json diff --git a/schemas/approachsettlement-README.md b/src/schemas/approachsettlement-README.md similarity index 100% rename from schemas/approachsettlement-README.md rename to src/schemas/approachsettlement-README.md diff --git a/schemas/approachsettlement-v1.0.json b/src/schemas/approachsettlement-v1.0.json similarity index 100% rename from schemas/approachsettlement-v1.0.json rename to src/schemas/approachsettlement-v1.0.json diff --git a/schemas/blackmarket-README.md b/src/schemas/blackmarket-README.md similarity index 100% rename from schemas/blackmarket-README.md rename to src/schemas/blackmarket-README.md diff --git a/schemas/blackmarket-v1.0.json b/src/schemas/blackmarket-v1.0.json similarity index 100% rename from schemas/blackmarket-v1.0.json rename to src/schemas/blackmarket-v1.0.json diff --git a/schemas/codexentry-README.md b/src/schemas/codexentry-README.md similarity index 100% rename from schemas/codexentry-README.md rename to src/schemas/codexentry-README.md diff --git a/schemas/codexentry-v1.0.json b/src/schemas/codexentry-v1.0.json similarity index 100% rename from schemas/codexentry-v1.0.json rename to src/schemas/codexentry-v1.0.json diff --git a/schemas/commodity-README.md b/src/schemas/commodity-README.md similarity index 100% rename from schemas/commodity-README.md rename to src/schemas/commodity-README.md diff --git a/schemas/commodity-v3.0.json b/src/schemas/commodity-v3.0.json similarity index 100% rename from schemas/commodity-v3.0.json rename to src/schemas/commodity-v3.0.json diff --git a/schemas/fssallbodiesfound-README.md b/src/schemas/fssallbodiesfound-README.md similarity index 100% rename from schemas/fssallbodiesfound-README.md rename to src/schemas/fssallbodiesfound-README.md diff --git a/schemas/fssallbodiesfound-v1.0.json b/src/schemas/fssallbodiesfound-v1.0.json similarity index 100% rename from schemas/fssallbodiesfound-v1.0.json rename to src/schemas/fssallbodiesfound-v1.0.json diff --git a/schemas/fssdiscoveryscan-README.md b/src/schemas/fssdiscoveryscan-README.md similarity index 100% rename from schemas/fssdiscoveryscan-README.md rename to src/schemas/fssdiscoveryscan-README.md diff --git a/schemas/fssdiscoveryscan-v1.0.json b/src/schemas/fssdiscoveryscan-v1.0.json similarity index 100% rename from schemas/fssdiscoveryscan-v1.0.json rename to src/schemas/fssdiscoveryscan-v1.0.json diff --git a/schemas/journal-README.md b/src/schemas/journal-README.md similarity index 100% rename from schemas/journal-README.md rename to src/schemas/journal-README.md diff --git a/schemas/journal-v1.0.json b/src/schemas/journal-v1.0.json similarity index 100% rename from schemas/journal-v1.0.json rename to src/schemas/journal-v1.0.json diff --git a/schemas/navbeaconscan-README.md b/src/schemas/navbeaconscan-README.md similarity index 100% rename from schemas/navbeaconscan-README.md rename to src/schemas/navbeaconscan-README.md diff --git a/schemas/navbeaconscan-v1.0.json b/src/schemas/navbeaconscan-v1.0.json similarity index 100% rename from schemas/navbeaconscan-v1.0.json rename to src/schemas/navbeaconscan-v1.0.json diff --git a/schemas/navroute-README.md b/src/schemas/navroute-README.md similarity index 100% rename from schemas/navroute-README.md rename to src/schemas/navroute-README.md diff --git a/schemas/navroute-v1.0.json b/src/schemas/navroute-v1.0.json similarity index 100% rename from schemas/navroute-v1.0.json rename to src/schemas/navroute-v1.0.json diff --git a/schemas/outfitting-README.md b/src/schemas/outfitting-README.md similarity index 100% rename from schemas/outfitting-README.md rename to src/schemas/outfitting-README.md diff --git a/schemas/outfitting-v2.0.json b/src/schemas/outfitting-v2.0.json similarity index 100% rename from schemas/outfitting-v2.0.json rename to src/schemas/outfitting-v2.0.json diff --git a/schemas/scanbarycentre-README.md b/src/schemas/scanbarycentre-README.md similarity index 100% rename from schemas/scanbarycentre-README.md rename to src/schemas/scanbarycentre-README.md diff --git a/schemas/scanbarycentre-v1.0.json b/src/schemas/scanbarycentre-v1.0.json similarity index 100% rename from schemas/scanbarycentre-v1.0.json rename to src/schemas/scanbarycentre-v1.0.json diff --git a/schemas/shipyard-README.md b/src/schemas/shipyard-README.md similarity index 100% rename from schemas/shipyard-README.md rename to src/schemas/shipyard-README.md diff --git a/schemas/shipyard-v2.0.json b/src/schemas/shipyard-v2.0.json similarity index 100% rename from schemas/shipyard-v2.0.json rename to src/schemas/shipyard-v2.0.json