Skip to content

Commit c08ec69

Browse files
authored
Merge pull request #191 from CitrineInformatics/maintain/test-latest-pint
Update testing strategy
2 parents 3ade059 + 6564b05 commit c08ec69

File tree

4 files changed

+17
-21
lines changed

4 files changed

+17
-21
lines changed

.travis.yml

+6-11
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,12 @@ python:
77
- '3.10'
88
- '3.11'
99
env:
10-
- PINT_VERSION=0.18
11-
- PINT_VERSION=0.21
12-
jobs:
13-
exclude:
14-
- python: 3.7
15-
env: PINT_VERSION=0.21
10+
- UPGRADES="-U pint pandas"
11+
- UPGRADES=""
1612
install:
17-
- pip install -U -r requirements.txt
18-
- pip install Pint==$PINT_VERSION
19-
- pip install -U -r test_requirements.txt
20-
- pip install --no-deps -e .
13+
- pip install --only-binary ':all:' -r requirements.txt
14+
- pip install --only-binary ':all:' -r test_requirements.txt
15+
- pip install $UPGRADES -e .
2116
script:
2217
- bash scripts/run_tests.sh
2318
- cd docs; make html; cd ..;
@@ -31,7 +26,7 @@ deploy:
3126
on:
3227
tags: true
3328
python: '3.10' # only need this to run once
34-
env: PINT_VERSION=0.21
29+
env: UPGRADES=""
3530
- provider: pypi
3631
user: "CitrineInformatics"
3732
password: "$PYPI_PASSWORD"

requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
toolz==0.10.0
1+
toolz==0.11.0
22
pint==0.18
33
sphinx==4.3.0
44
sphinxcontrib-apidoc==0.3.0
55
sphinx-rtd-theme==1.0.0
6-
deprecation==2.0.7
6+
deprecation==2.1.0

setup.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
packages.append("")
55

66
setup(name='gemd',
7-
version='1.14.0',
7+
version='1.14.1',
8+
python_requires='>=3.7',
89
url='http://github.com/CitrineInformatics/gemd-python',
910
description="Python binding for Citrine's GEMD data model",
1011
author='Citrine Informatics',
@@ -22,18 +23,18 @@
2223
'tests.units': ['test_units.txt']
2324
},
2425
install_requires=[
25-
"toolz>=0.10.0,<1",
26-
"pint>=0.18,<0.22",
27-
"deprecation>=2.0.7,<3"
26+
"toolz>=0.11.0,<1",
27+
"pint>=0.18,<1",
28+
"deprecation>=2.1.0,<3"
2829
],
2930
extras_require={
3031
"tests": [
3132
"pytest>=7.3.1,<8"
3233
],
33-
"gemd.demo.tests": [
34-
"pandas>=1.3.5,<2"
34+
"tests.demo": [
35+
"pandas>=1.3.5,<3"
3536
],
36-
"gemd.entity.bounds.tests": [
37+
"tests.entity.bounds": [
3738
"numpy"
3839
]
3940
},

test_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ flake8==3.7.8
22
flake8-docstrings==1.3.1
33
pytest==7.3.1
44
pytest-cov==4.0.0
5-
pandas>=1.3.5,<2
5+
pandas>=1.3.5,<=1.5.0
66
derp==0.1.1

0 commit comments

Comments
 (0)