From 9fc19570b4251581af08510393978c19fd0b62ff Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Tue, 2 Jan 2024 20:03:49 +0000 Subject: [PATCH 01/13] setup.py: make packaging not broken --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 6d0fac7e..c2d33d10 100644 --- a/setup.py +++ b/setup.py @@ -21,8 +21,7 @@ install_requires=[ 'six==1.11.0' ], - package_dir={"": "bin"}, - packages=setuptools.find_packages(where="bin"), + packages=setuptools.find_packages(exclude="test"), entry_points={ 'console_scripts': [ 'q = bin.q:run_standalone' From ef7fe6b2f502b80d7ef2202add5bbb91a1bbcc4e Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Tue, 2 Jan 2024 23:52:17 +0000 Subject: [PATCH 02/13] Dont exclude test dir --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c2d33d10..5f99a765 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ install_requires=[ 'six==1.11.0' ], - packages=setuptools.find_packages(exclude="test"), + packages=setuptools.find_packages(), entry_points={ 'console_scripts': [ 'q = bin.q:run_standalone' From e5cf0cb338eac6cd686481b19e60eb5168c605de Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Wed, 3 Jan 2024 00:14:18 +0000 Subject: [PATCH 03/13] Revert "Dont exclude test dir" This reverts commit ef7fe6b2f502b80d7ef2202add5bbb91a1bbcc4e. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5f99a765..c2d33d10 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ install_requires=[ 'six==1.11.0' ], - packages=setuptools.find_packages(), + packages=setuptools.find_packages(exclude="test"), entry_points={ 'console_scripts': [ 'q = bin.q:run_standalone' From a5adb52d0e3e83d00c274c0e6b0aed873373d50a Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Wed, 3 Jan 2024 00:16:25 +0000 Subject: [PATCH 04/13] exclude the test properly --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c2d33d10..eb8138a5 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ install_requires=[ 'six==1.11.0' ], - packages=setuptools.find_packages(exclude="test"), + packages=setuptools.find_packages(exclude=["test", "test/*"]), entry_points={ 'console_scripts': [ 'q = bin.q:run_standalone' From f6bce5f42b5c2acd73e843cbd408313424cd110a Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Wed, 3 Jan 2024 16:31:37 +0000 Subject: [PATCH 05/13] move test inside of bin and rename to tests --- {test => bin/tests}/BENCHMARK.md | 0 {test => bin/tests}/__init__.py | 0 .../2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results | 0 .../2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results | 0 .../2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results | 0 .../2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results | 0 .../2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results | 0 .../2020-09-17-v2.0.17/summary.benchmark-results | 0 .../2020-09-17-v2.0.17/textql_2.0.3.benchmark-results | 0 {test => bin/tests}/test_suite.py | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {test => bin/tests}/BENCHMARK.md (100%) rename {test => bin/tests}/__init__.py (100%) rename {test => bin/tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results (100%) rename {test => bin/tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results (100%) rename {test => bin/tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results (100%) rename {test => bin/tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results (100%) rename {test => bin/tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results (100%) rename {test => bin/tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results (100%) rename {test => bin/tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results (100%) rename {test => bin/tests}/test_suite.py (100%) diff --git a/test/BENCHMARK.md b/bin/tests/BENCHMARK.md similarity index 100% rename from test/BENCHMARK.md rename to bin/tests/BENCHMARK.md diff --git a/test/__init__.py b/bin/tests/__init__.py similarity index 100% rename from test/__init__.py rename to bin/tests/__init__.py diff --git a/test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results b/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results similarity index 100% rename from test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results rename to bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results diff --git a/test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results b/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results similarity index 100% rename from test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results rename to bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results diff --git a/test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results b/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results similarity index 100% rename from test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results rename to bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results diff --git a/test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results b/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results similarity index 100% rename from test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results rename to bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results diff --git a/test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results b/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results similarity index 100% rename from test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results rename to bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results diff --git a/test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results b/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results similarity index 100% rename from test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results rename to bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results diff --git a/test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results b/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results similarity index 100% rename from test/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results rename to bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results diff --git a/test/test_suite.py b/bin/tests/test_suite.py similarity index 100% rename from test/test_suite.py rename to bin/tests/test_suite.py From fd6966105b1b8f6326b62ea4b1fc642c9e074b10 Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Wed, 3 Jan 2024 16:31:48 +0000 Subject: [PATCH 06/13] dont exclude tests --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index eb8138a5..5f99a765 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ install_requires=[ 'six==1.11.0' ], - packages=setuptools.find_packages(exclude=["test", "test/*"]), + packages=setuptools.find_packages(), entry_points={ 'console_scripts': [ 'q = bin.q:run_standalone' From 31d7171cdc43f75906f2cb4ea093d7e2f0c4d58f Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Wed, 3 Jan 2024 19:41:44 +0000 Subject: [PATCH 07/13] move example to data folder inside tests --- {examples => bin/tests/data}/EXAMPLES.markdown | 0 {examples => bin/tests/data}/exampledatafile | 0 {examples => bin/tests/data}/group-emails-example | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {examples => bin/tests/data}/EXAMPLES.markdown (100%) rename {examples => bin/tests/data}/exampledatafile (100%) rename {examples => bin/tests/data}/group-emails-example (100%) diff --git a/examples/EXAMPLES.markdown b/bin/tests/data/EXAMPLES.markdown similarity index 100% rename from examples/EXAMPLES.markdown rename to bin/tests/data/EXAMPLES.markdown diff --git a/examples/exampledatafile b/bin/tests/data/exampledatafile similarity index 100% rename from examples/exampledatafile rename to bin/tests/data/exampledatafile diff --git a/examples/group-emails-example b/bin/tests/data/group-emails-example similarity index 100% rename from examples/group-emails-example rename to bin/tests/data/group-emails-example From db18f043c4b0d6413cf4e9f24d8e80d5bbbdac6f Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Wed, 3 Jan 2024 19:42:00 +0000 Subject: [PATCH 08/13] adjust path to example data --- bin/tests/test_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/test_suite.py b/bin/tests/test_suite.py index aaa7476f..d432b827 100755 --- a/bin/tests/test_suite.py +++ b/bin/tests/test_suite.py @@ -47,7 +47,7 @@ # make sure that the output is correctly encoded SYSTEM_ENCODING = locale.getpreferredencoding() -EXAMPLES = os.path.abspath(os.path.join(os.getcwd(), 'examples')) +EXAMPLES = os.path.join(os.path.dirname(__file__), 'data') Q_EXECUTABLE = os.getenv('Q_EXECUTABLE', os.path.abspath('./bin/q.py')) Q_SKIP_EXECUTABLE_VALIDATION = os.getenv('Q_SKIP_EXECUTABLE_VALIDATION','false') From 968ff5a38d70031619c9a3a5240eb2c6e2fa8b55 Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Wed, 3 Jan 2024 19:43:41 +0000 Subject: [PATCH 09/13] add package_data to the setup.py --- setup.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py index 5f99a765..2ed49e11 100644 --- a/setup.py +++ b/setup.py @@ -26,5 +26,10 @@ 'console_scripts': [ 'q = bin.q:run_standalone' ] + }, + package_data={ + 'bin': [ + 'tests/data/*' + ] } ) From a6355c999b1b08ab643bb17b77704a2471ed72e5 Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Fri, 5 Jan 2024 13:09:31 +0000 Subject: [PATCH 10/13] add pytest to requirements --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 2ed49e11..9a219f27 100644 --- a/setup.py +++ b/setup.py @@ -18,9 +18,8 @@ long_description=long_description, long_description_content_type="text/markdown", author_email='harelba@gmail.com', - install_requires=[ - 'six==1.11.0' - ], + install_requires=['six==1.11.0'], + tests_require=['pytest'], packages=setuptools.find_packages(), entry_points={ 'console_scripts': [ From 9827645cbb6e634d9619c76f5853c3291b2e97cd Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Wed, 10 Jan 2024 10:45:54 +0100 Subject: [PATCH 11/13] move code into src folder and rename bin as q. update setup.py accordingly --- setup.py | 16 ++++++++-------- {bin => src/q}/.qrc | 0 {bin => src/q}/__init__.py | 0 {bin => src/q}/q.bat | 0 {bin => src/q}/q.py | 0 {bin => src/q}/tests/BENCHMARK.md | 0 {bin => src/q}/tests/__init__.py | 0 .../octosql_v0.3.0.benchmark-results | 0 .../q-benchmark-2.7.18.benchmark-results | 0 .../q-benchmark-3.6.4.benchmark-results | 0 .../q-benchmark-3.7.9.benchmark-results | 0 .../q-benchmark-3.8.5.benchmark-results | 0 .../2020-09-17-v2.0.17/summary.benchmark-results | 0 .../textql_2.0.3.benchmark-results | 0 {bin => src/q}/tests/data/EXAMPLES.markdown | 0 {bin => src/q}/tests/data/exampledatafile | 0 {bin => src/q}/tests/data/group-emails-example | 0 {bin => src/q}/tests/test_suite.py | 2 +- 18 files changed, 9 insertions(+), 9 deletions(-) rename {bin => src/q}/.qrc (100%) rename {bin => src/q}/__init__.py (100%) rename {bin => src/q}/q.bat (100%) rename {bin => src/q}/q.py (100%) rename {bin => src/q}/tests/BENCHMARK.md (100%) rename {bin => src/q}/tests/__init__.py (100%) rename {bin => src/q}/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results (100%) rename {bin => src/q}/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results (100%) rename {bin => src/q}/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results (100%) rename {bin => src/q}/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results (100%) rename {bin => src/q}/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results (100%) rename {bin => src/q}/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results (100%) rename {bin => src/q}/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results (100%) rename {bin => src/q}/tests/data/EXAMPLES.markdown (100%) rename {bin => src/q}/tests/data/exampledatafile (100%) rename {bin => src/q}/tests/data/group-emails-example (100%) rename {bin => src/q}/tests/test_suite.py (99%) diff --git a/setup.py b/setup.py index 9a219f27..d4358ae5 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,5 @@ #!/usr/bin/env python - -from setuptools import setup -import setuptools +from setuptools import setup, find_packages q_version = '3.1.6' @@ -18,17 +16,19 @@ long_description=long_description, long_description_content_type="text/markdown", author_email='harelba@gmail.com', - install_requires=['six==1.11.0'], + install_requires=['six'], + python_requires="<3.11", tests_require=['pytest'], - packages=setuptools.find_packages(), + packages=find_packages("src"), + package_dir={"": "src"}, entry_points={ 'console_scripts': [ - 'q = bin.q:run_standalone' + 'q = q.q:run_standalone' ] }, package_data={ - 'bin': [ - 'tests/data/*' + "q.tests": [ + 'data/*' ] } ) diff --git a/bin/.qrc b/src/q/.qrc similarity index 100% rename from bin/.qrc rename to src/q/.qrc diff --git a/bin/__init__.py b/src/q/__init__.py similarity index 100% rename from bin/__init__.py rename to src/q/__init__.py diff --git a/bin/q.bat b/src/q/q.bat similarity index 100% rename from bin/q.bat rename to src/q/q.bat diff --git a/bin/q.py b/src/q/q.py similarity index 100% rename from bin/q.py rename to src/q/q.py diff --git a/bin/tests/BENCHMARK.md b/src/q/tests/BENCHMARK.md similarity index 100% rename from bin/tests/BENCHMARK.md rename to src/q/tests/BENCHMARK.md diff --git a/bin/tests/__init__.py b/src/q/tests/__init__.py similarity index 100% rename from bin/tests/__init__.py rename to src/q/tests/__init__.py diff --git a/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results b/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results similarity index 100% rename from bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results rename to src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results diff --git a/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results b/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results similarity index 100% rename from bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results rename to src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results diff --git a/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results b/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results similarity index 100% rename from bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results rename to src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results diff --git a/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results b/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results similarity index 100% rename from bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results rename to src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results diff --git a/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results b/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results similarity index 100% rename from bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results rename to src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results diff --git a/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results b/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results similarity index 100% rename from bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results rename to src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results diff --git a/bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results b/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results similarity index 100% rename from bin/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results rename to src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results diff --git a/bin/tests/data/EXAMPLES.markdown b/src/q/tests/data/EXAMPLES.markdown similarity index 100% rename from bin/tests/data/EXAMPLES.markdown rename to src/q/tests/data/EXAMPLES.markdown diff --git a/bin/tests/data/exampledatafile b/src/q/tests/data/exampledatafile similarity index 100% rename from bin/tests/data/exampledatafile rename to src/q/tests/data/exampledatafile diff --git a/bin/tests/data/group-emails-example b/src/q/tests/data/group-emails-example similarity index 100% rename from bin/tests/data/group-emails-example rename to src/q/tests/data/group-emails-example diff --git a/bin/tests/test_suite.py b/src/q/tests/test_suite.py similarity index 99% rename from bin/tests/test_suite.py rename to src/q/tests/test_suite.py index d432b827..c929edaa 100755 --- a/bin/tests/test_suite.py +++ b/src/q/tests/test_suite.py @@ -41,7 +41,7 @@ import collections sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])),'..','bin')) -from bin.q import QTextAsData, QOutput, QOutputPrinter, QInputParams, DataStream, Sqlite3DB +from q.q import QTextAsData, QOutput, QOutputPrinter, QInputParams, DataStream, Sqlite3DB # q uses this encoding as the default output encoding. Some of the tests use it in order to # make sure that the output is correctly encoded From d16b3358a6cdf536332d75ed195010f632349a3f Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Wed, 17 Jan 2024 11:11:03 +0100 Subject: [PATCH 12/13] Moved tests outside of package. --- {src/q/tests => tests}/BENCHMARK.md | 0 {src/q/tests => tests}/__init__.py | 0 .../2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results | 0 .../2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results | 0 .../2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results | 0 .../2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results | 0 .../2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results | 0 .../2020-09-17-v2.0.17/summary.benchmark-results | 0 .../2020-09-17-v2.0.17/textql_2.0.3.benchmark-results | 0 {src/q/tests => tests}/data/EXAMPLES.markdown | 0 {src/q/tests => tests}/data/exampledatafile | 0 {src/q/tests => tests}/data/group-emails-example | 0 {src/q/tests => tests}/test_suite.py | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename {src/q/tests => tests}/BENCHMARK.md (100%) rename {src/q/tests => tests}/__init__.py (100%) rename {src/q/tests => tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results (100%) rename {src/q/tests => tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results (100%) rename {src/q/tests => tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results (100%) rename {src/q/tests => tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results (100%) rename {src/q/tests => tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results (100%) rename {src/q/tests => tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results (100%) rename {src/q/tests => tests}/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results (100%) rename {src/q/tests => tests}/data/EXAMPLES.markdown (100%) rename {src/q/tests => tests}/data/exampledatafile (100%) rename {src/q/tests => tests}/data/group-emails-example (100%) rename {src/q/tests => tests}/test_suite.py (100%) diff --git a/src/q/tests/BENCHMARK.md b/tests/BENCHMARK.md similarity index 100% rename from src/q/tests/BENCHMARK.md rename to tests/BENCHMARK.md diff --git a/src/q/tests/__init__.py b/tests/__init__.py similarity index 100% rename from src/q/tests/__init__.py rename to tests/__init__.py diff --git a/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results b/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results similarity index 100% rename from src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results rename to tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/octosql_v0.3.0.benchmark-results diff --git a/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results b/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results similarity index 100% rename from src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results rename to tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-2.7.18.benchmark-results diff --git a/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results b/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results similarity index 100% rename from src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results rename to tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.6.4.benchmark-results diff --git a/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results b/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results similarity index 100% rename from src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results rename to tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.7.9.benchmark-results diff --git a/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results b/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results similarity index 100% rename from src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results rename to tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/q-benchmark-3.8.5.benchmark-results diff --git a/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results b/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results similarity index 100% rename from src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results rename to tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/summary.benchmark-results diff --git a/src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results b/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results similarity index 100% rename from src/q/tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results rename to tests/benchmark-results/source-files-1443b7418b46594ad256abd9db4a7671cb251e6a/2020-09-17-v2.0.17/textql_2.0.3.benchmark-results diff --git a/src/q/tests/data/EXAMPLES.markdown b/tests/data/EXAMPLES.markdown similarity index 100% rename from src/q/tests/data/EXAMPLES.markdown rename to tests/data/EXAMPLES.markdown diff --git a/src/q/tests/data/exampledatafile b/tests/data/exampledatafile similarity index 100% rename from src/q/tests/data/exampledatafile rename to tests/data/exampledatafile diff --git a/src/q/tests/data/group-emails-example b/tests/data/group-emails-example similarity index 100% rename from src/q/tests/data/group-emails-example rename to tests/data/group-emails-example diff --git a/src/q/tests/test_suite.py b/tests/test_suite.py similarity index 100% rename from src/q/tests/test_suite.py rename to tests/test_suite.py From 77ab05c675759373330af6c2d929af20dfa91e03 Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau Date: Wed, 17 Jan 2024 11:27:57 +0100 Subject: [PATCH 13/13] remove package_data filed from setup.py --- setup.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup.py b/setup.py index d4358ae5..2634e130 100644 --- a/setup.py +++ b/setup.py @@ -25,10 +25,5 @@ 'console_scripts': [ 'q = q.q:run_standalone' ] - }, - package_data={ - "q.tests": [ - 'data/*' - ] } )