File tree Expand file tree Collapse file tree 3 files changed +5
-13
lines changed Expand file tree Collapse file tree 3 files changed +5
-13
lines changed Original file line number Diff line number Diff line change
1
+ <<<<<<< HEAD
1
2
2.0.8.dev0
3
+ =======
4
+ 2.0.1.dev0
5
+ >>>>>>> Add release build (#191)
Original file line number Diff line number Diff line change @@ -30,7 +30,6 @@ def read_version():
30
30
31
31
setup (
32
32
name = 'sagemaker_tensorflow_container' ,
33
-
34
33
version = read_version (),
35
34
description = 'Open source library for creating '
36
35
'TensorFlow containers to run on Amazon SageMaker.' ,
Original file line number Diff line number Diff line change @@ -60,25 +60,14 @@ passenv =
60
60
# Can be used to specify which tests to run, e.g.: tox -- -s
61
61
commands =
62
62
coverage run --rcfile .coveragerc_{envname} --source sagemaker_tensorflow_container -m py.test {posargs}
63
- <<<<<<< HEAD
64
- <<<<<<< HEAD
65
63
{env:IGNORE_COVERAGE:} coverage report --include *sagemaker_tensorflow_container* --show-missing
66
64
deps = sagemaker-containers
67
65
extras = test
68
- =======
69
- {env:IGNORE_COVERAGE:} coverage report --fail-under =90 --include *sagemaker_tensorflow_container* --show-missing
70
- deps = .[test]
71
- >>>>>>> Update sagemaker containers (# 119)
72
- =======
73
- {env:IGNORE_COVERAGE:} coverage report --include *sagemaker_tensorflow_container* --show-missing
74
- deps = .[test]
75
- sagemaker-containers
76
- >>>>>>> Fix broken unit tests (# 124)
77
66
78
67
[testenv:flake8]
79
68
basepython = python
80
69
deps =
81
70
flake8
82
71
flake8-future-import
83
72
flake8-import-order
84
- commands = flake8
73
+ commands = flake8
You can’t perform that action at this time.
0 commit comments