harelba · Sann5 · Jan 2, 2024 · Jan 2, 2024 · Jan 3, 2024 · Jan 3, 2024
diff --git 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,14 +16,14 @@
     long_description=long_description,
     long_description_content_type="text/markdown",
     author_email='harelba@gmail.com',
-    install_requires=[
-        'six==1.11.0'
-    ],
-    package_dir={"": "bin"},
-    packages=setuptools.find_packages(where="bin"),
+    install_requires=['six'],
+    python_requires="<3.11",
+    tests_require=['pytest'],
+    packages=find_packages("src"),
+    package_dir={"": "src"},
     entry_points={
         'console_scripts': [
-            'q = bin.q:run_standalone'
+            'q = q.q:run_standalone'
         ]
     }
 )
diff --git a/bin/.qrc → src/q/.qrc b/bin/.qrc → src/q/.qrc
diff --git a/bin/__init__.py → src/q/__init__.py b/bin/__init__.py → src/q/__init__.py
diff --git a/bin/q.bat → src/q/q.bat b/bin/q.bat → src/q/q.bat
diff --git a/bin/q.py → src/q/q.py b/bin/q.py → src/q/q.py
diff --git a/test/BENCHMARK.md → tests/BENCHMARK.md b/test/BENCHMARK.md → tests/BENCHMARK.md
diff --git a/test/__init__.py → tests/__init__.py b/test/__init__.py → tests/__init__.py
diff --git a/...-v2.0.17/octosql_v0.3.0.benchmark-results → ...-v2.0.17/octosql_v0.3.0.benchmark-results b/...-v2.0.17/octosql_v0.3.0.benchmark-results → ...-v2.0.17/octosql_v0.3.0.benchmark-results
diff --git a/...0.17/q-benchmark-2.7.18.benchmark-results → ...0.17/q-benchmark-2.7.18.benchmark-results b/...0.17/q-benchmark-2.7.18.benchmark-results → ...0.17/q-benchmark-2.7.18.benchmark-results
diff --git a/....0.17/q-benchmark-3.6.4.benchmark-results → ....0.17/q-benchmark-3.6.4.benchmark-results b/....0.17/q-benchmark-3.6.4.benchmark-results → ....0.17/q-benchmark-3.6.4.benchmark-results
diff --git a/....0.17/q-benchmark-3.7.9.benchmark-results → ....0.17/q-benchmark-3.7.9.benchmark-results b/....0.17/q-benchmark-3.7.9.benchmark-results → ....0.17/q-benchmark-3.7.9.benchmark-results
diff --git a/....0.17/q-benchmark-3.8.5.benchmark-results → ....0.17/q-benchmark-3.8.5.benchmark-results b/....0.17/q-benchmark-3.8.5.benchmark-results → ....0.17/q-benchmark-3.8.5.benchmark-results
diff --git a/...0-09-17-v2.0.17/summary.benchmark-results → ...0-09-17-v2.0.17/summary.benchmark-results b/...0-09-17-v2.0.17/summary.benchmark-results → ...0-09-17-v2.0.17/summary.benchmark-results
diff --git a/...17-v2.0.17/textql_2.0.3.benchmark-results → ...17-v2.0.17/textql_2.0.3.benchmark-results b/...17-v2.0.17/textql_2.0.3.benchmark-results → ...17-v2.0.17/textql_2.0.3.benchmark-results
diff --git a/examples/EXAMPLES.markdown → tests/data/EXAMPLES.markdown b/examples/EXAMPLES.markdown → tests/data/EXAMPLES.markdown
diff --git a/examples/exampledatafile → tests/data/exampledatafile b/examples/exampledatafile → tests/data/exampledatafile
diff --git a/examples/group-emails-example → tests/data/group-emails-example b/examples/group-emails-example → tests/data/group-emails-example
diff --git a/test/test_suite.py → tests/test_suite.py b/test/test_suite.py → tests/test_suite.py
@@ -41,13 +41,13 @@
 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
 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')