Skip to content

Commit aa09fc3

Browse files
authored
Merge pull request #33 from aristanetworks/feature/remove-pytest-version-constraint
Remove pytest < 7.3 version constraint
2 parents 1acbe1e + aef6b9a commit aa09fc3

File tree

6 files changed

+26
-27
lines changed

6 files changed

+26
-27
lines changed

.github/workflows/build.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
test:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-22.04
1111
strategy:
1212
matrix:
1313
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
@@ -29,12 +29,12 @@ jobs:
2929
run: |
3030
tox -s -e "py37,py38,py39,py310,py311"
3131
32-
# - name: Test Summary
33-
# uses: test-summary/action@v1
34-
# with:
35-
# paths: |
36-
# test-reports/*.xml
37-
# if: always()
32+
# - name: Test Summary
33+
# uses: test-summary/action@v1
34+
# with:
35+
# paths: |
36+
# test-reports/*.xml
37+
# if: always()
3838

3939
lint:
4040
runs-on: ubuntu-latest

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
FROM fedora:34 as base
1+
FROM fedora:34 AS base
22

33
RUN dnf -y update && dnf clean all
44
RUN dnf -y install python3.7 python3.8 python3.9 python3.10 python3.11 tox git && dnf clean all
55
RUN python3 -m pip install --upgrade build twine mkdocs && dnf clean all
66

7-
FROM base as build
7+
FROM base AS build
88
ADD . /src
99
WORKDIR /src
1010

1111
CMD ["tox"]
1212

1313
# Recipes to run tox
14-
FROM build as run
14+
FROM build AS run
1515
RUN tox
1616

17-
FROM scratch as results
17+
FROM scratch AS results
1818
COPY --from=run /src/test-reports /
1919

2020
# Recipes to build the documentation
21-
FROM build as build_docs
21+
FROM build AS build_docs
2222
RUN pip3 install pyeapi pexpect
2323
RUN mkdocs build
2424

25-
FROM scratch as docs
25+
FROM scratch AS docs
2626
COPY --from=build_docs /src/site /
2727

2828
# Recipes to build the distribution package
29-
FROM build as build_package
29+
FROM build AS build_package
3030
RUN python3 -m build && twine check dist/*
3131

32-
FROM scratch as package
32+
FROM scratch AS package
3333
COPY --from=build_package /src/dist/ /

Makefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,19 @@ BUILD_DIR=$(CURDIR)/build
2323
all: package_docker
2424
ci: tox_docker
2525

26-
# Any target that ends in a slash is a directory to be mkdir'd
27-
%/:
26+
$(BUILD_DIR)/:
2827
mkdir -p $@
2928

3029
tox_docker: |$(BUILD_DIR)/
3130
rm -rf $(BUILD_DIR)/test-reports
32-
docker buildx build . --target=results --output=type=local,dest=$(BUILD_DIR)/test-reports && \
31+
docker buildx build . --target=results --output=type=local,dest=$(BUILD_DIR)/test-reports && \
3332
touch $(BUILD_DIR)/test-reports/*.xml
3433

35-
mkdocs_docker: |$(BUILD_DIR)
36-
DOCKER_BUILDKIT=1 docker build . --target=docs --output=type=local,dest=$(BUILD_DIR)/docs
34+
mkdocs_docker: |$(BUILD_DIR)/
35+
docker buildx build . --target=docs --output=type=local,dest=$(BUILD_DIR)/docs
3736

3837
package_docker: |$(BUILD_DIR)/
39-
DOCKER_BUILDKIT=1 docker build . --target=package --output=type=local,dest=$(BUILD_DIR)/dist
38+
docker buildx build . --target=package --output=type=local,dest=$(BUILD_DIR)/dist
4039

4140
clean:
4241
rm -rf $(BUILD_DIR)

setup.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ package_dir=
3838

3939
install_requires =
4040
pexpect >= 4.8.0
41-
pyeapi>=0.8.4
42-
pytest>=3.5.0,<7.3
43-
six>=1.15
44-
packaging>=22.0
41+
pyeapi >= 0.8.4
42+
pytest >= 3.5.0
43+
six >= 1.15
44+
packaging >= 22.0
4545

4646
[options.packages.find]
4747
where=src

src/pytest_netdut/px.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def is_at_prompt(self):
135135

136136

137137
class CLI(Shell):
138-
def __init__( # pylint: disable=dangerous-default-value,too-many-arguments
138+
def __init__( # pylint: disable=dangerous-default-value,too-many-arguments,too-many-positional-arguments
139139
self,
140140
url,
141141
username="admin",

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ envlist = py37,py38,py39,py310,py311,black,prospector,tmpblack
55

66
[testenv]
77
deps =
8-
pytest < 7.3
8+
pytest
99
pytest-mock
1010
commands = pytest -v --junit-xml=test-reports/{envname}.xml --junit-prefix={envname} tests
1111

0 commit comments

Comments
 (0)