From faa23060bdf4ec8f6b969e7b9570855a372bb1b2 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Thu, 22 Apr 2021 11:55:30 +0200 Subject: [PATCH 1/2] chore: specify package requirements in `setup.py` --- .circleci/config.yml | 2 +- README.rst | 6 +++--- ciso-requirements.txt | 1 - extra-requirements.txt | 2 -- requirements.txt | 7 ------- scripts/ci-test.sh | 8 ++++---- setup.py | 41 ++++++++++++++++++++++++++++------------- test-requirements.txt | 8 -------- 8 files changed, 36 insertions(+), 39 deletions(-) delete mode 100644 ciso-requirements.txt delete mode 100644 extra-requirements.txt delete mode 100644 requirements.txt delete mode 100644 test-requirements.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index 032825a6..af986815 100644 --- a/.circleci/config.yml +++ b/.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 diff --git a/README.rst b/README.rst index e47c3588..4476b0df 100644 --- a/README.rst +++ b/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 diff --git a/ciso-requirements.txt b/ciso-requirements.txt deleted file mode 100644 index 4e9e81f6..00000000 --- a/ciso-requirements.txt +++ /dev/null @@ -1 +0,0 @@ -ciso8601>=2.1.1 \ No newline at end of file diff --git a/extra-requirements.txt b/extra-requirements.txt deleted file mode 100644 index 620a88f8..00000000 --- a/extra-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pandas>=0.25.3 -numpy diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index e01aa257..00000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -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 diff --git a/scripts/ci-test.sh b/scripts/ci-test.sh index ea1556de..10d89a0b 100755 --- a/scripts/ci-test.sh +++ b/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 diff --git a/setup.py b/setup.py index 38f063ce..51f83bbe 100644 --- a/setup.py +++ b/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', ]) - diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index 1fa5eaa2..00000000 --- a/test-requirements.txt +++ /dev/null @@ -1,8 +0,0 @@ -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 From 00e39804b65db075e657aad25e0f63735cf6a5f4 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Thu, 22 Apr 2021 12:01:39 +0200 Subject: [PATCH 2/2] docs: update CHANGELOG.md --- .codecov.yml | 3 ++- CHANGELOG.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.codecov.yml b/.codecov.yml index 19ede3d9..e2e752eb 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,4 +1,5 @@ ignore: - "influxdb_client/domain/*.py" - "influxdb_client/service/*.py" - - "tests/*.py" \ No newline at end of file + - "tests/*.py" + - "setup.py" \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 022bc2ab..f5477a5d 100644 --- a/CHANGELOG.md +++ b/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] pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy