diff --git a/.gitignore b/.gitignore index 60e5afe..0a2e84c 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,5 @@ cover/ # tox .tox/ +.idea/ +venv/ \ No newline at end of file diff --git a/.noseids b/.noseids deleted file mode 100644 index 5023878..0000000 --- a/.noseids +++ /dev/null @@ -1,1073 +0,0 @@ -(dp1 -S'failed' -p2 -(lp3 -S'84' -p4 -aS'87' -p5 -aS'88' -p6 -aS'89' -p7 -aS'122' -p8 -aS'132' -p9 -aS'136' -p10 -aS'137' -p11 -aS'138' -p12 -aS'139' -p13 -aS'143' -p14 -aS'144' -p15 -aS'145' -p16 -aS'146' -p17 -aS'147' -p18 -aS'148' -p19 -aS'149' -p20 -aS'150' -p21 -aS'152' -p22 -aS'153' -p23 -aS'156' -p24 -aS'157' -p25 -aS'158' -p26 -aS'159' -p27 -aS'162' -p28 -aS'163' -p29 -aS'164' -p30 -aS'165' -p31 -aS'166' -p32 -aS'168' -p33 -aS'191' -p34 -asS'source_names' -p35 -(lp36 -S'.' -asS'ids' -p37 -(dp38 -I1 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_alias_fields.py' -S'tests.test_alias_fields' -p39 -S'MaterializedFieldsTest.test_assignment_error' -tp40 -sI2 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_alias_fields.py' -g39 -S'MaterializedFieldsTest.test_duplicate_default' -tp41 -sI3 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_alias_fields.py' -g39 -S'MaterializedFieldsTest.test_insert_and_select' -tp42 -sI4 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_alias_fields.py' -g39 -S'MaterializedFieldsTest.test_wrong_field' -tp43 -sI5 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_array_fields.py' -S'tests.test_array_fields' -p44 -S'ArrayFieldsTest.test_assignment_error' -tp45 -sI6 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_array_fields.py' -g44 -S'ArrayFieldsTest.test_conversion' -tp46 -sI7 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_array_fields.py' -g44 -S'ArrayFieldsTest.test_insert_and_select' -tp47 -sI8 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_array_fields.py' -g44 -S'ArrayFieldsTest.test_invalid_inner_field' -tp48 -sI9 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_array_fields.py' -g44 -S'ArrayFieldsTest.test_parse_array' -tp49 -sI10 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_buffer.py' -S'tests.test_buffer' -p50 -S'BufferTestCase.test_insert_buffer' -tp51 -sI11 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_compressed_fields.py' -S'tests.test_compressed_fields' -p52 -S'CompressedFieldsTestCase.test_assignment' -tp53 -sI12 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_compressed_fields.py' -g52 -S'CompressedFieldsTestCase.test_confirm_compression_codec' -tp54 -sI13 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_compressed_fields.py' -g52 -S'CompressedFieldsTestCase.test_defaults' -tp55 -sI14 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_compressed_fields.py' -g52 -S'CompressedFieldsTestCase.test_string_conversion' -tp56 -sI15 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_compressed_fields.py' -g52 -S'CompressedFieldsTestCase.test_to_dict' -tp57 -sI16 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_custom_fields.py' -S'tests.test_custom_fields' -p58 -S'CustomFieldsTest.test_boolean_field' -tp59 -sI17 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -S'tests.test_database' -p60 -S'DatabaseTestCase.test_add_setting' -tp61 -sI18 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_count' -tp62 -sI19 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_does_table_exist' -tp63 -sI20 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_dollar_in_select' -tp64 -sI21 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__empty' -tp65 -sI22 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__generator' -tp66 -sI23 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__iterator' -tp67 -sI24 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__list' -tp68 -sI25 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__medium_batches' -tp69 -sI26 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_insert__small_batches' -tp70 -sI27 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_invalid_user' -tp71 -sI28 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_missing_engine' -tp72 -sI29 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_nonexisting_db' -tp73 -sI30 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_pagination' -tp74 -sI31 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_pagination_empty_page' -tp75 -sI32 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_pagination_invalid_page' -tp76 -sI33 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_pagination_last_page' -tp77 -sI34 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_pagination_with_conditions' -tp78 -sI35 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_potentially_problematic_field_names' -tp79 -sI36 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_preexisting_db' -tp80 -sI37 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_raw' -tp81 -sI38 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_select' -tp82 -sI39 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_select_ad_hoc_model' -tp83 -sI40 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_select_partial_fields' -tp84 -sI41 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_select_with_totals' -tp85 -sI42 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_database.py' -g60 -S'DatabaseTestCase.test_special_chars' -tp86 -sI43 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_datetime_fields.py' -S'tests.test_datetime_fields' -p87 -S'DateFieldsTest.test_ad_hoc_model' -tp88 -sI44 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -S'tests.test_decimal_fields' -p89 -S'DecimalFieldsTest.test_ad_hoc_model' -tp90 -sI45 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_aggregation' -tp91 -sI46 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_assignment_error' -tp92 -sI47 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_assignment_ok' -tp93 -sI48 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_insert_and_select' -tp94 -sI49 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_min_max' -tp95 -sI50 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_precision_and_scale' -tp96 -sI51 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_decimal_fields.py' -g89 -S'DecimalFieldsTest.test_rounding' -tp97 -sI52 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -S'tests.test_engines' -p98 -S'DistributedTestCase.test_bad_cluster_name' -tp99 -sI53 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_insert_distributed_select_local' -tp100 -sI54 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_insert_local_select_distributed' -tp101 -sI55 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_minimal_engine' -tp102 -sI56 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_minimal_engine_no_superclasses' -tp103 -sI57 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_minimal_engine_two_superclasses' -tp104 -sI58 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_verbose_engine_two_superclasses' -tp105 -sI59 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_with_table_name' -tp106 -sI60 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'DistributedTestCase.test_without_table_name' -tp107 -sI61 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_collapsing_merge_tree' -tp108 -sI62 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_custom_partitioning' -tp109 -sI63 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_log' -tp110 -sI64 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_memory' -tp111 -sI65 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_merge' -tp112 -sI66 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_merge_tree' -tp113 -sI67 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_merge_tree_with_granularity' -tp114 -sI68 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_merge_tree_with_sampling' -tp115 -sI69 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_replacing_merge_tree' -tp116 -sI70 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_replicated_merge_tree' -tp117 -sI71 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_replicated_merge_tree_incomplete' -tp118 -sI72 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_summing_merge_tree' -tp119 -sI73 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_engines.py' -g98 -S'EnginesTestCase.test_tiny_log' -tp120 -sI74 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -S'tests.test_enum_fields' -p121 -S'EnumFieldsTest.test_ad_hoc_model' -tp122 -sI75 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -g121 -S'EnumFieldsTest.test_assignment_error' -tp123 -sI76 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -g121 -S'EnumFieldsTest.test_conversion' -tp124 -sI77 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -g121 -S'EnumFieldsTest.test_default_value' -tp125 -sI78 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -g121 -S'EnumFieldsTest.test_enum_array' -tp126 -sI79 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_enum_fields.py' -g121 -S'EnumFieldsTest.test_insert_and_select' -tp127 -sI80 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_fixed_string_fields.py' -S'tests.test_fixed_string_fields' -p128 -S'FixedStringFieldsTest.test_ad_hoc_model' -tp129 -sI81 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_fixed_string_fields.py' -g128 -S'FixedStringFieldsTest.test_assignment_error' -tp130 -sI82 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_fixed_string_fields.py' -g128 -S'FixedStringFieldsTest.test_insert_and_select' -tp131 -sI83 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -S'tests.test_funcs' -p132 -S'FuncsTestCase.test_arithmetic_operators' -tp133 -sI84 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_base64_functions' -tp134 -sI85 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_comparison_operators' -tp135 -sI86 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_date_functions' -tp136 -sI87 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_filter_date_field' -tp137 -sI88 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_filter_float_field' -tp138 -sI89 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_func_as_field_value' -tp139 -sI90 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_func_to_sql' -tp140 -sI91 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_logical_operators' -tp141 -sI92 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_string_functions' -tp142 -sI93 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_funcs.py' -g132 -S'FuncsTestCase.test_type_conversion_functions' -tp143 -sI94 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_inheritance.py' -S'tests.test_inheritance' -p144 -S'InheritanceTestCase.test_create_table_sql' -tp145 -sI95 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_inheritance.py' -g144 -S'InheritanceTestCase.test_field_inheritance' -tp146 -sI96 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_inheritance.py' -g144 -S'InheritanceTestCase.test_get_field' -tp147 -sI97 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_join.py' -S'tests.test_join' -p148 -S'JoinTest.test_with_db_name' -tp149 -sI98 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_join.py' -g148 -S'JoinTest.test_with_subquery' -tp150 -sI99 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_join.py' -g148 -S'JoinTest.test_without_db_name' -tp151 -sI100 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_materialized_fields.py' -S'tests.test_materialized_fields' -p152 -S'MaterializedFieldsTest.test_assignment_error' -tp153 -sI101 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_materialized_fields.py' -g152 -S'MaterializedFieldsTest.test_duplicate_default' -tp154 -sI102 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_materialized_fields.py' -g152 -S'MaterializedFieldsTest.test_insert_and_select' -tp155 -sI103 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_materialized_fields.py' -g152 -S'MaterializedFieldsTest.test_wrong_field' -tp156 -sI104 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_migrations.py' -S'tests.test_migrations' -p157 -S'MigrationsTestCase.test_migrations' -tp158 -sI105 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -S'tests.test_models' -p159 -S'ModelTestCase.test_assignment' -tp160 -sI106 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_assignment_error' -tp161 -sI107 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_defaults' -tp162 -sI108 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_field_name_in_error_message_for_invalid_value_in_assignment' -tp163 -sI109 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_field_name_in_error_message_for_invalid_value_in_constructor' -tp164 -sI110 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_string_conversion' -tp165 -sI111 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_models.py' -g159 -S'ModelTestCase.test_to_dict' -tp166 -sI112 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -S'tests.test_nullable_fields' -p167 -S'NullableFieldsTest.test_ad_hoc_model' -tp168 -sI113 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -g167 -S'NullableFieldsTest.test_insert_and_select' -tp169 -sI114 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -g167 -S'NullableFieldsTest.test_isinstance' -tp170 -sI115 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -g167 -S'NullableFieldsTest.test_nullable_datetime_field' -tp171 -sI116 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -g167 -S'NullableFieldsTest.test_nullable_string_field' -tp172 -sI117 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_nullable_fields.py' -g167 -S'NullableFieldsTest.test_nullable_uint8_field' -tp173 -sI118 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -S'tests.test_querysets' -p174 -S'AggregateTestCase.test_aggregate_no_grouping' -tp175 -sI119 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_on_aggregate' -tp176 -sI120 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_distinct' -tp177 -sI121 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_explicit_grouping' -tp178 -sI122 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_filter' -tp179 -sI123 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_implicit_grouping' -tp180 -sI124 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_indexing' -tp181 -sI125 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_no_calculated_fields' -tp182 -sI126 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_only' -tp183 -sI127 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_order_by' -tp184 -sI128 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_pagination' -tp185 -sI129 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_slicing' -tp186 -sI130 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_totals' -tp187 -sI131 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_aggregate_with_wrong_grouping' -tp188 -sI132 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_double_underscore_field' -tp189 -sI133 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'AggregateTestCase.test_filter_on_calculated_field' -tp190 -sI134 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_arithmetic_operators' -tp191 -sI135 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_comparison_operators' -tp192 -sI136 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_filter_date_field' -tp193 -sI137 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_filter_float_field' -tp194 -sI138 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_func_as_field_value' -tp195 -sI139 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'FuncsTestCase.test_func_to_sql' -tp196 -sI140 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_alias_field' -tp197 -sI141 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_count_of_slice' -tp198 -sI142 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_distinct' -tp199 -sI143 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_date_field' -tp200 -sI144 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_enum_field' -tp201 -sI145 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_float_field' -tp202 -sI146 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_int_field' -tp203 -sI147 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_null_value' -tp204 -sI148 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_string_field' -tp205 -sI149 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_unicode_string' -tp206 -sI150 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_filter_with_q_objects' -tp207 -sI151 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_final' -tp208 -sI152 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_in_subquery' -tp209 -sI153 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_invalid_filter' -tp210 -sI154 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_invalid_slicing' -tp211 -sI155 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_materialized_field' -tp212 -sI156 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_mixed_filter' -tp213 -sI157 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_multiple_exclude' -tp214 -sI158 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_mutiple_filter' -tp215 -sI159 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_no_filtering' -tp216 -sI160 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_only' -tp217 -sI161 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_order_by' -tp218 -sI162 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_pagination' -tp219 -sI163 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_pagination_invalid_page' -tp220 -sI164 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_pagination_last_page' -tp221 -sI165 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_pagination_with_conditions' -tp222 -sI166 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_prewhere' -tp223 -sI167 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_slicing' -tp224 -sI168 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_querysets.py' -g174 -S'QuerySetTestCase.test_truthiness' -tp225 -sI169 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -S'tests.test_readonly' -p226 -S'ReadonlyTestCase.test_create_readonly_table' -tp227 -sI170 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -g226 -S'ReadonlyTestCase.test_drop_readonly_table' -tp228 -sI171 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -g226 -S'ReadonlyTestCase.test_insert_readonly' -tp229 -sI172 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -g226 -S'ReadonlyTestCase.test_nonexisting_readonly_database' -tp230 -sI173 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -g226 -S'ReadonlyTestCase.test_readonly_db_with_default_user' -tp231 -sI174 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_readonly.py' -g226 -S'ReadonlyTestCase.test_readonly_db_with_readonly_user' -tp232 -sI175 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_server_errors.py' -S'tests.test_server_errors' -p233 -S'ServerErrorTest.test_new_format' -tp234 -sI176 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_server_errors.py' -g233 -S'ServerErrorTest.test_old_format' -tp235 -sI177 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_simple_fields.py' -S'tests.test_simple_fields' -p236 -S'SimpleFieldsTest.test_date_field' -tp237 -sI178 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_simple_fields.py' -g236 -S'SimpleFieldsTest.test_date_field_timezone' -tp238 -sI179 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_simple_fields.py' -g236 -S'SimpleFieldsTest.test_datetime_field' -tp239 -sI180 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_simple_fields.py' -g236 -S'SimpleFieldsTest.test_datetime_field_timezone' -tp240 -sI181 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_simple_fields.py' -g236 -S'SimpleFieldsTest.test_uint8_field' -tp241 -sI182 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -S'tests.test_system_models' -p242 -S'SystemPartTest.test_attach_detach' -tp243 -sI183 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_drop' -tp244 -sI184 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_fetch' -tp245 -sI185 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_freeze' -tp246 -sI186 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_get_active' -tp247 -sI187 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_get_all' -tp248 -sI188 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_get_conditions' -tp249 -sI189 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_is_read_only' -tp250 -sI190 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_is_system_model' -tp251 -sI191 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemPartTest.test_query' -tp252 -sI192 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemTest.test_create_readonly_table' -tp253 -sI193 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemTest.test_drop_readonly_table' -tp254 -sI194 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_system_models.py' -g242 -S'SystemTest.test_insert_system' -tp255 -sI195 -(S'/home/itais/workspace/infinidat/infi.clickhouse_orm/tests/test_uuid_fields.py' -S'tests.test_uuid_fields' -p256 -S'UUIDFieldsTest.test_uuid_field' -tp257 -ss. \ No newline at end of file diff --git a/README.md b/README.md index 462c8f4..247d928 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Let's jump right in with a simple example of monitoring CPU usage. First we need connect to the database and create a table for the model: ```python -from infi.clickhouse_orm import Database, Model, DateTimeField, UInt16Field, Float32Field, Memory, F +from clickhouse_orm import Database, Model, DateTimeField, UInt16Field, Float32Field, Memory, F class CPUStats(Model): diff --git a/buildout.cfg b/buildout.cfg deleted file mode 100644 index 872c54b..0000000 --- a/buildout.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[buildout] -prefer-final = false -newest = false -download-cache = .cache -develop = . -parts = -relative-paths = true - -[project] -name = infi.clickhouse_orm -company = Infinidat -namespace_packages = ['infi'] -install_requires = [ - 'iso8601 >= 0.1.12', - 'pytz', - 'requests', - 'setuptools' - ] -version_file = src/infi/clickhouse_orm/__version__.py -description = A Python library for working with the ClickHouse database -long_description = A Python library for working with the ClickHouse database -console_scripts = [] -gui_scripts = [] -package_data = [] -upgrade_code = {58530fba-3932-11e6-a20e-7071bc32067f} -product_name = infi.clickhouse_orm -post_install_script_name = None -pre_uninstall_script_name = None -homepage = https://github.com/Infinidat/infi.clickhouse_orm - -[isolated-python] -recipe = infi.recipe.python -version = v3.8.0.2 - -[setup.py] -recipe = infi.recipe.template.version -input = setup.in -output = setup.py - -[__version__.py] -recipe = infi.recipe.template.version -output = ${project:version_file} - -[development-scripts] -dependent-scripts = true -recipe = infi.recipe.console_scripts -eggs = ${project:name} - ipython<6 - nose - coverage - enum-compat - infi.unittest - infi.traceback - memory_profiler - profilehooks - psutil - zc.buildout -scripts = ipython - nosetests -interpreter = python - -[pack] -recipe = infi.recipe.application_packager - -[sublime] -recipe = corneti.recipes.codeintel -eggs = ${development-scripts:eggs} - diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..d1353d9 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,29 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "clickhouse-orm" +description = "A Python library for working with the ClickHouse database" +readme = "README.md" +keywords = ["ClickHouse", "ORM", 'DB', 'DATABASE', 'OLAP'] +license = {text = "BSD License"} +classifiers = [ + "Programming Language :: Python :: 3", + "Operating System :: OS Independent", + "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: Database" +] +dependencies = [ + "requests", + "pytz", + "iso8601 >= 0.1.12", + "setuptools" +] +version = "0.0.1" + +[tool.setuptools.packages.find] +where = ["src"] + +[project.optional-dependencies] +pkg = ["setuptools", "requests", "pytz", "iso8601>=0.1.12"] diff --git a/setup.in b/setup.in deleted file mode 100644 index e62522f..0000000 --- a/setup.in +++ /dev/null @@ -1,50 +0,0 @@ - -SETUP_INFO = dict( - name = '${project:name}', - version = '${infi.recipe.template.version:version}', - author = '${infi.recipe.template.version:author}', - author_email = '${infi.recipe.template.version:author_email}', - - url = ${infi.recipe.template.version:homepage}, - license = 'BSD', - description = """${project:description}""", - - # http://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers = [ - "Intended Audience :: Developers", - "Intended Audience :: System Administrators", - "License :: OSI Approved :: BSD License", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.4", - "Topic :: Software Development :: Libraries :: Python Modules", - "Topic :: Database" - ], - - install_requires = ${project:install_requires}, - namespace_packages = ${project:namespace_packages}, - - package_dir = {'': 'src'}, - package_data = {'': ${project:package_data}}, - include_package_data = True, - zip_safe = False, - - entry_points = dict( - console_scripts = ${project:console_scripts}, - gui_scripts = ${project:gui_scripts}, - ), -) - -if SETUP_INFO['url'] is None: - _ = SETUP_INFO.pop('url') - -def setup(): - from setuptools import setup as _setup - from setuptools import find_packages - SETUP_INFO['packages'] = find_packages('src') - _setup(**SETUP_INFO) - -if __name__ == '__main__': - setup() - diff --git a/src/clickhouse_orm/__init__.py b/src/clickhouse_orm/__init__.py new file mode 100644 index 0000000..292e25c --- /dev/null +++ b/src/clickhouse_orm/__init__.py @@ -0,0 +1,13 @@ +__import__("pkg_resources").declare_namespace(__name__) + +from clickhouse_orm.database import * +from clickhouse_orm.engines import * +from clickhouse_orm.fields import * +from clickhouse_orm.funcs import * +from clickhouse_orm.migrations import * +from clickhouse_orm.models import * +from clickhouse_orm.query import * +from clickhouse_orm.system_models import * + +from inspect import isclass +__all__ = [c.__name__ for c in locals().values() if isclass(c)] diff --git a/src/infi/clickhouse_orm/database.py b/src/clickhouse_orm/database.py similarity index 100% rename from src/infi/clickhouse_orm/database.py rename to src/clickhouse_orm/database.py diff --git a/src/infi/clickhouse_orm/engines.py b/src/clickhouse_orm/engines.py similarity index 100% rename from src/infi/clickhouse_orm/engines.py rename to src/clickhouse_orm/engines.py diff --git a/src/infi/clickhouse_orm/fields.py b/src/clickhouse_orm/fields.py similarity index 100% rename from src/infi/clickhouse_orm/fields.py rename to src/clickhouse_orm/fields.py diff --git a/src/infi/clickhouse_orm/funcs.py b/src/clickhouse_orm/funcs.py similarity index 100% rename from src/infi/clickhouse_orm/funcs.py rename to src/clickhouse_orm/funcs.py diff --git a/src/infi/clickhouse_orm/migrations.py b/src/clickhouse_orm/migrations.py similarity index 100% rename from src/infi/clickhouse_orm/migrations.py rename to src/clickhouse_orm/migrations.py diff --git a/src/infi/clickhouse_orm/models.py b/src/clickhouse_orm/models.py similarity index 100% rename from src/infi/clickhouse_orm/models.py rename to src/clickhouse_orm/models.py diff --git a/src/infi/clickhouse_orm/query.py b/src/clickhouse_orm/query.py similarity index 100% rename from src/infi/clickhouse_orm/query.py rename to src/clickhouse_orm/query.py diff --git a/src/infi/clickhouse_orm/system_models.py b/src/clickhouse_orm/system_models.py similarity index 100% rename from src/infi/clickhouse_orm/system_models.py rename to src/clickhouse_orm/system_models.py diff --git a/src/infi/clickhouse_orm/utils.py b/src/clickhouse_orm/utils.py similarity index 100% rename from src/infi/clickhouse_orm/utils.py rename to src/clickhouse_orm/utils.py diff --git a/src/infi/__init__.py b/src/infi/__init__.py deleted file mode 100644 index 5284146..0000000 --- a/src/infi/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/infi/clickhouse_orm/__init__.py b/src/infi/clickhouse_orm/__init__.py deleted file mode 100644 index c7982cc..0000000 --- a/src/infi/clickhouse_orm/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) - -from infi.clickhouse_orm.database import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.funcs import * -from infi.clickhouse_orm.migrations import * -from infi.clickhouse_orm.models import * -from infi.clickhouse_orm.query import * -from infi.clickhouse_orm.system_models import * - -from inspect import isclass -__all__ = [c.__name__ for c in locals().values() if isclass(c)] diff --git a/tests/base_test_with_data.py b/tests/base_test_with_data.py index 53d2343..f48d11b 100644 --- a/tests/base_test_with_data.py +++ b/tests/base_test_with_data.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import unittest -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * import logging logging.getLogger("requests").setLevel(logging.WARNING) diff --git a/tests/test_alias_fields.py b/tests/test_alias_fields.py index 0039fa6..8ddcc3c 100644 --- a/tests/test_alias_fields.py +++ b/tests/test_alias_fields.py @@ -1,11 +1,11 @@ import unittest from datetime import date -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model, NO_VALUE -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.funcs import F +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model, NO_VALUE +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.funcs import F class AliasFieldsTest(unittest.TestCase): diff --git a/tests/test_array_fields.py b/tests/test_array_fields.py index b0b18a2..20972be 100644 --- a/tests/test_array_fields.py +++ b/tests/test_array_fields.py @@ -1,10 +1,10 @@ import unittest from datetime import date -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * class ArrayFieldsTest(unittest.TestCase): @@ -47,7 +47,7 @@ class ArrayFieldsTest(unittest.TestCase): instance.arr_int = value def test_parse_array(self): - from infi.clickhouse_orm.utils import parse_array, unescape + from clickhouse_orm.utils import parse_array, unescape self.assertEqual(parse_array("[]"), []) self.assertEqual(parse_array("[1, 2, 395, -44]"), ["1", "2", "395", "-44"]) self.assertEqual(parse_array("['big','mouse','','!']"), ["big", "mouse", "", "!"]) diff --git a/tests/test_buffer.py b/tests/test_buffer.py index 14cc59a..71dafea 100644 --- a/tests/test_buffer.py +++ b/tests/test_buffer.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import unittest -from infi.clickhouse_orm.models import BufferModel -from infi.clickhouse_orm.engines import * +from clickhouse_orm.models import BufferModel +from clickhouse_orm.engines import * from .base_test_with_data import * diff --git a/tests/test_compressed_fields.py b/tests/test_compressed_fields.py index 440e0b3..c4020f2 100644 --- a/tests/test_compressed_fields.py +++ b/tests/test_compressed_fields.py @@ -2,11 +2,11 @@ import unittest import datetime import pytz -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model, NO_VALUE -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.utils import parse_tsv +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model, NO_VALUE +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.utils import parse_tsv class CompressedFieldsTestCase(unittest.TestCase): diff --git a/tests/test_custom_fields.py b/tests/test_custom_fields.py index 641da27..fee6730 100644 --- a/tests/test_custom_fields.py +++ b/tests/test_custom_fields.py @@ -1,8 +1,8 @@ import unittest -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.fields import Field, Int16Field -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.engines import Memory +from clickhouse_orm.database import Database +from clickhouse_orm.fields import Field, Int16Field +from clickhouse_orm.models import Model +from clickhouse_orm.engines import Memory class CustomFieldsTest(unittest.TestCase): diff --git a/tests/test_database.py b/tests/test_database.py index 44971e1..8958ff4 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -2,12 +2,12 @@ import unittest import datetime -from infi.clickhouse_orm.database import ServerError, DatabaseException -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.engines import Memory -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.funcs import F -from infi.clickhouse_orm.query import Q +from clickhouse_orm.database import ServerError, DatabaseException +from clickhouse_orm.models import Model +from clickhouse_orm.engines import Memory +from clickhouse_orm.fields import * +from clickhouse_orm.funcs import F +from clickhouse_orm.query import Q from .base_test_with_data import * @@ -249,7 +249,7 @@ class DatabaseTestCase(TestCaseWithData): def test_create_ad_hoc_field(self): # Tests that create_ad_hoc_field works for all column types in the database - from infi.clickhouse_orm.models import ModelBase + from clickhouse_orm.models import ModelBase query = "SELECT DISTINCT type FROM system.columns" for row in self.database.select(query): if row.type.startswith('Map'): diff --git a/tests/test_datetime_fields.py b/tests/test_datetime_fields.py index 6c30ffb..a8783bf 100644 --- a/tests/test_datetime_fields.py +++ b/tests/test_datetime_fields.py @@ -2,10 +2,10 @@ import unittest import datetime import pytz -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * class DateFieldsTest(unittest.TestCase): diff --git a/tests/test_decimal_fields.py b/tests/test_decimal_fields.py index 622c6d6..f26fe26 100644 --- a/tests/test_decimal_fields.py +++ b/tests/test_decimal_fields.py @@ -2,10 +2,10 @@ import unittest from decimal import Decimal -from infi.clickhouse_orm.database import Database, ServerError -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database, ServerError +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * class DecimalFieldsTest(unittest.TestCase): diff --git a/tests/test_enum_fields.py b/tests/test_enum_fields.py index 9ad4cdb..f53ce69 100644 --- a/tests/test_enum_fields.py +++ b/tests/test_enum_fields.py @@ -1,9 +1,9 @@ import unittest -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * from enum import Enum diff --git a/tests/test_fixed_string_fields.py b/tests/test_fixed_string_fields.py index a29f3ca..6b548a1 100644 --- a/tests/test_fixed_string_fields.py +++ b/tests/test_fixed_string_fields.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import unittest -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * class FixedStringFieldsTest(unittest.TestCase): diff --git a/tests/test_funcs.py b/tests/test_funcs.py index a262e83..fb250e6 100644 --- a/tests/test_funcs.py +++ b/tests/test_funcs.py @@ -7,9 +7,9 @@ from ipaddress import IPv4Address, IPv6Address import logging from decimal import Decimal -from infi.clickhouse_orm.database import ServerError -from infi.clickhouse_orm.utils import NO_VALUE -from infi.clickhouse_orm.funcs import F +from clickhouse_orm.database import ServerError +from clickhouse_orm.utils import NO_VALUE +from clickhouse_orm.funcs import F class FuncsTestCase(TestCaseWithData): diff --git a/tests/test_inheritance.py b/tests/test_inheritance.py index 705a9b7..e15899f 100644 --- a/tests/test_inheritance.py +++ b/tests/test_inheritance.py @@ -2,10 +2,10 @@ import unittest import datetime import pytz -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * class InheritanceTestCase(unittest.TestCase): diff --git a/tests/test_ip_fields.py b/tests/test_ip_fields.py index 220aa1b..34301df 100644 --- a/tests/test_ip_fields.py +++ b/tests/test_ip_fields.py @@ -1,9 +1,9 @@ import unittest from ipaddress import IPv4Address, IPv6Address -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.fields import Int16Field, IPv4Field, IPv6Field -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.engines import Memory +from clickhouse_orm.database import Database +from clickhouse_orm.fields import Int16Field, IPv4Field, IPv6Field +from clickhouse_orm.models import Model +from clickhouse_orm.engines import Memory class IPFieldsTest(unittest.TestCase): diff --git a/tests/test_materialized_fields.py b/tests/test_materialized_fields.py index 8893229..93a9ee0 100644 --- a/tests/test_materialized_fields.py +++ b/tests/test_materialized_fields.py @@ -1,11 +1,11 @@ import unittest from datetime import date -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model, NO_VALUE -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.funcs import F +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model, NO_VALUE +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.funcs import F class MaterializedFieldsTest(unittest.TestCase): diff --git a/tests/test_migrations.py b/tests/test_migrations.py index d00357a..faaf4e5 100644 --- a/tests/test_migrations.py +++ b/tests/test_migrations.py @@ -1,10 +1,10 @@ import unittest -from infi.clickhouse_orm.database import Database, ServerError -from infi.clickhouse_orm.models import Model, BufferModel, Constraint, Index -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.migrations import MigrationHistory +from clickhouse_orm.database import Database, ServerError +from clickhouse_orm.models import Model, BufferModel, Constraint, Index +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.migrations import MigrationHistory from enum import Enum # Add tests to path so that migrations will be importable diff --git a/tests/test_models.py b/tests/test_models.py index 579c2dd..10d8b77 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -2,10 +2,10 @@ import unittest import datetime import pytz -from infi.clickhouse_orm.models import Model, NO_VALUE -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.funcs import F +from clickhouse_orm.models import Model, NO_VALUE +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.funcs import F class ModelTestCase(unittest.TestCase): diff --git a/tests/test_nullable_fields.py b/tests/test_nullable_fields.py index ab7a777..a0357ac 100644 --- a/tests/test_nullable_fields.py +++ b/tests/test_nullable_fields.py @@ -1,11 +1,11 @@ import unittest import pytz -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.utils import comma_join +from clickhouse_orm.database import Database +from clickhouse_orm.models import Model +from clickhouse_orm.fields import * +from clickhouse_orm.engines import * +from clickhouse_orm.utils import comma_join from datetime import date, datetime diff --git a/tests/test_querysets.py b/tests/test_querysets.py index f458370..ec81c6a 100644 --- a/tests/test_querysets.py +++ b/tests/test_querysets.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import unittest -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.query import Q -from infi.clickhouse_orm.funcs import F +from clickhouse_orm.database import Database +from clickhouse_orm.query import Q +from clickhouse_orm.funcs import F from .base_test_with_data import * from datetime import date, datetime from enum import Enum diff --git a/tests/test_readonly.py b/tests/test_readonly.py index bc9b252..e136b9a 100644 --- a/tests/test_readonly.py +++ b/tests/test_readonly.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from infi.clickhouse_orm.database import DatabaseException, ServerError +from clickhouse_orm.database import DatabaseException, ServerError from .base_test_with_data import * diff --git a/tests/test_server_errors.py b/tests/test_server_errors.py index 60fbd2b..578ae9d 100644 --- a/tests/test_server_errors.py +++ b/tests/test_server_errors.py @@ -1,6 +1,6 @@ import unittest -from infi.clickhouse_orm.database import ServerError +from clickhouse_orm.database import ServerError class ServerErrorTest(unittest.TestCase): diff --git a/tests/test_simple_fields.py b/tests/test_simple_fields.py index 247e096..d87dcbc 100644 --- a/tests/test_simple_fields.py +++ b/tests/test_simple_fields.py @@ -1,5 +1,5 @@ import unittest -from infi.clickhouse_orm.fields import * +from clickhouse_orm.fields import * from datetime import date, datetime import pytz diff --git a/tests/test_system_models.py b/tests/test_system_models.py index 5d3a862..77a2b78 100644 --- a/tests/test_system_models.py +++ b/tests/test_system_models.py @@ -3,11 +3,11 @@ from datetime import date import os -from infi.clickhouse_orm.database import Database, DatabaseException -from infi.clickhouse_orm.engines import * -from infi.clickhouse_orm.fields import * -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.system_models import SystemPart +from clickhouse_orm.database import Database, DatabaseException +from clickhouse_orm.engines import * +from clickhouse_orm.fields import * +from clickhouse_orm.models import Model +from clickhouse_orm.system_models import SystemPart class SystemTest(unittest.TestCase): diff --git a/tests/test_uuid_fields.py b/tests/test_uuid_fields.py index 284d8f5..90e5acd 100644 --- a/tests/test_uuid_fields.py +++ b/tests/test_uuid_fields.py @@ -1,9 +1,9 @@ import unittest from uuid import UUID -from infi.clickhouse_orm.database import Database -from infi.clickhouse_orm.fields import Int16Field, UUIDField -from infi.clickhouse_orm.models import Model -from infi.clickhouse_orm.engines import Memory +from clickhouse_orm.database import Database +from clickhouse_orm.fields import Int16Field, UUIDField +from clickhouse_orm.models import Model +from clickhouse_orm.engines import Memory class UUIDFieldsTest(unittest.TestCase): diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 81299c8..0000000 --- a/tox.ini +++ /dev/null @@ -1,12 +0,0 @@ -[tox] -envlist = py27, py35, pypy - -[testenv] -deps = - nose - flake8 - -commands = - {envpython} -m compileall -q src/ tests/ - # {envbindir}/flake8 src/ tests/ --max-line-length=120 - nosetests -v {posargs}