From 8345675b89aa6ccc435a7a5e6f28ef8e0bcfb164 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 14 Mar 2022 16:05:09 +0000 Subject: [PATCH] All change yet again: We're now building and installing a wheel, not an egg --- setup.py | 12 ++++++++---- src/Gateway.py | 2 +- src/{ => eddn}/schemas/README-EDDN-schemas.md | 0 .../schemas/TEMPLATES/journalevent-README.md | 0 .../schemas/TEMPLATES/journalevent-v1.0.json | 0 src/{ => eddn}/schemas/approachsettlement-README.md | 0 src/{ => eddn}/schemas/approachsettlement-v1.0.json | 0 src/{ => eddn}/schemas/blackmarket-README.md | 0 src/{ => eddn}/schemas/blackmarket-v1.0.json | 0 src/{ => eddn}/schemas/codexentry-README.md | 0 src/{ => eddn}/schemas/codexentry-v1.0.json | 0 src/{ => eddn}/schemas/commodity-README.md | 0 src/{ => eddn}/schemas/commodity-v3.0.json | 0 src/{ => eddn}/schemas/fssallbodiesfound-README.md | 0 src/{ => eddn}/schemas/fssallbodiesfound-v1.0.json | 0 src/{ => eddn}/schemas/fssdiscoveryscan-README.md | 0 src/{ => eddn}/schemas/fssdiscoveryscan-v1.0.json | 0 src/{ => eddn}/schemas/journal-README.md | 0 src/{ => eddn}/schemas/journal-v1.0.json | 0 src/{ => eddn}/schemas/navbeaconscan-README.md | 0 src/{ => eddn}/schemas/navbeaconscan-v1.0.json | 0 src/{ => eddn}/schemas/navroute-README.md | 0 src/{ => eddn}/schemas/navroute-v1.0.json | 0 src/{ => eddn}/schemas/outfitting-README.md | 0 src/{ => eddn}/schemas/outfitting-v2.0.json | 0 src/{ => eddn}/schemas/scanbarycentre-README.md | 0 src/{ => eddn}/schemas/scanbarycentre-v1.0.json | 0 src/{ => eddn}/schemas/shipyard-README.md | 0 src/{ => eddn}/schemas/shipyard-v2.0.json | 0 29 files changed, 9 insertions(+), 5 deletions(-) rename src/{ => eddn}/schemas/README-EDDN-schemas.md (100%) rename src/{ => eddn}/schemas/TEMPLATES/journalevent-README.md (100%) rename src/{ => eddn}/schemas/TEMPLATES/journalevent-v1.0.json (100%) rename src/{ => eddn}/schemas/approachsettlement-README.md (100%) rename src/{ => eddn}/schemas/approachsettlement-v1.0.json (100%) rename src/{ => eddn}/schemas/blackmarket-README.md (100%) rename src/{ => eddn}/schemas/blackmarket-v1.0.json (100%) rename src/{ => eddn}/schemas/codexentry-README.md (100%) rename src/{ => eddn}/schemas/codexentry-v1.0.json (100%) rename src/{ => eddn}/schemas/commodity-README.md (100%) rename src/{ => eddn}/schemas/commodity-v3.0.json (100%) rename src/{ => eddn}/schemas/fssallbodiesfound-README.md (100%) rename src/{ => eddn}/schemas/fssallbodiesfound-v1.0.json (100%) rename src/{ => eddn}/schemas/fssdiscoveryscan-README.md (100%) rename src/{ => eddn}/schemas/fssdiscoveryscan-v1.0.json (100%) rename src/{ => eddn}/schemas/journal-README.md (100%) rename src/{ => eddn}/schemas/journal-v1.0.json (100%) rename src/{ => eddn}/schemas/navbeaconscan-README.md (100%) rename src/{ => eddn}/schemas/navbeaconscan-v1.0.json (100%) rename src/{ => eddn}/schemas/navroute-README.md (100%) rename src/{ => eddn}/schemas/navroute-v1.0.json (100%) rename src/{ => eddn}/schemas/outfitting-README.md (100%) rename src/{ => eddn}/schemas/outfitting-v2.0.json (100%) rename src/{ => eddn}/schemas/scanbarycentre-README.md (100%) rename src/{ => eddn}/schemas/scanbarycentre-v1.0.json (100%) rename src/{ => eddn}/schemas/shipyard-README.md (100%) rename src/{ => eddn}/schemas/shipyard-v2.0.json (100%) diff --git a/setup.py b/setup.py index 1e8d9eb..445444b 100644 --- a/setup.py +++ b/setup.py @@ -80,13 +80,17 @@ setup( author="EDCD (https://edcd.github.io/)", author_email="edcd@miggy.org", url="https://github.com/EDCD/EDDN", - packages=find_packages("src"), - package_dir={"": "src"}, + # py_modules=["Gateway", "Monitor", "Relay", "Bouncer"], + packages=find_packages("src"), + package_dir={"": "src"}, + # Should mean it picks up src/eddn/schemas/ files + include_package_data=True, + # This includes them for the running code, but that doesn't help # serve them up for reference. - data_files=[("schemas", glob.glob("src/schemas/*.json"))], + # data_files=[("schemas": glob.glob("src/schemas/*.json"))], install_requires=[ "argparse", "bottle", @@ -220,7 +224,7 @@ except OSError: pass shutil.copytree( - "src/schemas", + "src/eddn/schemas", SHARE_EDDN_FILES / "schemas", copy_function=shutil.copyfile, # type: ignore ) diff --git a/src/Gateway.py b/src/Gateway.py index 8359b62..0319f3b 100644 --- a/src/Gateway.py +++ b/src/Gateway.py @@ -118,7 +118,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("Gateway", schema_file)) + validator.add_schema_resource(schema_ref, resource_string("eddn", schema_file)) def push_message(parsed_message: Dict, topic: str) -> None: diff --git a/src/schemas/README-EDDN-schemas.md b/src/eddn/schemas/README-EDDN-schemas.md similarity index 100% rename from src/schemas/README-EDDN-schemas.md rename to src/eddn/schemas/README-EDDN-schemas.md diff --git a/src/schemas/TEMPLATES/journalevent-README.md b/src/eddn/schemas/TEMPLATES/journalevent-README.md similarity index 100% rename from src/schemas/TEMPLATES/journalevent-README.md rename to src/eddn/schemas/TEMPLATES/journalevent-README.md diff --git a/src/schemas/TEMPLATES/journalevent-v1.0.json b/src/eddn/schemas/TEMPLATES/journalevent-v1.0.json similarity index 100% rename from src/schemas/TEMPLATES/journalevent-v1.0.json rename to src/eddn/schemas/TEMPLATES/journalevent-v1.0.json diff --git a/src/schemas/approachsettlement-README.md b/src/eddn/schemas/approachsettlement-README.md similarity index 100% rename from src/schemas/approachsettlement-README.md rename to src/eddn/schemas/approachsettlement-README.md diff --git a/src/schemas/approachsettlement-v1.0.json b/src/eddn/schemas/approachsettlement-v1.0.json similarity index 100% rename from src/schemas/approachsettlement-v1.0.json rename to src/eddn/schemas/approachsettlement-v1.0.json diff --git a/src/schemas/blackmarket-README.md b/src/eddn/schemas/blackmarket-README.md similarity index 100% rename from src/schemas/blackmarket-README.md rename to src/eddn/schemas/blackmarket-README.md diff --git a/src/schemas/blackmarket-v1.0.json b/src/eddn/schemas/blackmarket-v1.0.json similarity index 100% rename from src/schemas/blackmarket-v1.0.json rename to src/eddn/schemas/blackmarket-v1.0.json diff --git a/src/schemas/codexentry-README.md b/src/eddn/schemas/codexentry-README.md similarity index 100% rename from src/schemas/codexentry-README.md rename to src/eddn/schemas/codexentry-README.md diff --git a/src/schemas/codexentry-v1.0.json b/src/eddn/schemas/codexentry-v1.0.json similarity index 100% rename from src/schemas/codexentry-v1.0.json rename to src/eddn/schemas/codexentry-v1.0.json diff --git a/src/schemas/commodity-README.md b/src/eddn/schemas/commodity-README.md similarity index 100% rename from src/schemas/commodity-README.md rename to src/eddn/schemas/commodity-README.md diff --git a/src/schemas/commodity-v3.0.json b/src/eddn/schemas/commodity-v3.0.json similarity index 100% rename from src/schemas/commodity-v3.0.json rename to src/eddn/schemas/commodity-v3.0.json diff --git a/src/schemas/fssallbodiesfound-README.md b/src/eddn/schemas/fssallbodiesfound-README.md similarity index 100% rename from src/schemas/fssallbodiesfound-README.md rename to src/eddn/schemas/fssallbodiesfound-README.md diff --git a/src/schemas/fssallbodiesfound-v1.0.json b/src/eddn/schemas/fssallbodiesfound-v1.0.json similarity index 100% rename from src/schemas/fssallbodiesfound-v1.0.json rename to src/eddn/schemas/fssallbodiesfound-v1.0.json diff --git a/src/schemas/fssdiscoveryscan-README.md b/src/eddn/schemas/fssdiscoveryscan-README.md similarity index 100% rename from src/schemas/fssdiscoveryscan-README.md rename to src/eddn/schemas/fssdiscoveryscan-README.md diff --git a/src/schemas/fssdiscoveryscan-v1.0.json b/src/eddn/schemas/fssdiscoveryscan-v1.0.json similarity index 100% rename from src/schemas/fssdiscoveryscan-v1.0.json rename to src/eddn/schemas/fssdiscoveryscan-v1.0.json diff --git a/src/schemas/journal-README.md b/src/eddn/schemas/journal-README.md similarity index 100% rename from src/schemas/journal-README.md rename to src/eddn/schemas/journal-README.md diff --git a/src/schemas/journal-v1.0.json b/src/eddn/schemas/journal-v1.0.json similarity index 100% rename from src/schemas/journal-v1.0.json rename to src/eddn/schemas/journal-v1.0.json diff --git a/src/schemas/navbeaconscan-README.md b/src/eddn/schemas/navbeaconscan-README.md similarity index 100% rename from src/schemas/navbeaconscan-README.md rename to src/eddn/schemas/navbeaconscan-README.md diff --git a/src/schemas/navbeaconscan-v1.0.json b/src/eddn/schemas/navbeaconscan-v1.0.json similarity index 100% rename from src/schemas/navbeaconscan-v1.0.json rename to src/eddn/schemas/navbeaconscan-v1.0.json diff --git a/src/schemas/navroute-README.md b/src/eddn/schemas/navroute-README.md similarity index 100% rename from src/schemas/navroute-README.md rename to src/eddn/schemas/navroute-README.md diff --git a/src/schemas/navroute-v1.0.json b/src/eddn/schemas/navroute-v1.0.json similarity index 100% rename from src/schemas/navroute-v1.0.json rename to src/eddn/schemas/navroute-v1.0.json diff --git a/src/schemas/outfitting-README.md b/src/eddn/schemas/outfitting-README.md similarity index 100% rename from src/schemas/outfitting-README.md rename to src/eddn/schemas/outfitting-README.md diff --git a/src/schemas/outfitting-v2.0.json b/src/eddn/schemas/outfitting-v2.0.json similarity index 100% rename from src/schemas/outfitting-v2.0.json rename to src/eddn/schemas/outfitting-v2.0.json diff --git a/src/schemas/scanbarycentre-README.md b/src/eddn/schemas/scanbarycentre-README.md similarity index 100% rename from src/schemas/scanbarycentre-README.md rename to src/eddn/schemas/scanbarycentre-README.md diff --git a/src/schemas/scanbarycentre-v1.0.json b/src/eddn/schemas/scanbarycentre-v1.0.json similarity index 100% rename from src/schemas/scanbarycentre-v1.0.json rename to src/eddn/schemas/scanbarycentre-v1.0.json diff --git a/src/schemas/shipyard-README.md b/src/eddn/schemas/shipyard-README.md similarity index 100% rename from src/schemas/shipyard-README.md rename to src/eddn/schemas/shipyard-README.md diff --git a/src/schemas/shipyard-v2.0.json b/src/eddn/schemas/shipyard-v2.0.json similarity index 100% rename from src/schemas/shipyard-v2.0.json rename to src/eddn/schemas/shipyard-v2.0.json