simplify

Author: apolukhin

.github/workflows/ci-conan.yml

@@ -86,21 +86,23 @@ jobs:
                       | sudo tee -a /etc/apt/sources.list.d/mongodb-org-7.0.list
 
                 sudo DEBIAN_FRONTEND=noninteractive apt update
-                sudo DEBIAN_FRONTEND=noninteractive apt install -y postgresql redis mongodb-org mongodb-mongosh locales
+                sudo DEBIAN_FRONTEND=noninteractive apt install -y postgresql libpq-dev redis mongodb-org mongodb-mongosh locales
                 ${{ matrix.container && 'sudo locale-gen en_US.UTF-8' }}
                 ${{ matrix.container && 'update-locale LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8"' }}
                 sudo ./scripts/kafka/ubuntu_install_kafka.sh
                 sudo ./scripts/rabbitmq/ubuntu_install_rabbitmq_server.sh
 
           - name: Test userver conan package
             run: |-
+                mv libraries/easy/samples/1_hi samples/
                 mv libraries/easy/samples/3_json samples/
                 mv scripts/tests/conanfile.py samples/
                 rm -rf userver/cmake/
                 cd samples/
 
                 USERVER_VERSION=$(${{ matrix.container && 'sudo -u test-user' }} conan list -c -v quiet userver/* | tail -n 1 | tr -d ' ')
                 for SAMPLE in \
+                    1_hi \
                     3_json \
                     chaotic_service \
                     embedded_files \

conanfile.py

@@ -240,9 +240,9 @@ def generate(self):
     def build(self):
         # pg_config is required to build psycopg2 from source without system package.
         # However, this approach fails on later stage, when venv for tests is built.
-        # libpq = self.dependencies["libpq"]
-        # if libpq:
-        #     os.environ["PATH"] = os.environ["PATH"] + ":" + libpq.package_folder+ "/bin"
+        libpq = self.dependencies["libpq"]
+        if libpq:
+            os.environ["PATH"] = os.environ["PATH"] + ":" + libpq.package_folder+ "/bin"
 
         cmake = CMake(self)
         cmake.configure()
@@ -259,9 +259,23 @@ def package_info(self):
 
     def system_requirements(self):
         if self.options.with_postgresql:
-            # pg_config is required to build psycopg2 python module from source at
-            # testsuite venv creation during functional testing of user code.
-            package_manager.Apt(self).install(['libpq-dev'])
-            package_manager.Yum(self).install(['libpq-devel'])
-            package_manager.PacMan(self).install(['libpq-dev'])
-            package_manager.Zypper(self).install(['libpq-devel'])
+            self.output.warning(
+                'Testing services linked with userver::postgresql require '
+                'PostgreSQL database and libpq-dev* packages installed in your system',
+            )
+        if self.options.with_kafka:
+            self.output.warning(
+                'Testing services linked with userver::kafka require Kafka installed in your system',
+            )
+        if self.options.with_mongodb:
+            self.output.warning(
+                'Testing services linked with userver::mongo require MongoDB installed in your system',
+            )
+        if self.options.with_redis:
+            self.output.warning(
+                'Testing services linked with userver::redis require RedisDB installed in your system',
+            )
+        if self.options.with_clickhouse:
+            self.output.warning(
+                'Testing services linked with userver::clickhouse require ClickHouse installed in your system',
+            )