From b08075e5921ffbcc47f826575891d8065e85abad Mon Sep 17 00:00:00 2001
From: Sean Gillies <sean.gillies@gmail.com>
Date: Sun, 29 Dec 2024 19:07:08 -0700
Subject: [PATCH] Move source to src/ (#110)

* Move source to src/

Resolves #109

* Update PR number in change log.

* Fix path in pre-commit config

* Update CI matrix

* Update README and tox.ini
---
 .github/workflows/ci.yml                       | 2 +-
 CHANGES.txt                                    | 6 ++++++
 README.rst                                     | 2 +-
 pyproject.toml                                 | 4 ++--
 {affine => src/affine}/__init__.py             | 2 +-
 {affine => src/affine}/tests/__init__.py       | 0
 {affine => src/affine}/tests/test_numpy.py     | 0
 {affine => src/affine}/tests/test_pickle.py    | 0
 {affine => src/affine}/tests/test_rotation.py  | 0
 {affine => src/affine}/tests/test_serialize.py | 0
 {affine => src/affine}/tests/test_transform.py | 0
 tox.ini                                        | 6 +++---
 12 files changed, 14 insertions(+), 8 deletions(-)
 rename {affine => src/affine}/__init__.py (99%)
 rename {affine => src/affine}/tests/__init__.py (100%)
 rename {affine => src/affine}/tests/test_numpy.py (100%)
 rename {affine => src/affine}/tests/test_pickle.py (100%)
 rename {affine => src/affine}/tests/test_rotation.py (100%)
 rename {affine => src/affine}/tests/test_serialize.py (100%)
 rename {affine => src/affine}/tests/test_transform.py (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c1f168f..8064da2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
       - uses: actions/checkout@v3
diff --git a/CHANGES.txt b/CHANGES.txt
index c8c815a..1d66ab2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+3.0a1 (2024-12-27)
+------------------
+
+- Source was moved to src/ and Python version support was changed to 3.9+
+  (#110).
+
 2.4.0 (2023-01-19)
 ------------------
 
diff --git a/README.rst b/README.rst
index 94737b8..2a93fe3 100644
--- a/README.rst
+++ b/README.rst
@@ -14,7 +14,7 @@ Matrices describing 2D affine transformation of the plane.
        :alt: Documentation Status
 
 The Affine package is derived from Casey Duncan's Planar package. Please see
-the copyright statement in `affine/__init__.py <affine/__init__.py>`__.
+the copyright statement in `src/affine/__init__.py <src/affine/__init__.py>`__.
 
 Usage
 -----
diff --git a/pyproject.toml b/pyproject.toml
index 355a7f8..1912148 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: GIS",
 ]
 license = {text = "BSD-3-Clause"}
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 
 [project.optional-dependencies]
 test = [
@@ -59,7 +59,7 @@ ignore = [
 ]
 
 [tool.ruff.lint.per-file-ignores]
-"affine/tests/**.py" = ["B", "D"]
+"src/affine/tests/**.py" = ["B", "D"]
 "docs/**.py" = ["D"]
 
 [tool.ruff.lint.isort]
diff --git a/affine/__init__.py b/src/affine/__init__.py
similarity index 99%
rename from affine/__init__.py
rename to src/affine/__init__.py
index 8798e4c..67f7f91 100644
--- a/affine/__init__.py
+++ b/src/affine/__init__.py
@@ -38,7 +38,7 @@
 
 __all__ = ["Affine"]
 __author__ = "Sean Gillies"
-__version__ = "2.4.1dev"
+__version__ = "3.0dev"
 
 EPSILON: float = 1e-5
 
diff --git a/affine/tests/__init__.py b/src/affine/tests/__init__.py
similarity index 100%
rename from affine/tests/__init__.py
rename to src/affine/tests/__init__.py
diff --git a/affine/tests/test_numpy.py b/src/affine/tests/test_numpy.py
similarity index 100%
rename from affine/tests/test_numpy.py
rename to src/affine/tests/test_numpy.py
diff --git a/affine/tests/test_pickle.py b/src/affine/tests/test_pickle.py
similarity index 100%
rename from affine/tests/test_pickle.py
rename to src/affine/tests/test_pickle.py
diff --git a/affine/tests/test_rotation.py b/src/affine/tests/test_rotation.py
similarity index 100%
rename from affine/tests/test_rotation.py
rename to src/affine/tests/test_rotation.py
diff --git a/affine/tests/test_serialize.py b/src/affine/tests/test_serialize.py
similarity index 100%
rename from affine/tests/test_serialize.py
rename to src/affine/tests/test_serialize.py
diff --git a/affine/tests/test_transform.py b/src/affine/tests/test_transform.py
similarity index 100%
rename from affine/tests/test_transform.py
rename to src/affine/tests/test_transform.py
diff --git a/tox.ini b/tox.ini
index 429e573..e683832 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
 envlist =
-    py37,py38,py39,py310,py311
+    py39,py310,py311,py312,py313
 
 [testenv]
 usedevelop = true
 deps =
+    numpy
     pytest-cov
-    responses
 commands =
-    python -m pytest affine/tests --cov affine --cov-report term-missing
+    python -m pytest  --cov affine --cov-report term-missing