Skip to content

Commit

Permalink
fixes pytest-dev#8133: migrate to setuptools_scm 5.x and use SETUPTOO…
Browse files Browse the repository at this point in the history
…LS_SCM_PRETEND_VERSION_FOR_PYTEST
  • Loading branch information
RonnyPfannschmidt committed Dec 13, 2020
1 parent 37b154b commit 28afba6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Expand Up @@ -190,7 +190,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install --upgrade wheel setuptools tox
pip install --upgrade wheel setuptools setuptools_scm[toml] tox
- name: Build package
run: |
python setup.py sdist bdist_wheel
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Expand Up @@ -2,7 +2,7 @@
requires = [
# sync with setup.py until we discard non-pep-517/518
"setuptools>=42.0",
"setuptools-scm[toml]>=3.4",
"setuptools-scm[toml]>=5.0",
"wheel",
]
build-backend = "setuptools.build_meta"
Expand Down
2 changes: 1 addition & 1 deletion scripts/release.py
Expand Up @@ -63,7 +63,7 @@ def regen(version):
print(f"{Fore.CYAN}[generate.regen] {Fore.RESET}Updating docs")
check_call(
["tox", "-e", "regen"],
env={**os.environ, "SETUPTOOLS_SCM_PRETEND_VERSION": version},
env={**os.environ, "SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PYTEST": version},
)


Expand Down
6 changes: 1 addition & 5 deletions tox.ini
Expand Up @@ -84,9 +84,7 @@ commands =
[testenv:regen]
changedir = doc/en
basepython = python3
passenv = SETUPTOOLS_SCM_PRETEND_VERSION
# TODO: When setuptools-scm 5.0.0 is released, use SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PYTEST
# and remove the next line.
passenv = SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PYTEST
install_command=python -m pip --use-deprecated=legacy-resolver install {opts} {packages}
deps =
dataclasses
Expand All @@ -113,8 +111,6 @@ changedir = testing/plugins_integration
deps = -rtesting/plugins_integration/requirements.txt
setenv =
PYTHONPATH=.
# due to pytest-rerunfailures requiring 6.2+; can be removed after 6.2.0
SETUPTOOLS_SCM_PRETEND_VERSION=6.2.0a1
commands =
pip check
pytest bdd_wallet.py
Expand Down

0 comments on commit 28afba6

Please sign in to comment.