Move confluent_kafka/ to src/ to avoid pytest/tox picking up the loca…

…l dir .. rather than the installed module. Should once and for all eliminate the "ImportError: .. confluent_kafka.cimpl" problems.
th0ger · Oct 26, 2020 · b96bc1d · b96bc1d
1 parent 69ec887
commit b96bc1d
Show file tree

Hide file tree

Showing 37 changed files with 4 additions and 3 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
 include README.md
 include LICENSE.txt
 include test-requirements.txt
-include confluent_kafka/src/*.[ch]
+include src/confluent_kafka/src/*.[ch]
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 import platform
 
 work_dir = os.path.dirname(os.path.realpath(__file__))
-mod_dir = os.path.join(work_dir, 'confluent_kafka')
+mod_dir = os.path.join(work_dir, 'src', 'confluent_kafka')
 ext_dir = os.path.join(mod_dir, 'src')
 
 INSTALL_REQUIRES = [
@@ -70,7 +70,8 @@ def get_install_requirements(path):
       author_email='[email protected]',
       url='https://github.com/confluentinc/confluent-kafka-python',
       ext_modules=[module],
-      packages=find_packages(exclude=("tests", "tests.*")),
+      packages=find_packages('src'),
+      package_dir={'': 'src'},
       data_files=[('', [os.path.join(work_dir, 'LICENSE.txt')])],
       install_requires=INSTALL_REQUIRES,
       extras_require={

diff --git a/confluent_kafka/__init__.py → src/confluent_kafka/__init__.py b/confluent_kafka/__init__.py → src/confluent_kafka/__init__.py
diff --git a/confluent_kafka/admin/__init__.py → src/confluent_kafka/admin/__init__.py b/confluent_kafka/admin/__init__.py → src/confluent_kafka/admin/__init__.py
diff --git a/confluent_kafka/avro/__init__.py → src/confluent_kafka/avro/__init__.py b/confluent_kafka/avro/__init__.py → src/confluent_kafka/avro/__init__.py
diff --git a/...fka/avro/cached_schema_registry_client.py → ...fka/avro/cached_schema_registry_client.py b/...fka/avro/cached_schema_registry_client.py → ...fka/avro/cached_schema_registry_client.py
diff --git a/confluent_kafka/avro/error.py → src/confluent_kafka/avro/error.py b/confluent_kafka/avro/error.py → src/confluent_kafka/avro/error.py
diff --git a/confluent_kafka/avro/load.py → src/confluent_kafka/avro/load.py b/confluent_kafka/avro/load.py → src/confluent_kafka/avro/load.py
diff --git a/confluent_kafka/avro/requirements.txt → src/confluent_kafka/avro/requirements.txt b/confluent_kafka/avro/requirements.txt → src/confluent_kafka/avro/requirements.txt
diff --git a/confluent_kafka/avro/serializer/__init__.py → ...nfluent_kafka/avro/serializer/__init__.py b/confluent_kafka/avro/serializer/__init__.py → ...nfluent_kafka/avro/serializer/__init__.py
diff --git a/...fka/avro/serializer/message_serializer.py → ...fka/avro/serializer/message_serializer.py b/...fka/avro/serializer/message_serializer.py → ...fka/avro/serializer/message_serializer.py
diff --git a/confluent_kafka/deserializing_consumer.py → ...confluent_kafka/deserializing_consumer.py b/confluent_kafka/deserializing_consumer.py → ...confluent_kafka/deserializing_consumer.py
diff --git a/confluent_kafka/error.py → src/confluent_kafka/error.py b/confluent_kafka/error.py → src/confluent_kafka/error.py
diff --git a/confluent_kafka/kafkatest/README.md → src/confluent_kafka/kafkatest/README.md b/confluent_kafka/kafkatest/README.md → src/confluent_kafka/kafkatest/README.md
diff --git a/confluent_kafka/kafkatest/__init__.py → src/confluent_kafka/kafkatest/__init__.py b/confluent_kafka/kafkatest/__init__.py → src/confluent_kafka/kafkatest/__init__.py
diff --git a/confluent_kafka/kafkatest/deploy.sh → src/confluent_kafka/kafkatest/deploy.sh b/confluent_kafka/kafkatest/deploy.sh → src/confluent_kafka/kafkatest/deploy.sh
diff --git a/confluent_kafka/kafkatest/globals.json → src/confluent_kafka/kafkatest/globals.json b/confluent_kafka/kafkatest/globals.json → src/confluent_kafka/kafkatest/globals.json
diff --git a/...uent_kafka/kafkatest/verifiable_client.py → ...uent_kafka/kafkatest/verifiable_client.py b/...uent_kafka/kafkatest/verifiable_client.py → ...uent_kafka/kafkatest/verifiable_client.py
diff --git a/...nt_kafka/kafkatest/verifiable_consumer.py → ...nt_kafka/kafkatest/verifiable_consumer.py b/...nt_kafka/kafkatest/verifiable_consumer.py → ...nt_kafka/kafkatest/verifiable_consumer.py
diff --git a/...nt_kafka/kafkatest/verifiable_producer.py → ...nt_kafka/kafkatest/verifiable_producer.py b/...nt_kafka/kafkatest/verifiable_producer.py → ...nt_kafka/kafkatest/verifiable_producer.py
diff --git a/confluent_kafka/requirements.txt → src/confluent_kafka/requirements.txt b/confluent_kafka/requirements.txt → src/confluent_kafka/requirements.txt
diff --git a/confluent_kafka/schema_registry/__init__.py → ...nfluent_kafka/schema_registry/__init__.py b/confluent_kafka/schema_registry/__init__.py → ...nfluent_kafka/schema_registry/__init__.py
diff --git a/confluent_kafka/schema_registry/avro.py → src/confluent_kafka/schema_registry/avro.py b/confluent_kafka/schema_registry/avro.py → src/confluent_kafka/schema_registry/avro.py
diff --git a/confluent_kafka/schema_registry/error.py → src/confluent_kafka/schema_registry/error.py b/confluent_kafka/schema_registry/error.py → src/confluent_kafka/schema_registry/error.py
diff --git a/...uent_kafka/schema_registry/json_schema.py → ...uent_kafka/schema_registry/json_schema.py b/...uent_kafka/schema_registry/json_schema.py → ...uent_kafka/schema_registry/json_schema.py
diff --git a/confluent_kafka/schema_registry/protobuf.py → ...nfluent_kafka/schema_registry/protobuf.py b/confluent_kafka/schema_registry/protobuf.py → ...nfluent_kafka/schema_registry/protobuf.py
diff --git a/...nt_kafka/schema_registry/requirements.txt → ...nt_kafka/schema_registry/requirements.txt b/...nt_kafka/schema_registry/requirements.txt → ...nt_kafka/schema_registry/requirements.txt
diff --git a/...schema_registry/schema_registry_client.py → ...schema_registry/schema_registry_client.py b/...schema_registry/schema_registry_client.py → ...schema_registry/schema_registry_client.py
diff --git a/confluent_kafka/serialization/__init__.py → ...confluent_kafka/serialization/__init__.py b/confluent_kafka/serialization/__init__.py → ...confluent_kafka/serialization/__init__.py
diff --git a/confluent_kafka/serializing_producer.py → src/confluent_kafka/serializing_producer.py b/confluent_kafka/serializing_producer.py → src/confluent_kafka/serializing_producer.py
diff --git a/confluent_kafka/src/Admin.c → src/confluent_kafka/src/Admin.c b/confluent_kafka/src/Admin.c → src/confluent_kafka/src/Admin.c
diff --git a/confluent_kafka/src/AdminTypes.c → src/confluent_kafka/src/AdminTypes.c b/confluent_kafka/src/AdminTypes.c → src/confluent_kafka/src/AdminTypes.c
diff --git a/confluent_kafka/src/Consumer.c → src/confluent_kafka/src/Consumer.c b/confluent_kafka/src/Consumer.c → src/confluent_kafka/src/Consumer.c
diff --git a/confluent_kafka/src/Metadata.c → src/confluent_kafka/src/Metadata.c b/confluent_kafka/src/Metadata.c → src/confluent_kafka/src/Metadata.c
diff --git a/confluent_kafka/src/Producer.c → src/confluent_kafka/src/Producer.c b/confluent_kafka/src/Producer.c → src/confluent_kafka/src/Producer.c
diff --git a/confluent_kafka/src/confluent_kafka.c → src/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c → src/confluent_kafka/src/confluent_kafka.c
diff --git a/confluent_kafka/src/confluent_kafka.h → src/confluent_kafka/src/confluent_kafka.h b/confluent_kafka/src/confluent_kafka.h → src/confluent_kafka/src/confluent_kafka.h