Skip to content

Commit

Permalink
Repo/package rename
Browse files Browse the repository at this point in the history
  • Loading branch information
bogdandm committed Oct 6, 2018
1 parent da1f350 commit a784a63
Show file tree
Hide file tree
Showing 38 changed files with 65 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# .coveragerc to control coverage.py
[run]
omit =
rest_client_gen/lazy.py
json_to_models/lazy.py

[report]
exclude_lines =
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ install:
- pip install -r requirements.txt
- pip install pytest pytest-cov requests coveralls
script:
- pytest --cov-config .coveragerc --cov=rest_client_gen -m "not no_expected" test/
- pytest --cov-config .coveragerc --cov=json_to_models -m "not no_expected" test/
after_success:
- coveralls
matrix:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def to_typing_code(cls) -> Tuple[ImportPathList, str]:
as a metadata instance but contains actual data
"""
cls_name = cls.__name__
return [('rest_client_gen.dynamic_typing', cls_name)], cls_name
return [('json_to_models.dynamic_typing', cls_name)], cls_name


T_StringSerializable = Type[StringSerializable]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions test/conftest.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest

from rest_client_gen.generator import MetadataGenerator
from rest_client_gen.registry import ModelRegistry
from json_to_models.generator import MetadataGenerator
from json_to_models.registry import ModelRegistry


@pytest.fixture
Expand Down
10 changes: 5 additions & 5 deletions test/test_code_generation/test_attrs_generation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from rest_client_gen.dynamic_typing import (DList, DOptional, FloatString, IntString, ModelMeta, compile_imports)
from rest_client_gen.models import sort_fields
from rest_client_gen.models.attr import AttrsModelCodeGenerator, METADATA_FIELD_NAME, sort_kwargs
from rest_client_gen.models.base import generate_code
from json_to_models.dynamic_typing import (DList, DOptional, FloatString, IntString, ModelMeta, compile_imports)
from json_to_models.models import sort_fields
from json_to_models.models.attr import AttrsModelCodeGenerator, METADATA_FIELD_NAME, sort_kwargs
from json_to_models.models.base import generate_code
from test.test_code_generation.test_models_code_generator import model_factory, trim


Expand Down Expand Up @@ -119,7 +119,7 @@ class Test:
"generated": trim(f"""
import attr
from attr.converter import optional
from rest_client_gen.dynamic_typing import FloatString, IntString
from json_to_models.dynamic_typing import FloatString, IntString
from typing import List, Optional
Expand Down
12 changes: 6 additions & 6 deletions test/test_code_generation/test_models_code_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from rest_client_gen.dynamic_typing import (AbsoluteModelRef, DList, DOptional, IntString, ModelMeta, ModelPtr,
compile_imports)
from rest_client_gen.models import indent, sort_fields
from rest_client_gen.models.base import GenericModelCodeGenerator, generate_code
from json_to_models.dynamic_typing import (AbsoluteModelRef, DList, DOptional, IntString, ModelMeta, ModelPtr,
compile_imports)
from json_to_models.models import indent, sort_fields
from json_to_models.models.base import GenericModelCodeGenerator, generate_code

