fix: specify package requirements in setup.py

.circleci/config.yml

@@ -22,7 +22,7 @@ commands:
       - restore_cache:
           name: Restoring Pip Cache
           keys:
-            - &cache-key pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "requirements.txt" }}-{{ checksum "test-requirements.txt" }}-{{ checksum "extra-requirements.txt" }}-{{ checksum "ciso-requirements.txt" }}
+            - &cache-key pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "setup.py" }}
             - pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-
       - run:
           command: |  # use pipenv to install dependencies

.codecov.yml

@@ -1,4 +1,5 @@
 ignore:
   - "influxdb_client/domain/*.py"
   - "influxdb_client/service/*.py"
-  - "tests/*.py"
+  - "tests/*.py"
+  - "setup.py"

CHANGELOG.md

@@ -6,6 +6,7 @@
 ### Bug Fixes
 1. [#222](https://github.com/influxdata/influxdb-client-python/pull/222): Pass configured timeout to HTTP client
 1. [#218](https://github.com/influxdata/influxdb-client-python/pull/218): Support for `with .. as ..` statement
+1. [#232](https://github.com/influxdata/influxdb-client-python/pull/232): Specify package requirements in `setup.py`
 
 ## 1.16.0 [2021-04-01]
 

README.rst

@@ -1070,9 +1070,9 @@ Local tests
     ./scripts/influxdb-restart.sh
 
     # install requirements
-    pip install -r requirements.txt --user
-    pip install -r extra-requirements.txt --user
-    pip install -r test-requirements.txt --user
+    pip install -e . --user
+    pip install -e .\[extra\] --user
+    pip install -e .\[test\] --user
 
     # run unit & integration tests
     pytest tests

scripts/ci-test.sh

@@ -8,12 +8,12 @@ ENABLED_CISO_8601="${ENABLED_CISO_8601:-true}"
 # Install requirements
 #
 python --version
-pip install -r requirements.txt --user
-pip install -r extra-requirements.txt --user
-pip install -r test-requirements.txt --user
+pip install -e . --user
+pip install -e .\[extra\] --user
+pip install -e .\[test\] --user
 if [ "$ENABLED_CISO_8601" = true ] ; then
   echo "ciso8601 is enabled"
-  pip install -r ciso-requirements.txt --user
+  pip install -e .\[ciso\] --user
 else
   echo "ciso8601 is disabled"
 fi

setup.py

@@ -4,22 +4,39 @@
 
 from setuptools import setup, find_packages  # noqa: H301
 
-with open('requirements.txt', 'r') as f:
-    requires = [x.strip() for x in f if x.strip()]
+requires = [
+    'rx >= 3.0.1',
+    'certifi >= 14.05.14',
+    'six >= 1.10',
+    'python_dateutil >= 2.5.3',
+    'setuptools >= 21.0.0',
+    'urllib3 >= 1.15.1',
+    'pytz>=2019.1'
+]
 
-with open('test-requirements.txt', 'r') as f:
-    test_requires = [x.strip() for x in f if x.strip()]
+test_requires = [
+    'coverage>=4.0.3',
+    'nose>=1.3.7',
+    'pluggy>=0.3.1',
+    'py>=1.4.31',
+    'randomize>=0.13',
+    'pytest>=5.0.0',
+    'httpretty>=1.0.2',
+    'psutil>=5.6.3'
+]
 
-with open('extra-requirements.txt', 'r') as f:
-    extra_requires = [x.strip() for x in f if x.strip()]
+extra_requires = [
+    'pandas>=0.25.3',
+    'numpy'
+]
 
-with open('ciso-requirements.txt', 'r') as f:
-    ciso_requires = [x.strip() for x in f if x.strip()]
+ciso_requires = [
+    'ciso8601>=2.1.1'
+]
 
 with open('README.rst', 'r') as f:
     readme = f.read()
 
-
 NAME = "influxdb_client"
 
 meta = {}
@@ -35,14 +52,13 @@
     keywords=["InfluxDB", "InfluxDB Python Client"],
     tests_require=test_requires,
     install_requires=requires,
-    extras_require={'extra': extra_requires, 'ciso': ciso_requires},
+    extras_require={'extra': extra_requires, 'ciso': ciso_requires, 'test': test_requires},
     long_description_content_type="text/x-rst",
     packages=find_packages(exclude=('tests*',)),
     test_suite='tests',
     python_requires='>=3.6',
     include_package_data=True,
-    data_files=['requirements.txt', 'extra-requirements.txt', 'test-requirements.txt', 'ciso-requirements.txt'],
-    classifiers = [
+    classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
@@ -54,4 +70,3 @@
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ])
-