refactor package / switch to version releases

spacetelescope · Dec 6, 2023 · 12b6f23 · 12b6f23
1 parent 095b570
commit 12b6f23
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,7 +8,10 @@
 
 name: Upload Python Package
 
-on: [push]
+on:
+  push:
+    tags:
+      - "v*"
 
 permissions:
   contents: read

diff --git a/tests/generics_test.py b/tests/generics_test.py
@@ -1,7 +1,7 @@
 """Tests for generic VO xml models"""
 from unittest import TestCase
 
-from vo.models.xml.generics import VODateTime
+from vo_models.xml.generics import VODateTime
 
 
 class TestVODatetimeModel(TestCase):

diff --git a/tests/uws/models_test.py b/tests/uws/models_test.py
@@ -6,8 +6,8 @@
 
 from lxml import etree
 
-from vo.models.xml.generics import VODateTime
-from vo.models.xml.uws import (
+from vo_models.xml.generics import VODateTime
+from vo_models.xml.uws import (
     ErrorSummary,
     Jobs,
     JobSummary,
@@ -17,7 +17,7 @@
     Results,
     ShortJobDescription,
 )
-from vo.models.xml.uws.types import ExecutionPhase
+from vo_models.xml.uws.types import ExecutionPhase
 
 UWS_NAMESPACE_HEADER = """xmlns:uws="http://www.ivoa.net/xml/UWS/v1.0"
 xmlns:xlink="http://www.w3.org/1999/xlink"

diff --git a/vo/models/__init__.py b/vo/models/__init__.py
diff --git a/vo/__init__.py → vo_models/__init__.py b/vo/__init__.py → vo_models/__init__.py
diff --git a/vo/models/openapi/uws/components.yml → vo_models/openapi/uws/components.yml b/vo/models/openapi/uws/components.yml → vo_models/openapi/uws/components.yml
diff --git a/vo/models/openapi/uws/uws.yml → vo_models/openapi/uws/uws.yml b/vo/models/openapi/uws/uws.yml → vo_models/openapi/uws/uws.yml
diff --git a/vo/models/xml/__init__.py → vo_models/xml/__init__.py b/vo/models/xml/__init__.py → vo_models/xml/__init__.py
diff --git a/vo/models/xml/generics.py → vo_models/xml/generics.py b/vo/models/xml/generics.py → vo_models/xml/generics.py
diff --git a/vo/models/xml/uws/__init__.py → vo_models/xml/uws/__init__.py b/vo/models/xml/uws/__init__.py → vo_models/xml/uws/__init__.py
@@ -4,7 +4,7 @@
 Contains pydantic-xml models for UWS request / response serialization.
 IVOA UWS Spec: https://www.ivoa.net/documents/UWS/20161024/REC-UWS-1.1-20161024.html
 """
-from vo.models.xml.uws.models import (
+from vo_models.xml.uws.models import (
     ErrorSummary,
     Job,
     Jobs,

diff --git a/vo/models/xml/uws/models.py → vo_models/xml/uws/models.py b/vo/models/xml/uws/models.py → vo_models/xml/uws/models.py
@@ -1,12 +1,12 @@
 """UWS Job Schema using Pydantic-XML models"""
-from typing import Dict, Generic, Optional, Type, TypeVar, Union
+from typing import Dict, Generic, Optional, TypeVar
 
 from pydantic import field_validator
 from pydantic_xml import BaseXmlModel, attr, element
 
-from vo.models.xml.generics import VODateTime
-from vo.models.xml.uws.types import ErrorType, ExecutionPhase, UWSVersion
-from vo.models.xml.xlink import XlinkType
+from vo_models.xml.generics import VODateTime
+from vo_models.xml.uws.types import ErrorType, ExecutionPhase, UWSVersion
+from vo_models.xml.xlink import XlinkType
 
 NSMAP = {
     "uws": "http://www.ivoa.net/xml/UWS/v1.0",
@@ -15,6 +15,7 @@
     "xsi": "http://www.w3.org/2001/XMLSchema-instance",
 }
 
+# pylint: disable=invalid-name
 ParametersType = TypeVar("ParametersType")
 
 class Parameter(BaseXmlModel, tag="parameter", ns="uws", nsmap=NSMAP):

diff --git a/vo/models/xml/uws/types.py → vo_models/xml/uws/types.py b/vo/models/xml/uws/types.py → vo_models/xml/uws/types.py
diff --git a/vo/models/xml/xlink/__init__.py → vo_models/xml/xlink/__init__.py b/vo/models/xml/xlink/__init__.py → vo_models/xml/xlink/__init__.py
@@ -2,4 +2,4 @@
 See: https://www.w3.org/TR/xlink11/
 
 Note: Only implements the simple type TypeValue, used in UWS Job models."""
-from vo.models.xml.xlink.xlink import XlinkType
+from vo_models.xml.xlink.xlink import XlinkType
diff --git a/vo/models/xml/xlink/xlink.py → vo_models/xml/xlink/xlink.py b/vo/models/xml/xlink/xlink.py → vo_models/xml/xlink/xlink.py