Browse Source

fix: fix error in the serialization of the Object type

pull/18/head
Jérôme Deuchnord 3 years ago
parent
commit
4b57501085
No known key found for this signature in database GPG Key ID: 9F72B1EF93EDE1D4
2 changed files with 25 additions and 7 deletions
  1. +18
    -6
      .github/workflows/tests.yml
  2. +7
    -1
      kosmorrolib/model.py

+ 18
- 6
.github/workflows/tests.yml View File

@@ -31,21 +31,27 @@ jobs:
with: with:
python-version: ${{ matrix.python_version }} python-version: ${{ matrix.python_version }}


- name: Prepare environment
- name: Prepare environment (non-Windows systems)
if: ${{ matrix.os != 'windows-2019' }}
run: | run: |
pip install --upgrade pip pipenv pip install --upgrade pip pipenv


- name: Prepare environment (Windows)
if: ${{ matrix.os == 'windows-2019' }}
run: |
python -mpip install --upgrade pip pipenv

- name: Install dependencies (all systems) - name: Install dependencies (all systems)
run: | run: |
pipenv lock --pre pipenv lock --pre
pipenv sync --dev pipenv sync --dev
pipenv install --dev pipenv install --dev


- name: Install dependencies (Windows-specific)
- name: Install dependencies (Windows)
if: ${{ matrix.os == 'windows-2019' }} if: ${{ matrix.os == 'windows-2019' }}
run: | run: |
pipenv lock --dev -r > requirements.txt pipenv lock --dev -r > requirements.txt
pip install -r requirements.txt
python -mpip install -r requirements.txt


- name: Run legacy tests - name: Run legacy tests
run: | run: |
@@ -75,21 +81,27 @@ jobs:
with: with:
python-version: ${{ matrix.python_version }} python-version: ${{ matrix.python_version }}


- name: Prepare environment
- name: Prepare environment (non-Windows systems)
if: ${{ matrix.os != 'windows-2019' }}
run: | run: |
pip install --upgrade pip pipenv pip install --upgrade pip pipenv


- name: Prepare environment (Windows)
if: ${{ matrix.os == 'windows-2019' }}
run: |
python -mpip install --upgrade pip pipenv

- name: Install dependencies (all systems) - name: Install dependencies (all systems)
run: | run: |
pipenv lock --pre pipenv lock --pre
pipenv sync --dev pipenv sync --dev
pipenv install --dev pipenv install --dev


- name: Install dependencies (Windows-specific)
- name: Install dependencies (Windows)
if: ${{ matrix.os == 'windows-2019' }} if: ${{ matrix.os == 'windows-2019' }}
run: | run: |
pipenv lock -r > requirements.txt pipenv lock -r > requirements.txt
pip install -r requirements.txt
python -mpip install -r requirements.txt


- name: Run doc tests (with coverage) - name: Run doc tests (with coverage)
if: ${{ matrix.os == 'ubuntu-20.04' && matrix.python_version == '3.9' }} if: ${{ matrix.os == 'ubuntu-20.04' && matrix.python_version == '3.9' }}


+ 7
- 1
kosmorrolib/model.py View File

@@ -114,9 +114,15 @@ class Object(Serializable):
) )


def serialize(self) -> dict: def serialize(self) -> dict:
"""Serialize the given object

>>> planet = Planet(ObjectIdentifier.MARS, "MARS")
>>> planet.serialize()
{'identifier': 'MARS', 'type': 'PLANET', 'radius': None}
"""
return { return {
"identifier": self.identifier.name, "identifier": self.identifier.name,
"type": self.get_type(),
"type": self.get_type().name,
"radius": self.radius, "radius": self.radius,
} }




Loading…
Cancel
Save