Skip to content

Commit

Permalink
Merge pull request #4260 from gizmoguy/eventlet-dnspython
Browse files Browse the repository at this point in the history
Remove dnspython pin.
  • Loading branch information
gizmoguy committed Apr 18, 2023
2 parents 943efd7 + a8e0552 commit b7c92cf
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/tests-codecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v3
- if: ${{ github.event_name == 'pull_request' }}
name: Setup dependencies
name: Setup dependencies for changed files action
run: |
sudo apt-get update -y
sudo apt-get install -y jq
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- if: ${{ github.event_name == 'pull_request' }}
name: Get file changes
id: file_changes
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v3
- if: ${{ github.event_name == 'pull_request' }}
name: Setup dependencies
name: Setup dependencies for changed files action
run: |
sudo apt-get update -y
sudo apt-get install -y jq
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- if: ${{ github.event_name == 'pull_request' }}
name: Get file changes
id: file_changes
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/tests-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v3
- if: ${{ github.event_name == 'pull_request' }}
name: Setup dependencies
name: Setup dependencies for changed files action
run: |
sudo apt-get update -y
sudo apt-get install -y jq
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- if: ${{ github.event_name == 'pull_request' }}
name: Get file changes
id: file_changes
Expand Down Expand Up @@ -86,10 +87,11 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v3
- if: ${{ github.event_name == 'pull_request' && github.event.before != '0000000000000000000000000000000000000000' }}
name: Setup dependencies
name: Setup dependencies for changed files action
run: |
sudo apt-get update -y
sudo apt-get install -y jq
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- if: ${{ github.event_name == 'pull_request' && github.event.before != '0000000000000000000000000000000000000000' }}
name: Get file changes
id: file_changes
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v3
- if: ${{ github.event_name == 'pull_request' }}
name: Setup dependencies
name: Setup dependencies for changed files action
run: |
sudo apt-get update -y
sudo apt-get install -y jq
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- if: ${{ github.event_name == 'pull_request' }}
name: Get file changes
id: file_changes
Expand Down
5 changes: 2 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ Depends: python3-influxdb (>= 2.12.0),
python3-pbr (>= 1.9),
python3-prometheus-client (>= 0.16.0), python3-prometheus-client (<< 0.16.1),
python3-ruamel.yaml (>= 0.17.21), python3-ruamel.yaml (<< 0.17.22),
python3-dnspython (<< 2.3.0),
python3-os-ken (>= 2.6.0), python3-os-ken (<< 2.6.1),
python3-beka (>= 0.4.1), python3-beka (<< 0.4.2),
python3-chewie (>= 0.0.24), python3-chewie (<< 0.0.25),
python3-beka (>= 0.4.2), python3-beka (<< 0.4.3),
python3-chewie (>= 0.0.25), python3-chewie (<< 0.0.26),
python3-pytricia (>= 1.0.0),
python3:any (>= 3.8~),
${misc:Depends},
Expand Down
7 changes: 2 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
chewie==0.0.24
chewie==0.0.25
influxdb>=2.12.0
networkx>=1.9
pbr>=1.9
prometheus_client==0.16.0
ruamel.yaml==0.17.21
# dnspython 2.3.0 is not compatible with eventlet
# https://github.com/eventlet/eventlet/issues/781
dnspython<2.3.0
os_ken==2.6.0
beka==0.4.1
beka==0.4.2
pytricia>=1.0.0

0 comments on commit b7c92cf

Please sign in to comment.