From 2e3be5fdbed7e752e9babfc035ce70d285d98e28 Mon Sep 17 00:00:00 2001 From: Alexey Malashkevich Date: Tue, 12 Aug 2014 10:09:39 +0400 Subject: [PATCH 1/5] Fix setup.py --- setup.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 92b10f781..bd63c36de 100644 --- a/setup.py +++ b/setup.py @@ -36,19 +36,15 @@ url = "http://ponyorm.com" lic = "AGPL, Commercial, Free for educational and non-commercial use" -modules = [ - "pony.__init__", - "pony.converting", - "pony.options", - "pony.utils" -] - packages = [ + "pony", "pony.orm", "pony.orm.dbproviders", "pony.orm.examples", + "pony.orm.integration", "pony.orm.tests", - "pony.thirdparty" + "pony.thirdparty", + "pony.thirdparty.compiler" ] download_url = "http://pypi.python.org/pypi/pony/" @@ -71,8 +67,7 @@ def main(): url=url, license=lic, packages=packages, - download_url=download_url, - py_modules=modules + download_url=download_url ) if __name__ == "__main__": From ca0b6daffce4435c062fe8f56354d5805a2a79e1 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovsky Date: Tue, 12 Aug 2014 12:51:43 +0400 Subject: [PATCH 2/5] Reformat long_description text --- setup.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bd63c36de..a8a4f18fa 100644 --- a/setup.py +++ b/setup.py @@ -6,13 +6,21 @@ name = "pony" version = "0.5.2" description = "Pony Object-Relational Mapper" -long_description = """Pony is an object-relational mapper. The most interesting feature of Pony is its ability to write queries to the database using generator expressions. Pony works with entities which are mapped to a SQL database. Using generator syntax for writing queries allows the user to formulate very eloquent queries. It increases the level of abstraction and allows a programmer to concentrate on the business logic of the application. For this purpose Pony analyzes the abstract syntax tree of a generator and translates it to its SQL equivalent. +long_description = """ +Pony is an object-relational mapper. The most interesting feature of Pony is +its ability to write queries to the database using generator expressions. +Pony works with entities which are mapped to a SQL database. Using generator +syntax for writing queries allows the user to formulate very eloquent queries. +It increases the level of abstraction and allows a programmer to concentrate +on the business logic of the application. For this purpose Pony analyzes the +abstract syntax tree of a generator and translates it to its SQL equivalent. Following is an example of a query in Pony: select(p for p in Product if p.name.startswith('A') and p.cost <= 1000) -Pony translates queries to SQL using a specific database dialect. Currently Pony works with SQLite, MySQL, PostgreSQL and Oracle databases. +Pony translates queries to SQL using a specific database dialect. +Currently Pony works with SQLite, MySQL, PostgreSQL and Oracle databases. The package pony.orm.examples contains several examples. Documenation is available at http://ponyorm.com""" From 490f6e30de07e63c258d2bf65b81019aea42aa92 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovsky Date: Tue, 12 Aug 2014 14:11:04 +0400 Subject: [PATCH 3/5] Fix imports in tests --- pony/orm/tests/test_all.py | 72 +++++++++---------- pony/orm/tests/test_collections.py | 5 +- pony/orm/tests/test_crud.py | 5 +- pony/orm/tests/test_crud_raw_sql.py | 3 +- pony/orm/tests/test_db_session.py | 2 +- .../tests/test_declarative_attr_set_monad.py | 3 +- pony/orm/tests/test_declarative_date.py | 3 +- pony/orm/tests/test_declarative_exceptions.py | 3 +- pony/orm/tests/test_declarative_func_monad.py | 3 +- .../test_declarative_join_optimization.py | 3 +- .../tests/test_declarative_method_monad.py | 3 +- .../tests/test_declarative_orderby_limit.py | 3 +- .../tests/test_declarative_query_set_monad.py | 3 +- .../tests/test_declarative_sqltranslator.py | 3 +- .../tests/test_declarative_sqltranslator2.py | 3 +- pony/orm/tests/test_diagram.py | 3 +- pony/orm/tests/test_diagram_attribute.py | 3 +- pony/orm/tests/test_diagram_inheritance.py | 3 +- pony/orm/tests/test_diagram_keys.py | 3 +- pony/orm/tests/test_filter.py | 3 +- pony/orm/tests/test_mapping.py | 3 +- pony/orm/tests/test_query.py | 3 +- pony/orm/tests/test_relations_one2many.py | 3 +- pony/orm/tests/test_relations_one2one2.py | 3 +- .../tests/test_relations_symmetric_one2one.py | 3 +- pony/orm/tests/test_to_dict.py | 4 +- 26 files changed, 87 insertions(+), 64 deletions(-) diff --git a/pony/orm/tests/test_all.py b/pony/orm/tests/test_all.py index 85b41edeb..03e9acc84 100644 --- a/pony/orm/tests/test_all.py +++ b/pony/orm/tests/test_all.py @@ -6,42 +6,42 @@ pony.options.CUT_TRACEBACK = False pony.orm.core.sql_debug(False) -from test_diagram import * -from test_diagram_attribute import * -from test_diagram_inheritance import * -from test_diagram_keys import * -from test_mapping import * -from test_relations_one2one1 import * -from test_relations_one2one2 import * -from test_relations_symmetric_one2one import * -from test_relations_symmetric_m2m import * -from test_relations_one2many import * -from test_relations_m2m import * -from test_crud_raw_sql import * -from test_declarative_attr_set_monad import * -from test_declarative_date import * -from test_declarative_func_monad import * -from test_declarative_join_optimization import * -from test_declarative_method_monad import * -from test_declarative_object_flat_monad import * -from test_declarative_orderby_limit import * -from test_declarative_string_mixin import * -from test_declarative_query_set_monad import * -from test_declarative_sqltranslator import * -from test_declarative_sqltranslator2 import * -from test_declarative_exceptions import * -from test_collections import * -from test_sqlbuilding_formatstyles import * -from test_sqlbuilding_sqlast import * -from test_query import * -from test_frames import * -from test_core_multiset import * -from test_core_find_in_cache import * -from test_db_session import * -from test_lazy import * -from test_filter import * -from test_crud import * -from test_to_dict import * +from pony.orm.tests.test_diagram import * +from pony.orm.tests.test_diagram_attribute import * +from pony.orm.tests.test_diagram_inheritance import * +from pony.orm.tests.test_diagram_keys import * +from pony.orm.tests.test_mapping import * +from pony.orm.tests.test_relations_one2one1 import * +from pony.orm.tests.test_relations_one2one2 import * +from pony.orm.tests.test_relations_symmetric_one2one import * +from pony.orm.tests.test_relations_symmetric_m2m import * +from pony.orm.tests.test_relations_one2many import * +from pony.orm.tests.test_relations_m2m import * +from pony.orm.tests.test_crud_raw_sql import * +from pony.orm.tests.test_declarative_attr_set_monad import * +from pony.orm.tests.test_declarative_date import * +from pony.orm.tests.test_declarative_func_monad import * +from pony.orm.tests.test_declarative_join_optimization import * +from pony.orm.tests.test_declarative_method_monad import * +from pony.orm.tests.test_declarative_object_flat_monad import * +from pony.orm.tests.test_declarative_orderby_limit import * +from pony.orm.tests.test_declarative_string_mixin import * +from pony.orm.tests.test_declarative_query_set_monad import * +from pony.orm.tests.test_declarative_sqltranslator import * +from pony.orm.tests.test_declarative_sqltranslator2 import * +from pony.orm.tests.test_declarative_exceptions import * +from pony.orm.tests.test_collections import * +from pony.orm.tests.test_sqlbuilding_formatstyles import * +from pony.orm.tests.test_sqlbuilding_sqlast import * +from pony.orm.tests.test_query import * +from pony.orm.tests.test_frames import * +from pony.orm.tests.test_core_multiset import * +from pony.orm.tests.test_core_find_in_cache import * +from pony.orm.tests.test_db_session import * +from pony.orm.tests.test_lazy import * +from pony.orm.tests.test_filter import * +from pony.orm.tests.test_crud import * +from pony.orm.tests.test_to_dict import * #from new_tests import * diff --git a/pony/orm/tests/test_collections.py b/pony/orm/tests/test_collections.py index 4695a59b6..5da1d3c03 100644 --- a/pony/orm/tests/test_collections.py +++ b/pony/orm/tests/test_collections.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest -from testutils import raises_exception -from model1 import * + +from pony.orm.tests.testutils import raises_exception +from pony.orm.tests.model1 import * class TestCollections(unittest.TestCase): diff --git a/pony/orm/tests/test_crud.py b/pony/orm/tests/test_crud.py index b4938393e..39b3d22fa 100644 --- a/pony/orm/tests/test_crud.py +++ b/pony/orm/tests/test_crud.py @@ -1,9 +1,10 @@ from __future__ import absolute_import, print_function, division -from decimal import Decimal import unittest +from decimal import Decimal + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_crud_raw_sql.py b/pony/orm/tests/test_crud_raw_sql.py index 49f644138..436d210fe 100644 --- a/pony/orm/tests/test_crud_raw_sql.py +++ b/pony/orm/tests/test_crud_raw_sql.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * -from testutils import raises_exception +from pony.orm.tests.testutils import raises_exception db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_db_session.py b/pony/orm/tests/test_db_session.py index 051b719e5..d24ee4277 100644 --- a/pony/orm/tests/test_db_session.py +++ b/pony/orm/tests/test_db_session.py @@ -6,7 +6,7 @@ from itertools import count from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * class TestDBSession(unittest.TestCase): def setUp(self): diff --git a/pony/orm/tests/test_declarative_attr_set_monad.py b/pony/orm/tests/test_declarative_attr_set_monad.py index 2c9e0d7a5..4f7f855a1 100644 --- a/pony/orm/tests/test_declarative_attr_set_monad.py +++ b/pony/orm/tests/test_declarative_attr_set_monad.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_declarative_date.py b/pony/orm/tests/test_declarative_date.py index 18254331a..451251ccb 100644 --- a/pony/orm/tests/test_declarative_date.py +++ b/pony/orm/tests/test_declarative_date.py @@ -2,8 +2,9 @@ import unittest from datetime import date, datetime + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_declarative_exceptions.py b/pony/orm/tests/test_declarative_exceptions.py index 444ce8bbb..4867a85e8 100644 --- a/pony/orm/tests/test_declarative_exceptions.py +++ b/pony/orm/tests/test_declarative_exceptions.py @@ -3,9 +3,10 @@ import unittest from datetime import date from decimal import Decimal + from pony.orm.core import * from pony.orm.sqltranslation import IncomparableTypesError -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_declarative_func_monad.py b/pony/orm/tests/test_declarative_func_monad.py index 03ceeb177..bc70bec83 100644 --- a/pony/orm/tests/test_declarative_func_monad.py +++ b/pony/orm/tests/test_declarative_func_monad.py @@ -3,9 +3,10 @@ import unittest from datetime import date, datetime from decimal import Decimal + from pony.orm.core import * from pony.orm.sqltranslation import IncomparableTypesError -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_declarative_join_optimization.py b/pony/orm/tests/test_declarative_join_optimization.py index e854092d2..89c14de73 100644 --- a/pony/orm/tests/test_declarative_join_optimization.py +++ b/pony/orm/tests/test_declarative_join_optimization.py @@ -2,8 +2,9 @@ import unittest from datetime import date + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_declarative_method_monad.py b/pony/orm/tests/test_declarative_method_monad.py index fc0ab55d5..e7fd884e6 100644 --- a/pony/orm/tests/test_declarative_method_monad.py +++ b/pony/orm/tests/test_declarative_method_monad.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_declarative_orderby_limit.py b/pony/orm/tests/test_declarative_orderby_limit.py index f1f8b077f..6536c5e98 100644 --- a/pony/orm/tests/test_declarative_orderby_limit.py +++ b/pony/orm/tests/test_declarative_orderby_limit.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_declarative_query_set_monad.py b/pony/orm/tests/test_declarative_query_set_monad.py index 6068a654b..07555ecd0 100644 --- a/pony/orm/tests/test_declarative_query_set_monad.py +++ b/pony/orm/tests/test_declarative_query_set_monad.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_declarative_sqltranslator.py b/pony/orm/tests/test_declarative_sqltranslator.py index 23ca52dcf..199c2901c 100644 --- a/pony/orm/tests/test_declarative_sqltranslator.py +++ b/pony/orm/tests/test_declarative_sqltranslator.py @@ -2,8 +2,9 @@ import unittest from datetime import date + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_declarative_sqltranslator2.py b/pony/orm/tests/test_declarative_sqltranslator2.py index df6353736..016df1fc5 100644 --- a/pony/orm/tests/test_declarative_sqltranslator2.py +++ b/pony/orm/tests/test_declarative_sqltranslator2.py @@ -3,9 +3,10 @@ import unittest from datetime import date from decimal import Decimal + from pony.orm.core import * from pony.orm.sqltranslation import IncomparableTypesError -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_diagram.py b/pony/orm/tests/test_diagram.py index 1bceb0f40..138854885 100644 --- a/pony/orm/tests/test_diagram.py +++ b/pony/orm/tests/test_diagram.py @@ -1,9 +1,10 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * from pony.orm.core import Entity -from testutils import * +from pony.orm.tests.testutils import * class TestDiag(unittest.TestCase): diff --git a/pony/orm/tests/test_diagram_attribute.py b/pony/orm/tests/test_diagram_attribute.py index 1fbee7111..3c6509276 100644 --- a/pony/orm/tests/test_diagram_attribute.py +++ b/pony/orm/tests/test_diagram_attribute.py @@ -1,9 +1,10 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * from pony.orm.core import Attribute -from testutils import * +from pony.orm.tests.testutils import * class TestAttribute(unittest.TestCase): diff --git a/pony/orm/tests/test_diagram_inheritance.py b/pony/orm/tests/test_diagram_inheritance.py index ac986a4df..52e027209 100644 --- a/pony/orm/tests/test_diagram_inheritance.py +++ b/pony/orm/tests/test_diagram_inheritance.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * class TestInheritance(unittest.TestCase): diff --git a/pony/orm/tests/test_diagram_keys.py b/pony/orm/tests/test_diagram_keys.py index 9521778e3..4589fd1ca 100644 --- a/pony/orm/tests/test_diagram_keys.py +++ b/pony/orm/tests/test_diagram_keys.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * class TestKeys(unittest.TestCase): diff --git a/pony/orm/tests/test_filter.py b/pony/orm/tests/test_filter.py index 7eab74960..f6b6724a5 100644 --- a/pony/orm/tests/test_filter.py +++ b/pony/orm/tests/test_filter.py @@ -1,7 +1,8 @@ from __future__ import absolute_import, print_function, division import unittest -from model1 import * + +from pony.orm.tests.model1 import * class TestFilter(unittest.TestCase): def setUp(self): diff --git a/pony/orm/tests/test_mapping.py b/pony/orm/tests/test_mapping.py index 25fa9cf7f..e7a0f6f99 100644 --- a/pony/orm/tests/test_mapping.py +++ b/pony/orm/tests/test_mapping.py @@ -1,9 +1,10 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * from pony.orm.dbschema import DBSchemaError -from testutils import * +from pony.orm.tests.testutils import * class TestColumnsMapping(unittest.TestCase): diff --git a/pony/orm/tests/test_query.py b/pony/orm/tests/test_query.py index 66198a7ac..da58cccc6 100644 --- a/pony/orm/tests/test_query.py +++ b/pony/orm/tests/test_query.py @@ -3,8 +3,9 @@ import unittest from datetime import date from decimal import Decimal + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_relations_one2many.py b/pony/orm/tests/test_relations_one2many.py index dda140708..8d7029b8f 100644 --- a/pony/orm/tests/test_relations_one2many.py +++ b/pony/orm/tests/test_relations_one2many.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest -from testutils import * + from pony.orm.core import * +from pony.orm.tests.testutils import * class TestOneToMany(unittest.TestCase): diff --git a/pony/orm/tests/test_relations_one2one2.py b/pony/orm/tests/test_relations_one2one2.py index 96b98c5f5..83ba7b98a 100644 --- a/pony/orm/tests/test_relations_one2one2.py +++ b/pony/orm/tests/test_relations_one2one2.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_relations_symmetric_one2one.py b/pony/orm/tests/test_relations_symmetric_one2one.py index 9eb843694..7124e9447 100644 --- a/pony/orm/tests/test_relations_symmetric_one2one.py +++ b/pony/orm/tests/test_relations_symmetric_one2one.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, print_function, division import unittest + from pony.orm.core import * -from testutils import raises_exception +from pony.orm.tests.testutils import raises_exception db = Database('sqlite', ':memory:') diff --git a/pony/orm/tests/test_to_dict.py b/pony/orm/tests/test_to_dict.py index 50aad50db..b4cd527a9 100644 --- a/pony/orm/tests/test_to_dict.py +++ b/pony/orm/tests/test_to_dict.py @@ -1,9 +1,9 @@ +import unittest from decimal import Decimal from datetime import date -import unittest from pony.orm import * -from testutils import * +from pony.orm.tests.testutils import * db = Database('sqlite', ':memory:') From 6e715c1c42c8b9ef1945e971a9bbc365d3e08315 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovsky Date: Tue, 12 Aug 2014 13:51:14 +0400 Subject: [PATCH 4/5] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fad053f18..0be777dd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# Pony ORM Release 0.5.3 (2014-08-12) + +This release fixes the setup.py problem that was found after the previous release was uploaded to PyPI. + + # Pony ORM Release 0.5.2 (2014-08-11) This release is a step forward to Python 3 support. While the external API wasn't changed, the internals were significantly refactored to provide forward compatibility with Python 3. From 6847b370f63e2e7d667d42404783570ab1a63bd5 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovsky Date: Tue, 12 Aug 2014 13:54:38 +0400 Subject: [PATCH 5/5] Change Pony ORM version: 0.5.2 -> 0.5.3 --- pony/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pony/__init__.py b/pony/__init__.py index 1288477a8..ce7e526f6 100644 --- a/pony/__init__.py +++ b/pony/__init__.py @@ -4,7 +4,7 @@ from os.path import dirname from itertools import count -__version__ = '0.5.2' +__version__ = '0.5.3' uid = str(random.randint(1, 1000000)) diff --git a/setup.py b/setup.py index a8a4f18fa..9b42c0fa1 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ import sys name = "pony" -version = "0.5.2" +version = "0.5.3" description = "Pony Object-Relational Mapper" long_description = """ Pony is an object-relational mapper. The most interesting feature of Pony is