Skip to content

Commit 5f3ce1f

Browse files
bednarbednar
authored
fix: specify package requirements in setup.py (influxdata#232)
1 parent e5d3543 commit 5f3ce1f

File tree

10 files changed

+39
-40
lines changed

10 files changed

+39
-40
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ commands:
2222
- restore_cache:
2323
name: Restoring Pip Cache
2424
keys:
25-
- &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" }}
25+
- &cache-key pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "setup.py" }}
2626
- pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-
2727
- run:
2828
command: | # use pipenv to install dependencies

‎.codecov.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ignore:
22
- "influxdb_client/domain/*.py"
33
- "influxdb_client/service/*.py"
4-
- "tests/*.py"
4+
- "tests/*.py"
5+
- "setup.py"

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
### Bug Fixes
77
1. [#222](https://github.com/influxdata/influxdb-client-python/pull/222): Pass configured timeout to HTTP client
88
1. [#218](https://github.com/influxdata/influxdb-client-python/pull/218): Support for `with .. as ..` statement
9+
1. [#232](https://github.com/influxdata/influxdb-client-python/pull/232): Specify package requirements in `setup.py`
910

1011
## 1.16.0 [2021-04-01]
1112

‎README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,9 +1070,9 @@ Local tests
10701070
./scripts/influxdb-restart.sh
10711071
10721072
# install requirements
1073-
pip install -r requirements.txt --user
1074-
pip install -r extra-requirements.txt --user
1075-
pip install -r test-requirements.txt --user
1073+
pip install -e . --user
1074+
pip install -e .\[extra\] --user
1075+
pip install -e .\[test\] --user
10761076
10771077
# run unit & integration tests
10781078
pytest tests

‎ciso-requirements.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎extra-requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎requirements.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎scripts/ci-test.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ ENABLED_CISO_8601="${ENABLED_CISO_8601:-true}"
88
# Install requirements
99
#
1010
python --version
11-
pip install -r requirements.txt --user
12-
pip install -r extra-requirements.txt --user
13-
pip install -r test-requirements.txt --user
11+
pip install -e . --user
12+
pip install -e .\[extra\] --user
13+
pip install -e .\[test\] --user
1414
if [ "$ENABLED_CISO_8601" = true ] ; then
1515
echo "ciso8601 is enabled"
16-
pip install -r ciso-requirements.txt --user
16+
pip install -e .\[ciso\] --user
1717
else
1818
echo "ciso8601 is disabled"
1919
fi

‎setup.py

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,39 @@
44

55
from setuptools import setup, find_packages # noqa: H301
66

7-
with open('requirements.txt', 'r') as f:
8-
requires = [x.strip() for x in f if x.strip()]
7+
requires = [
8+
'rx >= 3.0.1',
9+
'certifi >= 14.05.14',
10+
'six >= 1.10',
11+
'python_dateutil >= 2.5.3',
12+
'setuptools >= 21.0.0',
13+
'urllib3 >= 1.15.1',
14+
'pytz>=2019.1'
15+
]
916

10-
with open('test-requirements.txt', 'r') as f:
11-
test_requires = [x.strip() for x in f if x.strip()]
17+
test_requires = [
18+
'coverage>=4.0.3',
19+
'nose>=1.3.7',
20+
'pluggy>=0.3.1',
21+
'py>=1.4.31',
22+
'randomize>=0.13',
23+
'pytest>=5.0.0',
24+
'httpretty>=1.0.2',
25+
'psutil>=5.6.3'
26+
]
1227

13-
with open('extra-requirements.txt', 'r') as f:
14-
extra_requires = [x.strip() for x in f if x.strip()]
28+
extra_requires = [
29+
'pandas>=0.25.3',
30+
'numpy'
31+
]
1532

16-
with open('ciso-requirements.txt', 'r') as f:
17-
ciso_requires = [x.strip() for x in f if x.strip()]
33+
ciso_requires = [
34+
'ciso8601>=2.1.1'
35+
]
1836

1937
with open('README.rst', 'r') as f:
2038
readme = f.read()
2139

22-
2340
NAME = "influxdb_client"
2441

2542
meta = {}
@@ -35,14 +52,13 @@
3552
keywords=["InfluxDB", "InfluxDB Python Client"],
3653
tests_require=test_requires,
3754
install_requires=requires,
38-
extras_require={'extra': extra_requires, 'ciso': ciso_requires},
55+
extras_require={'extra': extra_requires, 'ciso': ciso_requires, 'test': test_requires},
3956
long_description_content_type="text/x-rst",
4057
packages=find_packages(exclude=('tests*',)),
4158
test_suite='tests',
4259
python_requires='>=3.6',
4360
include_package_data=True,
44-
data_files=['requirements.txt', 'extra-requirements.txt', 'test-requirements.txt', 'ciso-requirements.txt'],
45-
classifiers = [
61+
classifiers=[
4662
'Development Status :: 4 - Beta',
4763
'Intended Audience :: Developers',
4864
'License :: OSI Approved :: MIT License',
@@ -54,4 +70,3 @@
5470
'Topic :: Software Development :: Libraries',
5571
'Topic :: Software Development :: Libraries :: Python Modules',
5672
])
57-

‎test-requirements.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)
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