From 9a1cc7b141c200af2965383c58c7e436e258ff92 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 14 Mar 2022 14:51:11 +0000 Subject: [PATCH] Finally got the correct setup.py configuration for source of egg running * py_modules parameter to setup() isn't documented in the setuptools docs, but is in a general 'python packaging' one. * So now the main scripts are NOT within the `eddn` package.. * But all other code is... * But the schema files don't need to be. --- setup.py | 16 +++++++++------- src/{eddn => }/Bouncer.py | 0 src/{eddn => }/Gateway.py | 10 +++++----- src/{eddn => }/Monitor.py | 0 src/{eddn => }/Relay.py | 0 src/eddn/conf/Settings.py | 2 +- src/{eddn => }/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 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 .../schemas/fssallbodiesfound-README.md | 0 .../schemas/fssallbodiesfound-v1.0.json | 0 .../schemas/fssdiscoveryscan-README.md | 0 .../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 33 files changed, 15 insertions(+), 13 deletions(-) rename src/{eddn => }/Bouncer.py (100%) rename src/{eddn => }/Gateway.py (98%) rename src/{eddn => }/Monitor.py (100%) rename src/{eddn => }/Relay.py (100%) 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 cb6488f..a8c8601 100644 --- a/setup.py +++ b/setup.py @@ -80,11 +80,13 @@ setup( author="EDCD (https://edcd.github.io/)", author_email="edcd@miggy.org", url="https://github.com/EDCD/EDDN", - packages=find_packages("src", exclude=["*.tests"]), + packages=find_packages("src"), package_dir={"": "src"}, + # + py_modules=["Gateway", "Monitor", "Relay", "Bouncer"], # This includes them for the running code, but that doesn't help # serve them up for reference. - data_files=[("eddn/schemas", glob.glob("src/eddn/schemas/*.json"))], + data_files=[("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 +101,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 +222,7 @@ except OSError: pass shutil.copytree( - "src/eddn/schemas", + "src/schemas", SHARE_EDDN_FILES / "schemas", copy_function=shutil.copyfile, # type: ignore ) diff --git a/src/eddn/Bouncer.py b/src/Bouncer.py similarity index 100% rename from src/eddn/Bouncer.py rename to src/Bouncer.py diff --git a/src/eddn/Gateway.py b/src/Gateway.py similarity index 98% rename from src/eddn/Gateway.py rename to src/Gateway.py index 91acc79..8359b62 100644 --- a/src/eddn/Gateway.py +++ b/src/Gateway.py @@ -20,9 +20,9 @@ from gevent import monkey from pkg_resources import resource_string from zmq import PUB as ZMQ_PUB -from conf.Settings import Settings, load_config -from core.Validator import ValidationSeverity, Validator -from core.logger import logger +from eddn.conf.Settings import Settings, load_config +from eddn.core.Validator import ValidationSeverity, Validator +from eddn.core.logger import logger monkey.patch_all() import bottle # noqa: E402 @@ -40,8 +40,8 @@ sender = zmq_context.socket(ZMQ_PUB) validator = Validator() # This import must be done post-monkey-patching! -from core.StatsCollector import StatsCollector # noqa: E402 -from core.EDDNWSGIHandler import EDDNWSGIHandler +from eddn.core.StatsCollector import StatsCollector # noqa: E402 +from eddn.core.EDDNWSGIHandler import EDDNWSGIHandler stats_collector = StatsCollector() stats_collector.start() 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/src/eddn/conf/Settings.py b/src/eddn/conf/Settings.py index 31b0f3c..48c02d2 100644 --- a/src/eddn/conf/Settings.py +++ b/src/eddn/conf/Settings.py @@ -5,7 +5,7 @@ from typing import Dict import simplejson -from conf.Version import __version__ as version +from eddn.conf.Version import __version__ as version class _Settings(object): diff --git a/src/eddn/schemas/README-EDDN-schemas.md b/src/schemas/README-EDDN-schemas.md similarity index 100% rename from src/eddn/schemas/README-EDDN-schemas.md rename to src/schemas/README-EDDN-schemas.md diff --git a/src/eddn/schemas/TEMPLATES/journalevent-README.md b/src/schemas/TEMPLATES/journalevent-README.md similarity index 100% rename from src/eddn/schemas/TEMPLATES/journalevent-README.md rename to src/schemas/TEMPLATES/journalevent-README.md diff --git a/src/eddn/schemas/TEMPLATES/journalevent-v1.0.json b/src/schemas/TEMPLATES/journalevent-v1.0.json similarity index 100% rename from src/eddn/schemas/TEMPLATES/journalevent-v1.0.json rename to src/schemas/TEMPLATES/journalevent-v1.0.json diff --git a/src/eddn/schemas/approachsettlement-README.md b/src/schemas/approachsettlement-README.md similarity index 100% rename from src/eddn/schemas/approachsettlement-README.md rename to src/schemas/approachsettlement-README.md diff --git a/src/eddn/schemas/approachsettlement-v1.0.json b/src/schemas/approachsettlement-v1.0.json similarity index 100% rename from src/eddn/schemas/approachsettlement-v1.0.json rename to src/schemas/approachsettlement-v1.0.json diff --git a/src/eddn/schemas/blackmarket-README.md b/src/schemas/blackmarket-README.md similarity index 100% rename from src/eddn/schemas/blackmarket-README.md rename to src/schemas/blackmarket-README.md diff --git a/src/eddn/schemas/blackmarket-v1.0.json b/src/schemas/blackmarket-v1.0.json similarity index 100% rename from src/eddn/schemas/blackmarket-v1.0.json rename to src/schemas/blackmarket-v1.0.json diff --git a/src/eddn/schemas/codexentry-README.md b/src/schemas/codexentry-README.md similarity index 100% rename from src/eddn/schemas/codexentry-README.md rename to src/schemas/codexentry-README.md diff --git a/src/eddn/schemas/codexentry-v1.0.json b/src/schemas/codexentry-v1.0.json similarity index 100% rename from src/eddn/schemas/codexentry-v1.0.json rename to src/schemas/codexentry-v1.0.json diff --git a/src/eddn/schemas/commodity-README.md b/src/schemas/commodity-README.md similarity index 100% rename from src/eddn/schemas/commodity-README.md rename to src/schemas/commodity-README.md diff --git a/src/eddn/schemas/commodity-v3.0.json b/src/schemas/commodity-v3.0.json similarity index 100% rename from src/eddn/schemas/commodity-v3.0.json rename to src/schemas/commodity-v3.0.json diff --git a/src/eddn/schemas/fssallbodiesfound-README.md b/src/schemas/fssallbodiesfound-README.md similarity index 100% rename from src/eddn/schemas/fssallbodiesfound-README.md rename to src/schemas/fssallbodiesfound-README.md diff --git a/src/eddn/schemas/fssallbodiesfound-v1.0.json b/src/schemas/fssallbodiesfound-v1.0.json similarity index 100% rename from src/eddn/schemas/fssallbodiesfound-v1.0.json rename to src/schemas/fssallbodiesfound-v1.0.json diff --git a/src/eddn/schemas/fssdiscoveryscan-README.md b/src/schemas/fssdiscoveryscan-README.md similarity index 100% rename from src/eddn/schemas/fssdiscoveryscan-README.md rename to src/schemas/fssdiscoveryscan-README.md diff --git a/src/eddn/schemas/fssdiscoveryscan-v1.0.json b/src/schemas/fssdiscoveryscan-v1.0.json similarity index 100% rename from src/eddn/schemas/fssdiscoveryscan-v1.0.json rename to src/schemas/fssdiscoveryscan-v1.0.json diff --git a/src/eddn/schemas/journal-README.md b/src/schemas/journal-README.md similarity index 100% rename from src/eddn/schemas/journal-README.md rename to src/schemas/journal-README.md diff --git a/src/eddn/schemas/journal-v1.0.json b/src/schemas/journal-v1.0.json similarity index 100% rename from src/eddn/schemas/journal-v1.0.json rename to src/schemas/journal-v1.0.json diff --git a/src/eddn/schemas/navbeaconscan-README.md b/src/schemas/navbeaconscan-README.md similarity index 100% rename from src/eddn/schemas/navbeaconscan-README.md rename to src/schemas/navbeaconscan-README.md diff --git a/src/eddn/schemas/navbeaconscan-v1.0.json b/src/schemas/navbeaconscan-v1.0.json similarity index 100% rename from src/eddn/schemas/navbeaconscan-v1.0.json rename to src/schemas/navbeaconscan-v1.0.json diff --git a/src/eddn/schemas/navroute-README.md b/src/schemas/navroute-README.md similarity index 100% rename from src/eddn/schemas/navroute-README.md rename to src/schemas/navroute-README.md diff --git a/src/eddn/schemas/navroute-v1.0.json b/src/schemas/navroute-v1.0.json similarity index 100% rename from src/eddn/schemas/navroute-v1.0.json rename to src/schemas/navroute-v1.0.json diff --git a/src/eddn/schemas/outfitting-README.md b/src/schemas/outfitting-README.md similarity index 100% rename from src/eddn/schemas/outfitting-README.md rename to src/schemas/outfitting-README.md diff --git a/src/eddn/schemas/outfitting-v2.0.json b/src/schemas/outfitting-v2.0.json similarity index 100% rename from src/eddn/schemas/outfitting-v2.0.json rename to src/schemas/outfitting-v2.0.json diff --git a/src/eddn/schemas/scanbarycentre-README.md b/src/schemas/scanbarycentre-README.md similarity index 100% rename from src/eddn/schemas/scanbarycentre-README.md rename to src/schemas/scanbarycentre-README.md diff --git a/src/eddn/schemas/scanbarycentre-v1.0.json b/src/schemas/scanbarycentre-v1.0.json similarity index 100% rename from src/eddn/schemas/scanbarycentre-v1.0.json rename to src/schemas/scanbarycentre-v1.0.json diff --git a/src/eddn/schemas/shipyard-README.md b/src/schemas/shipyard-README.md similarity index 100% rename from src/eddn/schemas/shipyard-README.md rename to src/schemas/shipyard-README.md diff --git a/src/eddn/schemas/shipyard-v2.0.json b/src/schemas/shipyard-v2.0.json similarity index 100% rename from src/eddn/schemas/shipyard-v2.0.json rename to src/schemas/shipyard-v2.0.json