Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
Torchaudio
Commits
add9495e
Unverified
Commit
add9495e
authored
Jan 29, 2020
by
Eli Uriegas
Committed by
GitHub
Jan 29, 2020
Browse files
.circleci: Bump python3.7 -> python3.8 (#397)
Signed-off-by:
Eli Uriegas
<
eliuriegas@fb.com
>
parent
f4f71436
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
97 additions
and
12 deletions
+97
-12
.circleci/config.yml
.circleci/config.yml
+89
-5
.circleci/config.yml.in
.circleci/config.yml.in
+5
-5
.circleci/regenerate.py
.circleci/regenerate.py
+1
-1
packaging/pkg_helpers.bash
packaging/pkg_helpers.bash
+1
-0
packaging/torchaudio/meta.yaml
packaging/torchaudio/meta.yaml
+1
-1
No files found.
.circleci/config.yml
View file @
add9495e
...
@@ -2,8 +2,8 @@ version: 2.1
...
@@ -2,8 +2,8 @@ version: 2.1
# How to test the Linux jobs:
# How to test the Linux jobs:
# - Install CircleCI local CLI: https://circleci.com/docs/2.0/local-cli/
# - Install CircleCI local CLI: https://circleci.com/docs/2.0/local-cli/
# - circleci config process .circleci/config.yml > gen.yml && circleci local execute -c gen.yml --job binary_linux_wheel_py3.
7
# - circleci config process .circleci/config.yml > gen.yml && circleci local execute -c gen.yml --job binary_linux_wheel_py3.
8
# - Replace binary_linux_wheel_py3.
7
with the name of the job you want to test.
# - Replace binary_linux_wheel_py3.
8
with the name of the job you want to test.
# Job names are 'name:' key.
# Job names are 'name:' key.
orbs
:
orbs
:
...
@@ -22,7 +22,7 @@ binary_common: &binary_common
...
@@ -22,7 +22,7 @@ binary_common: &binary_common
default
:
"
"
default
:
"
"
# Don't edit these
# Don't edit these
python_version
:
python_version
:
description
:
"
Python
version
to
build
against
(e.g.,
3.
7
)"
description
:
"
Python
version
to
build
against
(e.g.,
3.
8
)"
type
:
string
type
:
string
unicode_abi
:
unicode_abi
:
description
:
"
Python
2.7
wheel
only:
whether
or
not
we
are
cp27mu
(default:
no)"
description
:
"
Python
2.7
wheel
only:
whether
or
not
we
are
cp27mu
(default:
no)"
...
@@ -46,7 +46,7 @@ smoke_test_common: &smoke_test_common
...
@@ -46,7 +46,7 @@ smoke_test_common: &smoke_test_common
jobs
:
jobs
:
circleci_consistency
:
circleci_consistency
:
docker
:
docker
:
-
image
:
circleci/python:3.
7
-
image
:
circleci/python:3.
8
steps
:
steps
:
-
checkout
-
checkout
-
run
:
-
run
:
...
@@ -164,7 +164,7 @@ jobs:
...
@@ -164,7 +164,7 @@ jobs:
# Requires org-member context
# Requires org-member context
binary_wheel_upload
:
binary_wheel_upload
:
docker
:
docker
:
-
image
:
circleci/python:3.
7
-
image
:
circleci/python:3.
8
steps
:
steps
:
-
attach_workspace
:
-
attach_workspace
:
at
:
~/workspace
at
:
~/workspace
...
@@ -255,6 +255,9 @@ workflows:
...
@@ -255,6 +255,9 @@ workflows:
-
binary_linux_wheel
:
-
binary_linux_wheel
:
name
:
binary_linux_wheel_py3.7
name
:
binary_linux_wheel_py3.7
python_version
:
'
3.7'
python_version
:
'
3.7'
-
binary_linux_wheel
:
name
:
binary_linux_wheel_py3.8
python_version
:
'
3.8'
-
binary_macos_wheel
:
-
binary_macos_wheel
:
name
:
binary_macos_wheel_py3.5
name
:
binary_macos_wheel_py3.5
python_version
:
'
3.5'
python_version
:
'
3.5'
...
@@ -264,6 +267,9 @@ workflows:
...
@@ -264,6 +267,9 @@ workflows:
-
binary_macos_wheel
:
-
binary_macos_wheel
:
name
:
binary_macos_wheel_py3.7
name
:
binary_macos_wheel_py3.7
python_version
:
'
3.7'
python_version
:
'
3.7'
-
binary_macos_wheel
:
name
:
binary_macos_wheel_py3.8
python_version
:
'
3.8'
-
binary_linux_conda
:
-
binary_linux_conda
:
name
:
binary_linux_conda_py3.5
name
:
binary_linux_conda_py3.5
python_version
:
'
3.5'
python_version
:
'
3.5'
...
@@ -273,6 +279,9 @@ workflows:
...
@@ -273,6 +279,9 @@ workflows:
-
binary_linux_conda
:
-
binary_linux_conda
:
name
:
binary_linux_conda_py3.7
name
:
binary_linux_conda_py3.7
python_version
:
'
3.7'
python_version
:
'
3.7'
-
binary_linux_conda
:
name
:
binary_linux_conda_py3.8
python_version
:
'
3.8'
-
binary_macos_conda
:
-
binary_macos_conda
:
name
:
binary_macos_conda_py3.5
name
:
binary_macos_conda_py3.5
python_version
:
'
3.5'
python_version
:
'
3.5'
...
@@ -282,6 +291,9 @@ workflows:
...
@@ -282,6 +291,9 @@ workflows:
-
binary_macos_conda
:
-
binary_macos_conda
:
name
:
binary_macos_conda_py3.7
name
:
binary_macos_conda_py3.7
python_version
:
'
3.7'
python_version
:
'
3.7'
-
binary_macos_conda
:
name
:
binary_macos_conda_py3.8
python_version
:
'
3.8'
-
binary_win_conda
:
-
binary_win_conda
:
name
:
torchaudio_win_py3.6
name
:
torchaudio_win_py3.6
python_version
:
"
3.6"
python_version
:
"
3.6"
...
@@ -355,6 +367,28 @@ workflows:
...
@@ -355,6 +367,28 @@ workflows:
python_version
:
'
3.7'
python_version
:
'
3.7'
requires
:
requires
:
-
nightly_binary_linux_wheel_py3.7_upload
-
nightly_binary_linux_wheel_py3.7_upload
-
binary_linux_wheel
:
filters
:
branches
:
only
:
nightly
name
:
nightly_binary_linux_wheel_py3.8
python_version
:
'
3.8'
-
binary_wheel_upload
:
context
:
org-member
filters
:
branches
:
only
:
nightly
name
:
nightly_binary_linux_wheel_py3.8_upload
requires
:
-
nightly_binary_linux_wheel_py3.8
-
smoke_test_linux_pip
:
filters
:
branches
:
only
:
nightly
name
:
nightly_binary_linux_wheel_py3.8_smoke_test_pip
python_version
:
'
3.8'
requires
:
-
nightly_binary_linux_wheel_py3.8_upload
-
binary_macos_wheel
:
-
binary_macos_wheel
:
filters
:
filters
:
branches
:
branches
:
...
@@ -397,6 +431,20 @@ workflows:
...
@@ -397,6 +431,20 @@ workflows:
name
:
nightly_binary_macos_wheel_py3.7_upload
name
:
nightly_binary_macos_wheel_py3.7_upload
requires
:
requires
:
-
nightly_binary_macos_wheel_py3.7
-
nightly_binary_macos_wheel_py3.7
-
binary_macos_wheel
:
filters
:
branches
:
only
:
nightly
name
:
nightly_binary_macos_wheel_py3.8
python_version
:
'
3.8'
-
binary_wheel_upload
:
context
:
org-member
filters
:
branches
:
only
:
nightly
name
:
nightly_binary_macos_wheel_py3.8_upload
requires
:
-
nightly_binary_macos_wheel_py3.8
-
binary_linux_conda
:
-
binary_linux_conda
:
filters
:
filters
:
branches
:
branches
:
...
@@ -463,6 +511,28 @@ workflows:
...
@@ -463,6 +511,28 @@ workflows:
python_version
:
'
3.7'
python_version
:
'
3.7'
requires
:
requires
:
-
nightly_binary_linux_conda_py3.7_upload
-
nightly_binary_linux_conda_py3.7_upload
-
binary_linux_conda
:
filters
:
branches
:
only
:
nightly
name
:
nightly_binary_linux_conda_py3.8
python_version
:
'
3.8'
-
binary_conda_upload
:
context
:
org-member
filters
:
branches
:
only
:
nightly
name
:
nightly_binary_linux_conda_py3.8_upload
requires
:
-
nightly_binary_linux_conda_py3.8
-
smoke_test_linux_conda
:
filters
:
branches
:
only
:
nightly
name
:
nightly_binary_linux_conda_py3.8_smoke_test_conda
python_version
:
'
3.8'
requires
:
-
nightly_binary_linux_conda_py3.8_upload
-
binary_macos_conda
:
-
binary_macos_conda
:
filters
:
filters
:
branches
:
branches
:
...
@@ -505,6 +575,20 @@ workflows:
...
@@ -505,6 +575,20 @@ workflows:
name
:
nightly_binary_macos_conda_py3.7_upload
name
:
nightly_binary_macos_conda_py3.7_upload
requires
:
requires
:
-
nightly_binary_macos_conda_py3.7
-
nightly_binary_macos_conda_py3.7
-
binary_macos_conda
:
filters
:
branches
:
only
:
nightly
name
:
nightly_binary_macos_conda_py3.8
python_version
:
'
3.8'
-
binary_conda_upload
:
context
:
org-member
filters
:
branches
:
only
:
nightly
name
:
nightly_binary_macos_conda_py3.8_upload
requires
:
-
nightly_binary_macos_conda_py3.8
docker_build
:
docker_build
:
triggers
:
triggers
:
-
schedule
:
-
schedule
:
...
...
.circleci/config.yml.in
View file @
add9495e
...
@@ -2,8 +2,8 @@ version: 2.1
...
@@ -2,8 +2,8 @@ version: 2.1
# How to test the Linux jobs:
# How to test the Linux jobs:
# - Install CircleCI local CLI: https://circleci.com/docs/2.0/local-cli/
# - Install CircleCI local CLI: https://circleci.com/docs/2.0/local-cli/
# - circleci config process .circleci/config.yml > gen.yml && circleci local execute -c gen.yml --job binary_linux_wheel_py3.
7
# - circleci config process .circleci/config.yml > gen.yml && circleci local execute -c gen.yml --job binary_linux_wheel_py3.
8
# - Replace binary_linux_wheel_py3.
7
with the name of the job you want to test.
# - Replace binary_linux_wheel_py3.
8
with the name of the job you want to test.
# Job names are 'name:' key.
# Job names are 'name:' key.
orbs:
orbs:
...
@@ -22,7 +22,7 @@ binary_common: &binary_common
...
@@ -22,7 +22,7 @@ binary_common: &binary_common
default: ""
default: ""
# Don't edit these
# Don't edit these
python_version:
python_version:
description: "Python version to build against (e.g., 3.
7
)"
description: "Python version to build against (e.g., 3.
8
)"
type: string
type: string
unicode_abi:
unicode_abi:
description: "Python 2.7 wheel only: whether or not we are cp27mu (default: no)"
description: "Python 2.7 wheel only: whether or not we are cp27mu (default: no)"
...
@@ -46,7 +46,7 @@ smoke_test_common: &smoke_test_common
...
@@ -46,7 +46,7 @@ smoke_test_common: &smoke_test_common
jobs:
jobs:
circleci_consistency:
circleci_consistency:
docker:
docker:
- image: circleci/python:3.
7
- image: circleci/python:3.
8
steps:
steps:
- checkout
- checkout
- run:
- run:
...
@@ -164,7 +164,7 @@ jobs:
...
@@ -164,7 +164,7 @@ jobs:
# Requires org-member context
# Requires org-member context
binary_wheel_upload:
binary_wheel_upload:
docker:
docker:
- image: circleci/python:3.
7
- image: circleci/python:3.
8
steps:
steps:
- attach_workspace:
- attach_workspace:
at: ~/workspace
at: ~/workspace
...
...
.circleci/regenerate.py
View file @
add9495e
...
@@ -23,7 +23,7 @@ def workflows(prefix='', upload=False, filter_branch=None, indentation=6):
...
@@ -23,7 +23,7 @@ def workflows(prefix='', upload=False, filter_branch=None, indentation=6):
w
=
[]
w
=
[]
for
btype
in
[
"wheel"
,
"conda"
]:
for
btype
in
[
"wheel"
,
"conda"
]:
for
os_type
in
[
"linux"
,
"macos"
]:
for
os_type
in
[
"linux"
,
"macos"
]:
for
python_version
in
[
"3.5"
,
"3.6"
,
"3.7"
]:
for
python_version
in
[
"3.5"
,
"3.6"
,
"3.7"
,
"3.8"
]:
for
unicode
in
([
False
,
True
]
if
btype
==
"wheel"
and
python_version
==
"2.7"
else
[
False
]):
for
unicode
in
([
False
,
True
]
if
btype
==
"wheel"
and
python_version
==
"2.7"
else
[
False
]):
w
+=
workflow_pair
(
btype
,
os_type
,
python_version
,
unicode
,
filter_branch
,
prefix
,
upload
)
w
+=
workflow_pair
(
btype
,
os_type
,
python_version
,
unicode
,
filter_branch
,
prefix
,
upload
)
...
...
packaging/pkg_helpers.bash
View file @
add9495e
...
@@ -139,6 +139,7 @@ setup_wheel_python() {
...
@@ -139,6 +139,7 @@ setup_wheel_python() {
3.5
)
python_abi
=
cp35-cp35m
;;
3.5
)
python_abi
=
cp35-cp35m
;;
3.6
)
python_abi
=
cp36-cp36m
;;
3.6
)
python_abi
=
cp36-cp36m
;;
3.7
)
python_abi
=
cp37-cp37m
;;
3.7
)
python_abi
=
cp37-cp37m
;;
3.8
)
python_abi
=
cp38-cp38
;;
*
)
*
)
echo
"Unrecognized PYTHON_VERSION=
$PYTHON_VERSION
"
echo
"Unrecognized PYTHON_VERSION=
$PYTHON_VERSION
"
exit
1
exit
1
...
...
packaging/torchaudio/meta.yaml
View file @
add9495e
...
@@ -18,7 +18,7 @@ requirements:
...
@@ -18,7 +18,7 @@ requirements:
run
:
run
:
-
python
-
python
-
typing
-
typing
# [py2k]
{{
environ.get('CONDA_PYTORCH_CONSTRAINT')
}}
{{
environ.get('CONDA_PYTORCH_CONSTRAINT')
}}
build
:
build
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment