From 891eea26a4484ec20ae29311e18982c4bb66ad64 Mon Sep 17 00:00:00 2001
From: Olivia Box Power <Olivia.BoxPower@dhsc.gov.uk>
Date: Mon, 7 Oct 2024 15:40:48 +0100
Subject: [PATCH] Update project structure

---
 fingertips_py/CHANGELOG.md => CHANGELOG.md      |  0
 fingertips_py/{ => src}/__init__.py             |  2 ++
 fingertips_py/{ => src}/api_calls.py            |  0
 fingertips_py/{ => src}/area_data.py            |  0
 fingertips_py/{ => src}/metadata.py             |  0
 fingertips_py/{ => src}/retrieve_data.py        |  0
 pyproject.toml                                  | 13 ++++++++++---
 {fingertips_py/unit_tests => tests}/__init__.py |  0
 {fingertips_py/unit_tests => tests}/test_all.py |  0
 9 files changed, 12 insertions(+), 3 deletions(-)
 rename fingertips_py/CHANGELOG.md => CHANGELOG.md (100%)
 rename fingertips_py/{ => src}/__init__.py (97%)
 rename fingertips_py/{ => src}/api_calls.py (100%)
 rename fingertips_py/{ => src}/area_data.py (100%)
 rename fingertips_py/{ => src}/metadata.py (100%)
 rename fingertips_py/{ => src}/retrieve_data.py (100%)
 rename {fingertips_py/unit_tests => tests}/__init__.py (100%)
 rename {fingertips_py/unit_tests => tests}/test_all.py (100%)

diff --git a/fingertips_py/CHANGELOG.md b/CHANGELOG.md
similarity index 100%
rename from fingertips_py/CHANGELOG.md
rename to CHANGELOG.md
diff --git a/fingertips_py/__init__.py b/fingertips_py/src/__init__.py
similarity index 97%
rename from fingertips_py/__init__.py
rename to fingertips_py/src/__init__.py
index 0ca99f9..59bb037 100644
--- a/fingertips_py/__init__.py
+++ b/fingertips_py/src/__init__.py
@@ -1,5 +1,7 @@
 __all__ = ['api_calls', 'metadata', 'retrieve_data']
 
+__version__ = '0.4.0'
+
 from .api_calls import get_json, get_data_in_tuple, make_request
 from .retrieve_data import get_all_data_for_profile, get_all_data_for_indicators, get_data_by_indicator_ids, \
     get_all_areas_for_all_indicators, get_data_for_indicator_at_all_available_geographies
diff --git a/fingertips_py/api_calls.py b/fingertips_py/src/api_calls.py
similarity index 100%
rename from fingertips_py/api_calls.py
rename to fingertips_py/src/api_calls.py
diff --git a/fingertips_py/area_data.py b/fingertips_py/src/area_data.py
similarity index 100%
rename from fingertips_py/area_data.py
rename to fingertips_py/src/area_data.py
diff --git a/fingertips_py/metadata.py b/fingertips_py/src/metadata.py
similarity index 100%
rename from fingertips_py/metadata.py
rename to fingertips_py/src/metadata.py
diff --git a/fingertips_py/retrieve_data.py b/fingertips_py/src/retrieve_data.py
similarity index 100%
rename from fingertips_py/retrieve_data.py
rename to fingertips_py/src/retrieve_data.py
diff --git a/pyproject.toml b/pyproject.toml
index 8487918..a8cac09 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "fingertips_py"
 
-version = '0.4.0'
+dynamic = ["version"]
 
 license = {file = "LICENSE"}
 
@@ -29,8 +29,12 @@ dependencies = [
 
 readme = "README.md"
 
+requires-python = ">=3.8"
+
 classifiers = [
-  "Development Status :: 4 - Beta"
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python :: 3",
+  "Operating System :: OS Independent"
 ]
 
 keywords = [
@@ -51,4 +55,7 @@ Issues = "https://github.com/ukhsa-collaboration/PHDS_fingertips_py/issues"
 Changelog = "https://github.com/ukhsa-collaboration/PHDS_fingertips_py/blob/master/CHANGELOG.md"
 
 [tool.setuptools]
-packages = ["fingertips_py"]
\ No newline at end of file
+packages = ["fingertips_py"]
+
+[tool.setuptools.dynamic]
+version = {attr = "fingertips_py.__version__"}
\ No newline at end of file
diff --git a/fingertips_py/unit_tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from fingertips_py/unit_tests/__init__.py
rename to tests/__init__.py
diff --git a/fingertips_py/unit_tests/test_all.py b/tests/test_all.py
similarity index 100%
rename from fingertips_py/unit_tests/test_all.py
rename to tests/test_all.py