Skip to content

Commit ad00bf6

Browse files
authored
Merge pull request #65 from espressif/fix/packages_dependency_versions
build: fix setup.py dependency issues
2 parents 80e4aa4 + 101a548 commit ad00bf6

File tree

7 files changed

+23
-18
lines changed

7 files changed

+23
-18
lines changed

.github/workflows/python_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- ESP32-C3
1717
strategy:
1818
matrix:
19-
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
19+
python-version: ['3.6', '3.10']
2020
fail-fast: false
2121
container:
2222
image: python:${{ matrix.python-version }}-bullseye

pytest-embedded-arduino/setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,18 @@ def get_version():
2222
SHORT_DESCRIPTION = 'pytest embedded plugin for Arduino projects'
2323
LICENSE = 'MIT'
2424
URL = 'https://docs.espressif.com/projects/pytest-embedded/en/latest/'
25+
VERSION = get_version()
2526
REQUIRES = [
26-
'pytest-embedded',
27+
f'pytest-embedded~={VERSION}',
2728
]
2829
EXTRAS_REQUIRE = {
29-
'serial': 'pytest-embedded-serial-esp',
30+
'serial': f'pytest-embedded-serial-esp~={VERSION}',
3031
}
3132
ENTRY_POINTS = {}
3233

3334
setup(
3435
name=NAME,
35-
version=get_version(),
36+
version=VERSION,
3637
author=AUTHOR,
3738
author_email=EMAIL,
3839
license=LICENSE,

pytest-embedded-idf/setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,18 @@ def get_version():
2222
SHORT_DESCRIPTION = 'pytest embedded plugin for esp-idf project'
2323
LICENSE = 'MIT'
2424
URL = 'https://docs.espressif.com/projects/pytest-embedded/en/latest/'
25+
VERSION = get_version()
2526
REQUIRES = [
26-
'pytest-embedded',
27+
f'pytest-embedded~={VERSION}',
2728
]
2829
EXTRAS_REQUIRE = {
29-
'serial': 'pytest-embedded-serial-esp',
30+
'serial': f'pytest-embedded-serial-esp~={VERSION}',
3031
}
3132
ENTRY_POINTS = {}
3233

3334
setup(
3435
name=NAME,
35-
version=get_version(),
36+
version=VERSION,
3637
author=AUTHOR,
3738
author_email=EMAIL,
3839
license=LICENSE,

pytest-embedded-jtag/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ def get_version():
2222
SHORT_DESCRIPTION = 'pytest embedded plugin for testing with jtag'
2323
LICENSE = 'MIT'
2424
URL = 'https://docs.espressif.com/projects/pytest-embedded/en/latest/'
25+
VERSION = get_version()
2526
REQUIRES = [
26-
'pytest-embedded',
27-
'pytest-embedded-serial',
27+
f'pytest-embedded-serial~={VERSION}',
2828
]
2929
ENTRY_POINTS = {}
3030

3131
setup(
3232
name=NAME,
33-
version=get_version(),
33+
version=VERSION,
3434
author=AUTHOR,
3535
author_email=EMAIL,
3636
license=LICENSE,

pytest-embedded-qemu/setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,18 @@ def get_version():
2222
SHORT_DESCRIPTION = 'pytest embedded plugin for qemu, not target chip'
2323
LICENSE = 'MIT'
2424
URL = 'https://docs.espressif.com/projects/pytest-embedded/en/latest/'
25+
VERSION = get_version()
2526
REQUIRES = [
26-
'pytest-embedded',
27+
f'pytest-embedded~={VERSION}',
2728
]
2829
EXTRAS_REQUIRE = {
29-
'idf': 'pytest-embedded-idf',
30+
'idf': f'pytest-embedded-idf~={VERSION}',
3031
}
3132
ENTRY_POINTS = {}
3233

3334
setup(
3435
name=NAME,
35-
version=get_version(),
36+
version=VERSION,
3637
author=AUTHOR,
3738
author_email=EMAIL,
3839
license=LICENSE,

pytest-embedded-serial-esp/setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ def get_version():
2222
SHORT_DESCRIPTION = 'pytest embedded plugin for testing espressif boards via serial ports'
2323
LICENSE = 'MIT'
2424
URL = 'https://docs.espressif.com/projects/pytest-embedded/en/latest/'
25+
VERSION = get_version()
2526
REQUIRES = [
26-
'pytest-embedded-serial',
27-
'esptool>=3.1',
27+
f'pytest-embedded-serial~={VERSION}',
28+
'esptool~=3.1',
2829
]
2930
ENTRY_POINTS = {}
3031

pytest-embedded-serial/setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ def get_version():
2222
SHORT_DESCRIPTION = 'pytest embedded plugin for testing serial ports'
2323
LICENSE = 'MIT'
2424
URL = 'https://docs.espressif.com/projects/pytest-embedded/en/latest/'
25+
VERSION = get_version()
2526
REQUIRES = [
26-
'pytest-embedded',
27-
'pyserial>=3.0',
27+
f'pytest-embedded~={VERSION}',
28+
'pyserial~=3.0',
2829
]
2930
ENTRY_POINTS = {}
3031

3132
setup(
3233
name=NAME,
33-
version=get_version(),
34+
version=VERSION,
3435
author=AUTHOR,
3536
author_email=EMAIL,
3637
license=LICENSE,

0 commit comments

Comments
 (0)