From f891a6ee003b094bf4fc570832f90190260d795b Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Sun, 21 Nov 2021 19:15:51 +0100
Subject: [PATCH] Move main source code into src subdirectory

This avoids certain problems related to the entire repo root appearing
on the import path, usually when running Python/pip from the repo root
or when using an editable install.
---
 setup.cfg                                       | 8 ++++----
 {rsrcfork => src/rsrcfork}/__init__.py          | 0
 {rsrcfork => src/rsrcfork}/__main__.py          | 0
 {rsrcfork => src/rsrcfork}/_io_utils.py         | 0
 {rsrcfork => src/rsrcfork}/api.py               | 0
 {rsrcfork => src/rsrcfork}/compress/__init__.py | 0
 {rsrcfork => src/rsrcfork}/compress/common.py   | 0
 {rsrcfork => src/rsrcfork}/compress/dcmp0.py    | 0
 {rsrcfork => src/rsrcfork}/compress/dcmp1.py    | 0
 {rsrcfork => src/rsrcfork}/compress/dcmp2.py    | 0
 {rsrcfork => src/rsrcfork}/py.typed             | 0
 11 files changed, 4 insertions(+), 4 deletions(-)
 rename {rsrcfork => src/rsrcfork}/__init__.py (100%)
 rename {rsrcfork => src/rsrcfork}/__main__.py (100%)
 rename {rsrcfork => src/rsrcfork}/_io_utils.py (100%)
 rename {rsrcfork => src/rsrcfork}/api.py (100%)
 rename {rsrcfork => src/rsrcfork}/compress/__init__.py (100%)
 rename {rsrcfork => src/rsrcfork}/compress/common.py (100%)
 rename {rsrcfork => src/rsrcfork}/compress/dcmp0.py (100%)
 rename {rsrcfork => src/rsrcfork}/compress/dcmp1.py (100%)
 rename {rsrcfork => src/rsrcfork}/compress/dcmp2.py (100%)
 rename {rsrcfork => src/rsrcfork}/py.typed (100%)

diff --git a/setup.cfg b/setup.cfg
index 7dd60e4..f7106eb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -43,15 +43,15 @@ keywords =
 zip_safe = False
 python_requires = >=3.6
 packages = find:
+package_dir =
+	= src
 
 [options.package_data]
 rsrcfork =
 	py.typed
 
 [options.packages.find]
-include =
-	rsrcfork
-	rsrcfork.*
+where = src
 
 [options.entry_points]
 console_scripts =
@@ -77,7 +77,7 @@ blank-lines-indent = always
 indent-tabs-def = 1
 
 [mypy]
-files=rsrcfork/**/*.py
+files=src/**/*.py
 python_version = 3.6
 
 disallow_untyped_calls = True
diff --git a/rsrcfork/__init__.py b/src/rsrcfork/__init__.py
similarity index 100%
rename from rsrcfork/__init__.py
rename to src/rsrcfork/__init__.py
diff --git a/rsrcfork/__main__.py b/src/rsrcfork/__main__.py
similarity index 100%
rename from rsrcfork/__main__.py
rename to src/rsrcfork/__main__.py
diff --git a/rsrcfork/_io_utils.py b/src/rsrcfork/_io_utils.py
similarity index 100%
rename from rsrcfork/_io_utils.py
rename to src/rsrcfork/_io_utils.py
diff --git a/rsrcfork/api.py b/src/rsrcfork/api.py
similarity index 100%
rename from rsrcfork/api.py
rename to src/rsrcfork/api.py
diff --git a/rsrcfork/compress/__init__.py b/src/rsrcfork/compress/__init__.py
similarity index 100%
rename from rsrcfork/compress/__init__.py
rename to src/rsrcfork/compress/__init__.py
diff --git a/rsrcfork/compress/common.py b/src/rsrcfork/compress/common.py
similarity index 100%
rename from rsrcfork/compress/common.py
rename to src/rsrcfork/compress/common.py
diff --git a/rsrcfork/compress/dcmp0.py b/src/rsrcfork/compress/dcmp0.py
similarity index 100%
rename from rsrcfork/compress/dcmp0.py
rename to src/rsrcfork/compress/dcmp0.py
diff --git a/rsrcfork/compress/dcmp1.py b/src/rsrcfork/compress/dcmp1.py
similarity index 100%
rename from rsrcfork/compress/dcmp1.py
rename to src/rsrcfork/compress/dcmp1.py
diff --git a/rsrcfork/compress/dcmp2.py b/src/rsrcfork/compress/dcmp2.py
similarity index 100%
rename from rsrcfork/compress/dcmp2.py
rename to src/rsrcfork/compress/dcmp2.py
diff --git a/rsrcfork/py.typed b/src/rsrcfork/py.typed
similarity index 100%
rename from rsrcfork/py.typed
rename to src/rsrcfork/py.typed