# Data structure:
# (string, indent lvl, indent string)
Expand Down Expand Up @@ -118,7 +118,7 @@ class Test:
}
},
"fields": {
"imports": "from rest_client_gen.dynamic_typing import IntString\n"
"imports": "from json_to_models.dynamic_typing import IntString\n"
"from typing import List, Optional",
"fields": [
"foo: int",
Expand All @@ -127,7 +127,7 @@ class Test:
]
},
"generated": trim("""
from rest_client_gen.dynamic_typing import IntString
from json_to_models.dynamic_typing import IntString
from typing import List, Optional
Expand Down
8 changes: 4 additions & 4 deletions test/test_code_generation/test_models_composition.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from rest_client_gen.dynamic_typing import ModelMeta
from rest_client_gen.generator import MetadataGenerator
from rest_client_gen.models import ListEx, compose_models, extract_root
from rest_client_gen.registry import ModelRegistry
from json_to_models.dynamic_typing import ModelMeta
from json_to_models.generator import MetadataGenerator
from json_to_models.models import ListEx, compose_models, extract_root
from json_to_models.registry import ModelRegistry


def test_list_ex():
Expand Down
6 changes: 3 additions & 3 deletions test/test_code_generation/test_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import pytest

from rest_client_gen.dynamic_typing import *
from json_to_models.dynamic_typing import *


@pytest.mark.xfail(strict=True, raises=ValueError)
Expand Down Expand Up @@ -104,12 +104,12 @@ class TestModel:
),
pytest.param(
FloatString,
('from rest_client_gen.dynamic_typing import FloatString', FloatString),
('from json_to_models.dynamic_typing import FloatString', FloatString),
id="string_serializable"
),
pytest.param(
DOptional(IntString),
('from rest_client_gen.dynamic_typing import IntString\n'
('from json_to_models.dynamic_typing import IntString\n'
'from typing import Optional', Optional[IntString]),
id="complex_string_serializable"
),
Expand Down
2 changes: 1 addition & 1 deletion test/test_dynamic_typing/test_dynamic_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest

from rest_client_gen.dynamic_typing import DUnion, get_hash_string
from json_to_models.dynamic_typing import DUnion, get_hash_string

# *args | MetaData
test_dunion = [
Expand Down
4 changes: 2 additions & 2 deletions test/test_dynamic_typing/test_string_datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from rest_client_gen.dynamic_typing import (
from json_to_models.dynamic_typing import (
FloatString, IntString, IsoDateString, IsoDatetimeString, IsoTimeString, register_datetime_classes
)
from rest_client_gen.generator import MetadataGenerator
from json_to_models.generator import MetadataGenerator

register_datetime_classes()

Expand Down
8 changes: 4 additions & 4 deletions test/test_dynamic_typing/test_string_serializable_registry.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import pytest

from rest_client_gen.dynamic_typing import IsoTimeString
from rest_client_gen.dynamic_typing.string_serializable import (FloatString, IntString, StringSerializable,
StringSerializableRegistry)
from rest_client_gen.generator import MetadataGenerator
from json_to_models.dynamic_typing import IsoTimeString
from json_to_models.dynamic_typing.string_serializable import (FloatString, IntString, StringSerializable,
StringSerializableRegistry)
from json_to_models.generator import MetadataGenerator

r = StringSerializableRegistry()

Expand Down
2 changes: 1 addition & 1 deletion test/test_etc.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pytest
from inflection import singularize

from rest_client_gen.utils import distinct_words, json_format
from json_to_models.utils import distinct_words, json_format

test_distinct_words_data = [
pytest.param(['test', 'foo', 'bar'], {'test', 'foo', 'bar'}),
Expand Down
4 changes: 2 additions & 2 deletions test/test_generator/test_detect_type.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest

from rest_client_gen.dynamic_typing import BooleanString, DList, DUnion, FloatString, IntString, NoneType, Unknown
from rest_client_gen.generator import MetadataGenerator
from json_to_models.dynamic_typing import BooleanString, DList, DUnion, FloatString, IntString, NoneType, Unknown
from json_to_models.generator import MetadataGenerator

# JSON data | MetaData
test_data = [
Expand Down
4 changes: 2 additions & 2 deletions test/test_generator/test_merge_field_sets.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import pytest

from rest_client_gen.dynamic_typing import DOptional, DUnion, FloatString, IntString
from rest_client_gen.generator import MetadataGenerator
from json_to_models.dynamic_typing import DOptional, DUnion, FloatString, IntString
from json_to_models.generator import MetadataGenerator

# List of fields sets | result field set
test_data = [
Expand Down
6 changes: 3 additions & 3 deletions test/test_generator/test_optimize_type.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import pytest

from rest_client_gen.dynamic_typing import (BooleanString, DList, DOptional, DTuple, DUnion, FloatString, IntString,
NoneType, Unknown)
from rest_client_gen.generator import MetadataGenerator
from json_to_models.dynamic_typing import (BooleanString, DList, DOptional, DTuple, DUnion, FloatString, IntString,
NoneType, Unknown)
from json_to_models.generator import MetadataGenerator

# MetaData | Optimized MetaData
test_data = [
Expand Down
4 changes: 2 additions & 2 deletions test/test_registry/test_models_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import pytest

from rest_client_gen.generator import MetadataGenerator
from rest_client_gen.registry import ModelRegistry
from json_to_models.generator import MetadataGenerator
from json_to_models.registry import ModelRegistry

# Tuple[Root model name, JSON data] | Set[Tuple[model_name, is_generated]]
test_data = [
Expand Down
6 changes: 3 additions & 3 deletions test/test_registry/test_registry_merge_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import pytest

from rest_client_gen.dynamic_typing import DList, DOptional, ModelMeta, Unknown
from rest_client_gen.generator import MetadataGenerator
from rest_client_gen.registry import ModelRegistry
from json_to_models.dynamic_typing import DList, DOptional, ModelMeta, Unknown
from json_to_models.generator import MetadataGenerator
from json_to_models.registry import ModelRegistry
from test.test_registry.test_registry_process_meta_data import check_type, cycle_ref, test_data as base_test_data

# Include test cases from `test_registry_process_meta_data.py`. They should be correct.
Expand Down
4 changes: 2 additions & 2 deletions test/test_registry/test_registry_process_meta_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import pytest

from rest_client_gen.dynamic_typing import ComplexType, DOptional, DTuple, MetaData, ModelMeta, ModelPtr, SingleType
from rest_client_gen.registry import ModelRegistry
from json_to_models.dynamic_typing import ComplexType, DOptional, DTuple, MetaData, ModelMeta, ModelPtr, SingleType
from json_to_models.registry import ModelRegistry

# MetaData | List of models
test_data = [
Expand Down
6 changes: 3 additions & 3 deletions testing_tools/pprint_meta_data.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from inspect import isclass

from rest_client_gen.dynamic_typing import ComplexType, ModelMeta, ModelPtr, SingleType, StringSerializable
from rest_client_gen.generator import MetadataGenerator
from rest_client_gen.registry import ModelRegistry
from json_to_models.dynamic_typing import ComplexType, ModelMeta, ModelPtr, SingleType, StringSerializable
from json_to_models.generator import MetadataGenerator
from json_to_models.registry import ModelRegistry
from testing_tools.data import test_data


Expand Down
14 changes: 7 additions & 7 deletions testing_tools/real_apis/f1.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
import inflection
import requests

from rest_client_gen.dynamic_typing import register_datetime_classes
from rest_client_gen.generator import MetadataGenerator
from rest_client_gen.models import compose_models
from rest_client_gen.models.attr import AttrsModelCodeGenerator
from rest_client_gen.models.base import generate_code
from rest_client_gen.registry import ModelRegistry
from rest_client_gen.utils import json_format
from json_to_models.dynamic_typing import register_datetime_classes
from json_to_models.generator import MetadataGenerator
from json_to_models.models import compose_models
from json_to_models.models.attr import AttrsModelCodeGenerator
from json_to_models.models.base import generate_code
from json_to_models.registry import ModelRegistry
from json_to_models.utils import json_format
from testing_tools.pprint_meta_data import pretty_format_meta
from testing_tools.real_apis import dump_response

Expand Down
4 changes: 2 additions & 2 deletions testing_tools/real_apis/openlibrary.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"""
import requests

from rest_client_gen.generator import MetadataGenerator
from rest_client_gen.registry import ModelRegistry
from json_to_models.generator import MetadataGenerator
from json_to_models.registry import ModelRegistry
from testing_tools.pprint_meta_data import pretty_format_meta
from testing_tools.real_apis import dump_response

Expand Down
12 changes: 6 additions & 6 deletions testing_tools/real_apis/pathofexile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

import requests

from rest_client_gen.generator import MetadataGenerator
from rest_client_gen.models import compose_models
from rest_client_gen.models.attr import AttrsModelCodeGenerator
from rest_client_gen.models.base import generate_code
from rest_client_gen.registry import ModelRegistry
from rest_client_gen.utils import json_format
from json_to_models.generator import MetadataGenerator
from json_to_models.models import compose_models
from json_to_models.models.attr import AttrsModelCodeGenerator
from json_to_models.models.base import generate_code
from json_to_models.registry import ModelRegistry
from json_to_models.utils import json_format
from testing_tools.pprint_meta_data import pretty_format_meta
from testing_tools.real_apis import dump_response

Expand Down
4 changes: 2 additions & 2 deletions testing_tools/real_apis/randomapis.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"""
import requests

from rest_client_gen.generator import MetadataGenerator
from rest_client_gen.registry import ModelRegistry
from json_to_models.generator import MetadataGenerator
from json_to_models.registry import ModelRegistry
from testing_tools.pprint_meta_data import pretty_format_meta
from testing_tools.real_apis import dump_response

Expand Down

0 comments on commit a784a63

Please sign in to comment.