Update to xmlsec v1.3.14 (#1799)

* Update to xmlsec v1.3.14
* Remove a couple more packages from docker build

.github/workflows/codeql-analysis.yml

@@ -24,11 +24,6 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Install Apt Packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install --yes libxmlsec1-dev libxml2-dev
-
     - name: Update pip
       run: |
         pip install --upgrade pip

.github/workflows/mypy.yml

@@ -23,11 +23,6 @@ jobs:
           cache: true
           cache-restore-only: true
 
-      - name: Install OS Packages 🧰
-        run: |
-          sudo apt-get update
-          sudo apt-get install --yes libxmlsec1-dev libxml2-dev
-
       - name: Install Python Packages 📦
         run: poetry install --without ci --no-root
 

.github/workflows/test.yml

@@ -34,11 +34,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install Apt Packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install --yes libxmlsec1-dev libxml2-dev
-
       - name: Install Poetry
         uses: ./.github/actions/poetry
         with:
@@ -82,11 +77,6 @@ jobs:
         with:
           python-version: "3.10"
 
-      - name: Install Apt Packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install --yes libxmlsec1-dev libxml2-dev
-
       - name: Install Poetry
         uses: ./.github/actions/poetry
         with:

.pre-commit-config.yaml

@@ -60,7 +60,7 @@ repos:
     hooks:
       - id: toml-sort
         args: []
-        files: pyproject\.toml|poetry\.toml
+        files: pyproject\.toml
 
   - repo: https://github.com/jackdewinter/pymarkdown
     rev: v0.9.13.4

README.md

@@ -62,23 +62,6 @@ If you do not yet have Homebrew, you can install it by running the following:
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 ```
 
-While you're at it, go ahead and install the following required dependencies:
-
-```sh
-brew install pkg-config libffi
-brew install libjpeg
-```
-
-The version of libxmlsec1 (v1.3) that ships with brew is currently not compatible with the python
-xmlsec package that we use (for more details see
-[this xmlsec issue](https://github.com/xmlsec/python-xmlsec/issues/163)). In order to install a
-compatible version of libxmlsec1, you can use the following command:
-
-```sh
-brew tap jonathangreen/xmlsec
-brew install [email protected]
-```
-
 #### Linux
 
 Most distributions will offer Python packages. On Arch Linux, the following command is sufficient:

docker/Dockerfile

@@ -17,7 +17,7 @@ COPY docker/startup /etc/my_init.d/
 COPY --chmod=644 docker/services/logrotate /etc/
 
 # Copy our poetry files into the image and install our dependencies.
-COPY --chown=simplified:simplified poetry.lock poetry.toml pyproject.toml /var/www/circulation/
+COPY --chown=simplified:simplified poetry.lock pyproject.toml /var/www/circulation/
 RUN . env/bin/activate && \
     poetry install --only main,pg --sync --no-root
 

docker/Dockerfile.baseimage

@@ -33,9 +33,6 @@ RUN install_clean \
       libpcre3-dev \
       # needed for psycopg2
       libpq-dev \
-      # needed for xmlsec
-      libxmlsec1-dev \
-      libxmlsec1-openssl \
       tzdata \
       pkg-config && \
     curl -sSL https://install.python-poetry.org | POETRY_HOME="/opt/poetry" python3 - --yes --version $POETRY_VERSION && \
@@ -53,7 +50,7 @@ RUN useradd -ms /bin/bash -U simplified && \
     mkdir /var/log/simplified
 
 WORKDIR /var/www/circulation
-COPY --chown=simplified:simplified poetry.lock poetry.toml pyproject.toml /var/www/circulation/
+COPY --chown=simplified:simplified poetry.lock pyproject.toml /var/www/circulation/
 
 # Setup virtualenv and install our python dependencies.
 # What we install is based on the poetry.lock file in the repo at the time this
@@ -72,6 +69,5 @@ RUN python3 -m venv env && \
     rm -Rf /root/.cache && \
     rm pyproject.toml && \
     rm poetry.lock && \
-    rm poetry.toml && \
     rm -rf /root/.cache && \
     /bd_build/cleanup.sh