From 18047995070cfb1a7e92355a214be742049fb54a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 2 Jul 2021 14:12:43 +0000 Subject: [PATCH] setup: Use setup_env.py for per-environment settings --- .gitignore | 4 ++-- setup.py | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c3ce6ef..9bff30b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -# Hoping this can be a per environment config, so needs to not be merged -# by git, so not *in* git. +# These need to be per-environment, so not changed by git merges. setup.cfg +setup_env.py # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/setup.py b/setup.py index c651055..127c984 100644 --- a/setup.py +++ b/setup.py @@ -17,11 +17,13 @@ except EnvironmentError: print "unable to find version in %s" % (VERSIONFILE,) raise RuntimeError("if %s exists, it is required to be well-formed" % (VERSIONFILE,)) -EDDN_ENV="dev" +# Read environment-specific settings +import setup_env + # Location of start-eddn-service script and its config file START_SCRIPT_BIN='%s/.local/bin' % ( os.environ['HOME'] ) # Location of web files -SHARE_EDDN_FILES='%s/.local/share/eddn/%s' % ( os.environ['HOME'], EDDN_ENV ) +SHARE_EDDN_FILES='%s/.local/share/eddn/%s' % ( os.environ['HOME'], setup_env.EDDN_ENV ) setup( name='eddn', @@ -96,12 +98,12 @@ if not os.path.isdir(START_SCRIPT_BIN): os.chdir(old_cwd) shutil.copy( - 'contrib/systemd/eddn_%s_config' % ( EDDN_ENV), - '%s/eddn_%s_config' % ( START_SCRIPT_BIN, EDDN_ENV ) + 'contrib/systemd/eddn_%s_config' % ( setup_env.EDDN_ENV), + '%s/eddn_%s_config' % ( START_SCRIPT_BIN, setup_env.EDDN_ENV ) ) shutil.copy( 'contrib/systemd/start-eddn-service', - '%s/start-eddn-%s-service' % ( START_SCRIPT_BIN, EDDN_ENV ) + '%s/start-eddn-%s-service' % ( START_SCRIPT_BIN, setup_env.EDDN_ENV ) ) # Ensure the latest monitor files are in place