Skip to content

Commit

Permalink
Remove LDAP from build and unit test dependencies
Browse files Browse the repository at this point in the history
Also update comment to remove no-long applicable reference.
  • Loading branch information
tofu-rocketry committed Sep 9, 2024
1 parent dd2f918 commit 55d8681
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 15 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: 'pip'

- name: Set up dependencies for python-ldap
run: sudo apt-get install libsasl2-dev libldap2-dev libssl-dev

- name: Base requirements for SSM
run: pip install -r requirements.txt

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pyopenssl >=19.1.0, <=21.0.0 # 22.0.0 dropped support for Python 2
cryptography==3.3.2 # Crypto dropped support for Python 2 after 3.3
stomp.py<5.0.0
python-daemon<=2.3.0 # 2.3.1 dropped support for Python 2
setuptools # Required for pkg_resources (also happens to be a dependency of python-ldap)
setuptools # Required for pkg_resources

# Dependencies for optional dirq based sending
dirq
3 changes: 0 additions & 3 deletions scripts/ssm-build-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ fpm -s python -t deb \
--depends python2.7 \
--depends python-pip \
--depends 'python-stomp < 5.0.0' \
--depends python-ldap \
--depends libssl-dev \
--depends libsasl2-dev \
--depends openssl \
--deb-changelog $SOURCE_DIR/ssm-$TAG/CHANGELOG \
--python-install-bin /usr/bin \
Expand Down
8 changes: 0 additions & 8 deletions scripts/ssm-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@ if [[ ${PY_NUM:0:1} == "3" ]]; then
--depends python3-openssl \
--depends python3-daemon \
--depends 'python3-stomp' \
--depends python3-ldap \
--depends libssl-dev \
--depends libsasl2-dev \
--depends openssl "

# Currently builds for el8
Expand All @@ -149,7 +146,6 @@ if [[ ${PY_NUM:0:1} == "3" ]]; then
--depends python3-cryptography \
--depends python3-pyOpenSSL \
--depends python3-daemon \
--depends python3-ldap \
--depends openssl \
--depends openssl-devel "
fi
Expand All @@ -161,12 +157,9 @@ elif [[ ${PY_NUM:0:1} == "2" ]]; then
FPM_PYTHON="--depends python2.7 \
--depends python-pip \
--depends 'python-stomp < 5.0.0' \
--depends python-ldap \
--depends python-cryptography \
--depends python-openssl \
--depends python-daemon \
--depends libssl-dev \
--depends libsasl2-dev \
--depends openssl "

# el7 and below, due to yum package versions
Expand All @@ -177,7 +170,6 @@ elif [[ ${PY_NUM:0:1} == "2" ]]; then
--depends python2-pyOpenSSL \
--depends python2-daemon \
--depends stomppy \
--depends python-ldap \
--depends openssl \
--depends openssl-devel "
fi
Expand Down

0 comments on commit 55d8681

Please sign in to comment.