Skip to content
This repository was archived by the owner on Feb 2, 2024. It is now read-only.

Commit 90e241a

Browse files
authored
Pin Python=3.7.3 for Python=3.7 (#460)
* Revert "Pin python=3.7.3 (#453)" This reverts commit ef30ecb. * Pin Python=3.7.3 for Python=3.7
1 parent ab559d9 commit 90e241a

4 files changed

Lines changed: 11 additions & 7 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
global:
1111
- GIT_DESCRIBE_TAG=0.29.2
1212
- GIT_DESCRIBE_NUMBER=1
13-
- PYTHON_VER=3.7.3
13+
- PYTHON_VER=3.7
1414
- NUMPY_VER=1.17
1515
- CONDA_PREFIX_PATH=$HOME/miniconda3
1616
matrix:

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
allowFailure: false
1313
matrix:
1414
py3.7_numpy1.17:
15-
PYTHON_VER: '3.7.3'
15+
PYTHON_VER: '3.7'
1616
NUMPY_VER: '1.17'
1717
USE_NUMBA_MASTER: 'True'
1818
SDC_CONFIG_PIPELINE_SDC: 'False'
@@ -24,7 +24,7 @@ jobs:
2424
allowFailure: false
2525
matrix:
2626
py3.7_numpy1.17:
27-
PYTHON_VER: '3.7.3'
27+
PYTHON_VER: '3.7'
2828
NUMPY_VER: '1.17'
2929
USE_NUMBA_MASTER: 'True'
3030
SDC_CONFIG_PIPELINE_SDC: 'False'
@@ -36,7 +36,7 @@ jobs:
3636
allowFailure: false
3737
matrix:
3838
py3.7_numpy1.17:
39-
PYTHON_VER: '3.7.3'
39+
PYTHON_VER: '3.7'
4040
NUMPY_VER: '1.17'
4141
USE_NUMBA_MASTER: 'True'
4242
SDC_CONFIG_PIPELINE_SDC: 'False'

buildscripts/build.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def run_smoke_tests(sdc_src, test_env_activate):
6767
develop: install package in source directory (default)
6868
install: build and install package in build environment
6969
package: build conda and wheel packages""")
70-
parser.add_argument('--python', default='3.7.3', choices=['3.6', '3.7.3', '3.8'],
70+
parser.add_argument('--python', default='3.7', choices=['3.6', '3.7', '3.8'],
7171
help='Python version to build with, default = 3.7')
7272
parser.add_argument('--numpy', default='1.16', choices=['1.15', '1.16', '1.17'],
7373
help='Numpy version to build with, default = 1.16')
@@ -84,6 +84,8 @@ def run_smoke_tests(sdc_src, test_env_activate):
8484

8585
build_mode = args.build_mode
8686
python = args.python
87+
if python == '3.7':
88+
python = '3.7.3'
8789
numpy = args.numpy
8890
output_folder = args.output_folder
8991
conda_prefix = os.getenv('CONDA_PREFIX', args.conda_prefix)
@@ -92,7 +94,7 @@ def run_smoke_tests(sdc_src, test_env_activate):
9294
use_numba_master = args.use_numba_master
9395
numba_channel = numba_master_channel if use_numba_master is True else args.numba_channel
9496
assert conda_prefix is not None, 'CONDA_PREFIX is not defined; Please use --conda-prefix option or activate your conda'
95-
97+
9698
# Init variables
9799
conda_activate = get_conda_activate_cmd(conda_prefix).replace('"', '')
98100
build_env = f'sdc-build-env-py{python}-numpy{numpy}'

buildscripts/test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
examples: execute examples, located in sdc/examples""")
6868
parser.add_argument('--package-type', default='conda', choices=['conda', 'wheel'],
6969
help='Package to test: conda or wheel, default = conda')
70-
parser.add_argument('--python', default='3.7.3', choices=['3.6', '3.7.3', '3.8'],
70+
parser.add_argument('--python', default='3.7', choices=['3.6', '3.7', '3.8'],
7171
help='Python version to test with, default = 3.7')
7272
parser.add_argument('--numpy', default='1.16', choices=['1.15', '1.16', '1.17'],
7373
help='Numpy version to test with, default = 1.16')
@@ -89,6 +89,8 @@
8989
test_mode = args.test_mode
9090
package_type = args.package_type
9191
python = args.python
92+
if python == '3.7':
93+
python = '3.7.3'
9294
numpy = args.numpy
9395
build_folder = args.build_folder
9496
conda_prefix = os.getenv('CONDA_PREFIX', args.conda_prefix)

0 commit comments

Comments
 (0)