chore(ci): testing over Python 3.6, 3.7 and 3.8 (influxdata#54)

bednar · web-flow · commit d0c949a96816 · 2020-01-20T10:55:17.000+01:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,61 +1,63 @@
 version: 2.1
 
 commands:
-  influxdb-restart:
+  influxdb-onboarding:
     steps:
       - run:
-          name: "Start InfluxDB service"
-          command: ./scripts/influxdb-restart.sh
+          name: "Post onBoarding request to InfluxDB 2"
+          command: ./scripts/influxdb-onboarding.sh
   prepare:
     description: "Prepare environment to tests"
     steps:
       - checkout
-      - influxdb-restart
+      - influxdb-onboarding
   client-test:
     description: "Run tests"
     parameters:
-      python-version:
+      python-image:
         type: string
-        default: &default-python-version "3"
     steps:
       - restore_cache:
           name: Restoring Pip Cache
           keys:
-            - &cache-key pip-cache-v2-<< parameters.python-version >>-{{ checksum "requirements.txt" }}-{{ checksum "test-requirements.txt" }}
-            - pip-cache-v2-<< parameters.python-version >>-
+            - &cache-key pip-cache-v7-<< parameters.python-image >>-{{ checksum "requirements.txt" }}-{{ checksum "test-requirements.txt" }}-{{ checksum "extra-requirements.txt" }}
+            - pip-cache-v7-<< parameters.python-image >>-
+      - run:
+          command: |  # use pipenv to install dependencies
+            sudo pip install pipenv
+            pipenv install
       - run:
           name: "Running tests"
-          command: |
-            docker run -it --rm \
-                   --volume ${PWD}:/usr/src/project \
-                   --volume ${PWD}/.cache:/root/.cache/pip/ \
-                   --workdir /usr/src/project \
-                   --network influx_network \
-                   --env INFLUXDB_V2_URL="http://192.168.0.2:9999" \
-                   python:<< parameters.python-version >> /bin/bash -c "./scripts/ci-test.sh"
+          command: ./scripts/ci-test.sh
       - save_cache:
           name: Saving Pip Cache
           key: *cache-key
           paths:
-            - ./cache
+            - ".venv"
+            - "~/.cache/pip"
+            # - "/usr/local/lib/python3.8/site-packages"
+            # - "/usr/local/lib/python3.7/site-packages"
+            # - "/usr/local/lib/python3.6/site-packages"
+            - "/usr/local/lib/site-python"
           when: always
 jobs:
-  tests-python-3:
-    machine: true
+  tests-python:
     parameters:
-      influxdb-repository:
+      python-image:
         type: string
-        default: "influxdb"
-      influxdb-version:
+        default: "circleci/python:3.6-buster"
+      influxdb-image:
         type: string
-        default: "2.0.0-beta"
-    environment:
-      INFLUXDB_V2_REPOSITORY: << parameters.influxdb-repository >>
-      INFLUXDB_V2_VERSION: << parameters.influxdb-version >>
+        default: "influxdb:2.0.0-beta"
+    docker:
+      - image: << parameters.python-image >>
+        environment: # environment variables for primary container
+          PIPENV_VENV_IN_PROJECT: true
+      - image: quay.io/influxdb/<< parameters.influxdb-image >>
     steps:
       - prepare
       - client-test:
-          python-version: *default-python-version
+          python-image: << parameters.python-image >>
       - store_test_results:
           path: test-reports
       - run:
@@ -66,12 +68,17 @@ workflows:
   version: 2
   build:
     jobs:
-      - tests-python-3:
-          name: test-beta
-      - tests-python-3:
-          name: test-nightly
-          influxdb-repository: "influx"
-          influxdb-version: "nightly"
+      - tests-python:
+          name: python-3.6
+      - tests-python:
+          name: python-3.6-nightly
+          influxdb-image: "influx:nightly"
+      - tests-python:
+          name: python-3.7
+          python-image: "circleci/python:3.7-buster"
+      - tests-python:
+          name: python-3.8
+          python-image: "circleci/python:3.8-buster"
 
   nightly:
     triggers:
@@ -82,4 +89,4 @@ workflows:
               only:
                 - master
     jobs:
-      - tests-python-3
+      - tests-python
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ### Features
 1. [#52](https://github.com/influxdata/influxdb-client-python/issues/52): Initialize client library from config file and environmental properties
 
+### CI
+1. [#54](https://github.com/influxdata/influxdb-client-python/pull/54): Add Python 3.7 and 3.8 to CI builds
+
 ## 1.3.0 [2020-01-17]
 
 ### Features
diff --git a/scripts/ci-test.sh b/scripts/ci-test.sh
@@ -6,11 +6,11 @@ set -e
 # Install requirements
 #
 python --version
-pip install -r requirements.txt
-pip install -r extra-requirements.txt
-pip install -r test-requirements.txt
-pip install pytest pytest-cov
-pip install twine
+pip install -r requirements.txt --user
+pip install -r extra-requirements.txt --user
+pip install -r test-requirements.txt --user
+pip install pytest pytest-cov --user
+pip install twine --user
 python setup.py sdist bdist_wheel
 twine check dist/*
 
diff --git a/scripts/influxdb-onboarding.sh b/scripts/influxdb-onboarding.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+#
+# The MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+set -e
+
+echo "Wait to start InfluxDB 2.0"
+wget -S --spider --tries=20 --retry-connrefused --waitretry=5 http://localhost:9999/metrics
+
+echo
+echo "Post onBoarding request, to setup initial user (my-user@my-password), org (my-org) and bucketSetup (my-bucket)"
+echo
+curl -i -X POST http://localhost:9999/api/v2/setup -H 'accept: application/json' \
+    -d '{
+            "username": "my-user",
+            "password": "my-password",
+            "org": "my-org",
+            "bucket": "my-bucket",
+            "token": "my-token"
+        }'
diff --git a/scripts/influxdb-restart.sh b/scripts/influxdb-restart.sh
@@ -57,14 +57,7 @@ docker run \
 echo "Wait to start InfluxDB 2.0"
 wget -S --spider --tries=20 --retry-connrefused --waitretry=5 http://localhost:9999/metrics
 
-echo
-echo "Post onBoarding request, to setup initial user (my-user@my-password), org (my-org) and bucketSetup (my-bucket)"
-echo
-curl -i -X POST http://localhost:9999/api/v2/setup -H 'accept: application/json' \
-    -d '{
-            "username": "my-user",
-            "password": "my-password",
-            "org": "my-org",
-            "bucket": "my-bucket",
-            "token": "my-token"
-        }'
+#
+# Post onBoarding request to InfluxDB 2
+#
+"${SCRIPT_PATH}"/influxdb-onboarding.sh
diff --git a/tests/config.ini b/tests/config.ini
@@ -1,5 +1,5 @@
 [influx2]
-url=http://192.168.0.2:9999
+url=http://localhost:9999
 org=my-org
 token=my-token
 timeout=6000
diff --git a/tests/test_WriteApi.py b/tests/test_WriteApi.py
@@ -463,27 +463,28 @@ def tearDown(self) -> None:
 
     def test_connection_option_from_conf_file(self):
         self.client.close()
-        self.client = InfluxDBClient.from_config_file(os.getcwd() + "/tests/config.ini", self.debug)
+        self.client = InfluxDBClient.from_config_file(self._path_to_config(), self.debug)
 
+        self.assertEqual("http://localhost:9999", self.client.url)
         self._check_connection_settings()
 
     def test_connection_option_from_env(self):
         self.client.close()
         self.client = InfluxDBClient.from_env_properties(self.debug)
 
+        self.assertEqual("http://localhost:9999", self.client.url)
         self._check_connection_settings()
 
     def _check_connection_settings(self):
         self.write_client = self.client.write_api(write_options=SYNCHRONOUS)
 
-        self.assertEqual(os.getenv("INFLUXDB_V2_URL"), self.client.url)
         self.assertEqual("my-org", self.client.org)
         self.assertEqual("my-token", self.client.token)
         self.assertEqual(6000, self.client.timeout)
 
     def test_default_tags_from_conf_file(self):
         self.client.close()
-        self.client = InfluxDBClient.from_config_file(os.getcwd() + "/tests/config.ini", self.debug)
+        self.client = InfluxDBClient.from_config_file(self._path_to_config(), self.debug)
 
         self._write_point()
 
@@ -523,6 +524,10 @@ def _write_point(self):
 
         self.delete_test_bucket(bucket)
 
+    @staticmethod
+    def _path_to_config():
+        return os.path.dirname(os.path.realpath(__file__)) + "/config.ini"
+
 
 if __name__ == '__main__':
     unittest.main()
