Merge branch 'tidy'

ukhsa-collaboration · Oct 7, 2024 · 6234c57 · 6234c57
2 parents e674171 + 891eea2
commit 6234c57
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 3 deletions.
diff --git a/fingertips_py/CHANGELOG.md → CHANGELOG.md b/fingertips_py/CHANGELOG.md → CHANGELOG.md
diff --git a/fingertips_py/__init__.py → fingertips_py/src/__init__.py b/fingertips_py/__init__.py → 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 → fingertips_py/src/api_calls.py b/fingertips_py/api_calls.py → fingertips_py/src/api_calls.py
diff --git a/fingertips_py/area_data.py → fingertips_py/src/area_data.py b/fingertips_py/area_data.py → fingertips_py/src/area_data.py
diff --git a/fingertips_py/metadata.py → fingertips_py/src/metadata.py b/fingertips_py/metadata.py → fingertips_py/src/metadata.py
diff --git a/fingertips_py/retrieve_data.py → fingertips_py/src/retrieve_data.py b/fingertips_py/retrieve_data.py → fingertips_py/src/retrieve_data.py
diff --git 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"]
+packages = ["fingertips_py"]
+
+[tool.setuptools.dynamic]
+version = {attr = "fingertips_py.__version__"}
diff --git a/fingertips_py/unit_tests/__init__.py → tests/__init__.py b/fingertips_py/unit_tests/__init__.py → tests/__init__.py
diff --git a/fingertips_py/unit_tests/test_all.py → tests/test_all.py b/fingertips_py/unit_tests/test_all.py → tests/test_all.py