Skip to content

Commit 9611a7f

Browse files
update nightly & upgrade Twine (#5458)
* update used Twine * . * . * install * install * . * . * . * . * . * . Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent d30e316 commit 9611a7f

File tree

14 files changed

+39
-43
lines changed

14 files changed

+39
-43
lines changed

.github/prepare-nightly_pkg-name.py

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

.github/prepare-nightly_version.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
import os
33
import re
44

5-
PATH_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
5+
_PATH_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
6+
_PATH_INIT = os.path.join(_PATH_ROOT, 'pytorch_lightning', '__init__.py')
67

78
# get today date
89
now = datetime.datetime.now()
910
now_date = now.strftime("%Y%m%d")
10-
PATH_INIT = os.path.join(PATH_ROOT, 'pytorch_lightning', '__init__.py')
11-
print(f"prepare init '{PATH_INIT}' - replace version by {now_date}")
12-
with open(PATH_INIT, 'r') as fp:
11+
print(f"prepare init '{_PATH_INIT}' - replace version by {now_date}")
12+
with open(_PATH_INIT, 'r') as fp:
1313
init = fp.read()
14-
init = re.sub(r'__version__ = [\d\.rc\'"]+', f'__version__ = "{now_date}"', init)
15-
with open(PATH_INIT, 'w') as fp:
14+
init = re.sub(r'__version__ = [\d\.\w\'"]+', f'__version__ = "{now_date}"', init)
15+
with open(_PATH_INIT, 'w') as fp:
1616
fp.write(init)

.github/workflows/ci_pkg-install.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Install pkg
33
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
44
on: # Trigger the workflow on push or pull request, but only for the master branch
55
push:
6-
branches: [master, "release/*"] # include release branches like release/1.0.x
6+
branches: [master, "release/*"]
77
pull_request:
88
branches: [master, "release/*"]
99

@@ -27,13 +27,13 @@ jobs:
2727

2828
- name: Prepare env
2929
run: |
30-
pip install check-manifest "twine==1.13.0"
30+
pip install check-manifest "twine==3.2" setuptools wheel
3131
3232
- name: Create package
3333
run: |
3434
check-manifest
3535
# python setup.py check --metadata --strict
36-
python setup.py sdist
36+
python setup.py sdist bdist_wheel
3737
3838
- name: Check package
3939
run: |
@@ -46,12 +46,18 @@ jobs:
4646
# this is just a hotfix because of Win cannot install it directly
4747
pip install -r requirements.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html
4848
49-
- name: Install package
49+
- name: Install | Uninstall package - archive
50+
run: |
51+
# install as archive
52+
pip install dist/*.tar.gz
53+
cd ..
54+
python -c "import pytorch_lightning as pl ; print(pl.__version__)"
55+
pip uninstall -y pytorch-lightning
56+
57+
- name: Install | Uninstall package - wheel
5058
run: |
51-
# pip install virtualenv
52-
# virtualenv vEnv --system-site-packages
53-
# source vEnv/bin/activate
54-
pip install dist/*
55-
cd .. & python -c "import pytorch_lightning as pl ; print(pl.__version__)"
56-
# deactivate
57-
# rm -rf vEnv
59+
# install as wheel
60+
pip install dist/*.whl
61+
cd ..
62+
python -c "import pytorch_lightning as pl ; print(pl.__version__)"
63+
pip uninstall -y pytorch-lightning

.github/workflows/ci_test-base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI basic testing
33
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
44
on: # Trigger the workflow on push or pull request, but only for the master branch
55
push:
6-
branches: [master, "release/*"] # include release branches like release/1.0.x
6+
branches: [master, "release/*"]
77
pull_request:
88
branches: [master, "release/*"]
99

.github/workflows/ci_test-conda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: PyTorch & Conda
33
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
44
on: # Trigger the workflow on push or pull request, but only for the master branch
55
push:
6-
branches: [master, "release/*"] # include release branches like release/1.0.x
6+
branches: [master, "release/*"]
77
pull_request:
88
branches: [master, "release/*"]
99

.github/workflows/ci_test-full.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI complete testing
33
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
44
on: # Trigger the workflow on push or pull request, but only for the master branch
55
push:
6-
branches: [master, "release/*"] # include release branches like release/1.0.x
6+
branches: [master, "release/*"]
77
pull_request:
88
branches: [master, "release/*"]
99

.github/workflows/ci_test-tpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: TPU tests
22

33
on:
44
push:
5-
branches: [master, "release/*"] # include release branches like release/1.0.x
5+
branches: [master, "release/*"]
66
# TODO: temporal disable TPU testing until we find way how to pass credentials to forked PRs
77
# pull_request:
88
# branches:

.github/workflows/code-formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "Check Code Format"
22

33
on: # Trigger the workflow on push or pull request, but only for the master branch
44
push:
5-
branches: [master, "release/*"] # include release branches like release/1.0.x
5+
branches: [master, "release/*"]
66
pull_request:
77
branches: [master, "release/*"]
88

.github/workflows/docs-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "Docs check"
33

44
on: # Trigger the workflow on push or pull request, but only for the master branch
55
push:
6-
branches: [master, "release/*"] # include release branches like release/1.0.x
6+
branches: [master, "release/*"]
77
pull_request:
88
branches: [master, "release/*"]
99

.github/workflows/release-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Publish Docker Releases
33
# https://github.com/docker/build-push-action
44
on:
55
push:
6-
branches: [master, "release/*"] # include release branches like release/1.0.x
6+
branches: [master, "release/*"]
77
release:
88
types: [created]
99

0 commit comments

Comments
 (0)