Skip to content

Commit b7c92cf

Browse files
authored
Merge pull request #4260 from gizmoguy/eventlet-dnspython
Remove dnspython pin.
2 parents 943efd7 + a8e0552 commit b7c92cf

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

.github/workflows/tests-codecheck.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ jobs:
1414
- name: Checkout repo
1515
uses: actions/checkout@v3
1616
- if: ${{ github.event_name == 'pull_request' }}
17-
name: Setup dependencies
17+
name: Setup dependencies for changed files action
1818
run: |
1919
sudo apt-get update -y
2020
sudo apt-get install -y jq
21+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
2122
- if: ${{ github.event_name == 'pull_request' }}
2223
name: Get file changes
2324
id: file_changes

.github/workflows/tests-docs.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ jobs:
1414
- name: Checkout repo
1515
uses: actions/checkout@v3
1616
- if: ${{ github.event_name == 'pull_request' }}
17-
name: Setup dependencies
17+
name: Setup dependencies for changed files action
1818
run: |
1919
sudo apt-get update -y
2020
sudo apt-get install -y jq
21+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
2122
- if: ${{ github.event_name == 'pull_request' }}
2223
name: Get file changes
2324
id: file_changes

.github/workflows/tests-integration.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ jobs:
1717
- name: Checkout repo
1818
uses: actions/checkout@v3
1919
- if: ${{ github.event_name == 'pull_request' }}
20-
name: Setup dependencies
20+
name: Setup dependencies for changed files action
2121
run: |
2222
sudo apt-get update -y
2323
sudo apt-get install -y jq
24+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
2425
- if: ${{ github.event_name == 'pull_request' }}
2526
name: Get file changes
2627
id: file_changes
@@ -86,10 +87,11 @@ jobs:
8687
- name: Checkout repo
8788
uses: actions/checkout@v3
8889
- if: ${{ github.event_name == 'pull_request' && github.event.before != '0000000000000000000000000000000000000000' }}
89-
name: Setup dependencies
90+
name: Setup dependencies for changed files action
9091
run: |
9192
sudo apt-get update -y
9293
sudo apt-get install -y jq
94+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
9395
- if: ${{ github.event_name == 'pull_request' && github.event.before != '0000000000000000000000000000000000000000' }}
9496
name: Get file changes
9597
id: file_changes

.github/workflows/tests-unit.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ jobs:
1818
- name: Checkout repo
1919
uses: actions/checkout@v3
2020
- if: ${{ github.event_name == 'pull_request' }}
21-
name: Setup dependencies
21+
name: Setup dependencies for changed files action
2222
run: |
2323
sudo apt-get update -y
2424
sudo apt-get install -y jq
25+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
2526
- if: ${{ github.event_name == 'pull_request' }}
2627
name: Get file changes
2728
id: file_changes

debian/control

+2-3
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ Depends: python3-influxdb (>= 2.12.0),
3131
python3-pbr (>= 1.9),
3232
python3-prometheus-client (>= 0.16.0), python3-prometheus-client (<< 0.16.1),
3333
python3-ruamel.yaml (>= 0.17.21), python3-ruamel.yaml (<< 0.17.22),
34-
python3-dnspython (<< 2.3.0),
3534
python3-os-ken (>= 2.6.0), python3-os-ken (<< 2.6.1),
36-
python3-beka (>= 0.4.1), python3-beka (<< 0.4.2),
37-
python3-chewie (>= 0.0.24), python3-chewie (<< 0.0.25),
35+
python3-beka (>= 0.4.2), python3-beka (<< 0.4.3),
36+
python3-chewie (>= 0.0.25), python3-chewie (<< 0.0.26),
3837
python3-pytricia (>= 1.0.0),
3938
python3:any (>= 3.8~),
4039
${misc:Depends},

requirements.txt

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
chewie==0.0.24
1+
chewie==0.0.25
22
influxdb>=2.12.0
33
networkx>=1.9
44
pbr>=1.9
55
prometheus_client==0.16.0
66
ruamel.yaml==0.17.21
7-
# dnspython 2.3.0 is not compatible with eventlet
8-
# https://github.com/eventlet/eventlet/issues/781
9-
dnspython<2.3.0
107
os_ken==2.6.0
11-
beka==0.4.1
8+
beka==0.4.2
129
pytricia>=1.0.0

0 commit comments

Comments
 (0)