Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eed37d4771 | ||
|
|
3e9284b6e0 | ||
|
|
ccdab727a2 | ||
|
|
0c981d3547 | ||
|
|
38dcf52ae6 | ||
|
|
f2633f1b37 |
16
.github/workflows/main.yml
vendored
16
.github/workflows/main.yml
vendored
@@ -40,7 +40,10 @@ jobs:
|
|||||||
python: "3.8"
|
python: "3.8"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
# Needed to fetch tags, which are required by setuptools-scm.
|
||||||
|
fetch-depth: 0
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v2
|
uses: actions/setup-python@v2
|
||||||
with:
|
with:
|
||||||
@@ -62,7 +65,10 @@ jobs:
|
|||||||
needs: build
|
needs: build
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
# Needed to fetch tags, which are required by setuptools-scm.
|
||||||
|
fetch-depth: 0
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v2
|
uses: actions/setup-python@v2
|
||||||
with:
|
with:
|
||||||
@@ -70,12 +76,12 @@ jobs:
|
|||||||
- name: Install wheel
|
- name: Install wheel
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install wheel
|
pip install build
|
||||||
- name: Build package
|
- name: Build package
|
||||||
run: |
|
run: |
|
||||||
python setup.py sdist bdist_wheel
|
python -m build
|
||||||
- name: Publish package to PyPI
|
- name: Publish package to PyPI
|
||||||
uses: pypa/gh-action-pypi-publish@master
|
uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
with:
|
with:
|
||||||
user: __token__
|
user: __token__
|
||||||
password: ${{ secrets.pypi_token }}
|
password: ${{ secrets.pypi_token }}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
pytest-xdist 3.0.0 (2022-10-24)
|
pytest-xdist 3.0.2 (2022-10-25)
|
||||||
===============================
|
===============================
|
||||||
|
|
||||||
Bug Fixes
|
Bug Fixes
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
[build-system]
|
[build-system]
|
||||||
requires = [
|
requires = [
|
||||||
# sync with setup.py until we discard non-pep-517/518
|
|
||||||
"setuptools>=45.0",
|
"setuptools>=45.0",
|
||||||
"setuptools-scm[toml]>=6.2.3",
|
"setuptools-scm[toml]>=6.2.3",
|
||||||
"wheel",
|
"wheel",
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ python_requires = >=3.6
|
|||||||
install_requires =
|
install_requires =
|
||||||
execnet>=1.1
|
execnet>=1.1
|
||||||
pytest>=6.2.0
|
pytest>=6.2.0
|
||||||
setup_requires = # left empty, enforce using isolated build system
|
|
||||||
|
|
||||||
[options.packages.find]
|
[options.packages.find]
|
||||||
where = src
|
where = src
|
||||||
|
|||||||
4
setup.py
4
setup.py
@@ -1,4 +0,0 @@
|
|||||||
from setuptools import setup
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
setup()
|
|
||||||
@@ -18,7 +18,9 @@ def pytest_xdist_auto_num_workers(config):
|
|||||||
try:
|
try:
|
||||||
return int(env_var)
|
return int(env_var)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
warnings.warn("PYTEST_XDIST_AUTO_NUM_WORKERS is not a number: {env_var!r}. Ignoring it.")
|
warnings.warn(
|
||||||
|
"PYTEST_XDIST_AUTO_NUM_WORKERS is not a number: {env_var!r}. Ignoring it."
|
||||||
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import psutil
|
import psutil
|
||||||
|
|||||||
@@ -28,8 +28,8 @@ class Producer:
|
|||||||
"""
|
"""
|
||||||
Simplified implementation of the same interface as py.log, for backward compatibility
|
Simplified implementation of the same interface as py.log, for backward compatibility
|
||||||
since we dropped the dependency on pylib.
|
since we dropped the dependency on pylib.
|
||||||
Note: this is defined here because this module can't depend on xdist, so we need
|
Note: this is defined here because this module can't depend on xdist, so we need
|
||||||
to have the other way around.
|
to have the other way around.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, name: str, *, enabled: bool = True):
|
def __init__(self, name: str, *, enabled: bool = True):
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ import pytest
|
|||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def monkeypatch_3_cpus(monkeypatch: pytest.MonkeyPatch):
|
def monkeypatch_3_cpus(monkeypatch: pytest.MonkeyPatch):
|
||||||
"""Make pytest-xdist believe the system has 3 CPUs"""
|
"""Make pytest-xdist believe the system has 3 CPUs"""
|
||||||
monkeypatch.setitem(sys.modules, "psutil", None) # block import
|
# block import
|
||||||
|
monkeypatch.setitem(sys.modules, "psutil", None) # type: ignore
|
||||||
monkeypatch.delattr(os, "sched_getaffinity", raising=False)
|
monkeypatch.delattr(os, "sched_getaffinity", raising=False)
|
||||||
monkeypatch.setattr(os, "cpu_count", lambda: 3)
|
monkeypatch.setattr(os, "cpu_count", lambda: 3)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user