Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Upload Python Package

on:
release:
types: [published]

permissions:
contents: read

jobs:
release-build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: "3.12"

- name: Build release distributions
run: |
python -m pip install build
python -m build

- name: Upload distributions
uses: actions/upload-artifact@v4
with:
name: release-dists
path: dist/

pypi-publish:
runs-on: ubuntu-latest
needs:
- release-build
permissions:
id-token: write

environment:
name: pypi
url: https://pypi.org/p/python-odata-nw

steps:
- name: Retrieve release distributions
uses: actions/download-artifact@v4
with:
name: release-dists
path: dist/

- name: Publish release distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: dist/
2 changes: 1 addition & 1 deletion odata/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


class Context:
def __init__(self, session=None, auth=None, extra_headers: dict = None, server_flags: ODataServerFlags = None):
def __init__(self, session=None, auth=None, extra_headers: dict = None, server_flags: ODataServerFlags = ODataServerFlags()):
self.log = logging.getLogger('odata.context')
self.connection = ODataConnection(session=session, auth=auth, extra_headers=extra_headers)
self.server_flags = server_flags
Expand Down
5 changes: 5 additions & 0 deletions odata/enumtype.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ def __init__(self, name, enum_class=EnumType):
super(EnumTypeProperty, self).__init__(name)
self.enum_class = enum_class

def escape_value(self, value):
if self.enum_class.__module__:
return f"Microsoft.Dynamics.DataEntities.{self.enum_class.__name__}'{value.name}'"
return f"{self.enum_class.__name__}'{value.name}'"

def serialize(self, value):
return value.name

Expand Down
2 changes: 0 additions & 2 deletions odata/reflect-templates/enum_entity.mako
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


<%page args="name, entity"/>\
<% short_name = name.split(".")[-1] %>\
${short_name} = Enum("${short_name}", {\
Expand Down
2 changes: 1 addition & 1 deletion odata/reflector.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"FloatProperty": "float",
"BooleanProperty": "bool",
"UUIDProperty": "uuid.UUID",
"EnumTypeProperty": "str"
"EnumTypeProperty": "Enum"
}


Expand Down
16 changes: 8 additions & 8 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "python-odata"
version = "0.6.3"
name = "python-odata-nw"
version = "0.6.3.1"
description = "A simple library for read/write access to OData services."
license="MIT"
authors = ["Tuomas Mursu <tuomas.mursu@kapsi.fi>", "Cristian Libotean <eblis102@gmail.com>"]
Expand Down