From 2a4f8488cd7b2dee95b6cc44480a0b72911f50e3 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 2 Jul 2021 13:55:25 +0000 Subject: [PATCH] Remove setup.cfg from git, to avoid merges over-writing any per-env changes The hope is this can be used to easily switch between live, beta and dev for setup.py without worrying that a git merge will suddenly turn beta into dev, or live into beta or dev. --- .gitignore | 4 ++++ setup.cfg | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 setup.cfg diff --git a/.gitignore b/.gitignore index 08c8a19..c3ce6ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# Hoping this can be a per environment config, so needs to not be merged +# by git, so not *in* git. +setup.cfg + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index a35e2cd..0000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[egg_info] -tag_build = .dev \ No newline at end of file