refactor: set minimum python version to 3.8, move onc to src folder

Also update outdated Oceans 2.0 links in the README.
OceanNetworksCanada · Nov 29, 2023 · 3eb7b06 · 3eb7b06
1 parent 25e28bc
commit 3eb7b06
Show file tree

Hide file tree

Showing 17 changed files with 9 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # ONC API Python Client Library
 
 This library facilitates access to scientific data hosted by [Ocean Networks Canada](https://oceannetworks.ca) through the
-[Oceans 2.0 API](https://wiki.oceannetworks.ca/display/O2A/Oceans+2.0+API+Home) public web services.
+[Oceans 3.0 API](https://wiki.oceannetworks.ca/display/O2A/Oceans+3.0+API+Home) public web services.
 
 This repository updates the [ONC pip package](https://pypi.org/project/onc) which can be installed with the command:
 
@@ -11,4 +11,4 @@ pip install onc
 
 ## Documentation
 
-For complete documentation and examples, visit https://wiki.oceannetworks.ca/display/O2A/Oceans+2.0+API+Home
+For complete documentation and examples, visit https://wiki.oceannetworks.ca/display/O2A/Oceans+3.0+API+Home
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ authors = [
   { name="ONC Data Team", email="[email protected]" },
 ]
 license = {file = 'LICENSE.txt'}
-requires-python = ">=3.9"
+requires-python = ">=3.8"
 dependencies = [
     "requests",
     'python-dateutil',
@@ -31,26 +31,17 @@ Homepage = "https://wiki.oceannetworks.ca/display/O2A/Oceans+3.0+API+Home"
 Documentation = "https://wiki.oceannetworks.ca/display/O2A/Client+Libraries"
 Source = "https://github.com/OceanNetworksCanada/api-python-client"
 
-[tool.setuptools]
-packages = ["onc"]
-
 [tool.isort]
 profile = "black"
 src_paths = ["onc", "tests"]
 
 [tool.ruff]
 # Reference for the rules https://docs.astral.sh/ruff/rules/
 select = [
-    # pycodestyle
-    "E", "W",
-    # Pyflakes
-    "F",
-    # pyupgrade
-    "UP",
-    # flake8-bugbear
-    "B",
-    # flake8-simplify
-    "SIM",
-    # isort
-    "I",
+    "E", "W",  # pycodestyle
+    "F",  # pyflakes
+    "UP",  # pyupgrade
+    "B",  # flake8-bugbear
+    "SIM",  # flake8-simplify
+    "I",  # isort
 ]
diff --git a/onc/__init__.py → src/onc/__init__.py b/onc/__init__.py → src/onc/__init__.py
diff --git a/onc/modules/Exceptions.py → src/onc/modules/Exceptions.py b/onc/modules/Exceptions.py → src/onc/modules/Exceptions.py
diff --git a/onc/modules/_DataProductFile.py → src/onc/modules/_DataProductFile.py b/onc/modules/_DataProductFile.py → src/onc/modules/_DataProductFile.py
diff --git a/onc/modules/_MultiPage.py → src/onc/modules/_MultiPage.py b/onc/modules/_MultiPage.py → src/onc/modules/_MultiPage.py
diff --git a/onc/modules/_OncArchive.py → src/onc/modules/_OncArchive.py b/onc/modules/_OncArchive.py → src/onc/modules/_OncArchive.py
diff --git a/onc/modules/_OncDelivery.py → src/onc/modules/_OncDelivery.py b/onc/modules/_OncDelivery.py → src/onc/modules/_OncDelivery.py
diff --git a/onc/modules/_OncDiscovery.py → src/onc/modules/_OncDiscovery.py b/onc/modules/_OncDiscovery.py → src/onc/modules/_OncDiscovery.py
diff --git a/onc/modules/_OncRealTime.py → src/onc/modules/_OncRealTime.py b/onc/modules/_OncRealTime.py → src/onc/modules/_OncRealTime.py
diff --git a/onc/modules/_OncService.py → src/onc/modules/_OncService.py b/onc/modules/_OncService.py → src/onc/modules/_OncService.py
diff --git a/onc/modules/_PollLog.py → src/onc/modules/_PollLog.py b/onc/modules/_PollLog.py → src/onc/modules/_PollLog.py
diff --git a/onc/modules/__init__.py → src/onc/modules/__init__.py b/onc/modules/__init__.py → src/onc/modules/__init__.py
diff --git a/onc/modules/_util.py → src/onc/modules/_util.py b/onc/modules/_util.py → src/onc/modules/_util.py
diff --git a/onc/onc.py → src/onc/onc.py b/onc/onc.py → src/onc/onc.py
diff --git a/onc/util/__init__.py → src/onc/util/__init__.py b/onc/util/__init__.py → src/onc/util/__init__.py
diff --git a/onc/util/util.py → src/onc/util/util.py b/onc/util/util.py → src/onc/util/util.py