Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add py39 to tox tests #216

Closed
wants to merge 3 commits into from
Closed

add py39 to tox tests #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60ac0ff
add py39 to tox tests
wpoely86 Feb 27, 2023
52441f3
Merge branch 'newstack' into py39
wpoely86 Oct 24, 2023
c93f3a7
Merge remote-tracking branch 'origin/master' into py39
wpoely86 Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/vsc/install/ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ def gen_tox_ini():
envs = []

# always run tests with Python 3
py3_env = 'py36'
envs.append(py3_env)
py3_envs = ['py36', 'py39']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how do we run tests without 39 in certain repos?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can add it to vsc-cfg.ini to optionally disable it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might be a good idea, same way we did it for the py3 move.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll look into it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, should be dealt with same as in py3 move: first it's opt in, then mandatory with optout

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I'll get something working

envs.extend(py3_envs)

pip_args, easy_install_args = '', ''
if vsc_ci_cfg[INSTALL_SCRIPTS_PREFIX_OVERRIDE]:
Expand Down
4 changes: 2 additions & 2 deletions lib/vsc/install/shared_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def _log(self, level, msg, args):

RELOAD_VSC_MODS = False

VERSION = '0.18.11'
VERSION = '0.19.0'

log.info('This is (based on) vsc.install.shared_setup %s', VERSION)
log.info('(using setuptools version %s located at %s)', setuptools.__version__, setuptools.__file__)
Expand Down Expand Up @@ -295,7 +295,7 @@ def get_egg_cache_dir_pyver(self):

# the original get_egg_cache_dir creates the .eggs directory if it doesn't exist yet,
# but we want to have it versioned, so we rename it
egg_cache_dir_pyver = f'{egg_cache_dir}.py{sys.version_info[0]}'
egg_cache_dir_pyver = f'{egg_cache_dir}.py{sys.version_info[0]}{sys.version_info[1]}'
try:
if not os.path.exists(egg_cache_dir_pyver):
os.rename(egg_cache_dir, egg_cache_dir_pyver)
Expand Down
5 changes: 4 additions & 1 deletion test/ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
# DO NOT EDIT MANUALLY

[tox]
envlist = py36
envlist = py36,py39
skipsdist = true

[testenv]
Expand All @@ -107,6 +107,9 @@
EXPECTED_TOX_INI_PY36_IGNORE = """
[testenv:py36]
ignore_outcome = true

[testenv:py39]
ignore_outcome = true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this does not work right? the outcomes are not ignored

"""

EXPECTED_GITHUB_ACTIONS = """# .github/workflows/unittest.yml: configuration file for github actions worflow
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# DO NOT EDIT MANUALLY

[tox]
envlist = py36
envlist = py36,py39
skipsdist = true

[testenv]
Expand Down
Loading