From 2665275a1ef57008cf98d0293e23fee990a67f89 Mon Sep 17 00:00:00 2001 From: Mat Kelly Date: Fri, 24 May 2024 11:25:25 -0400 Subject: [PATCH 1/8] Update Flask for debugging #831 --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ae88d1df..41cb2a45 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ warcio>=1.5.3 ipfshttpclient>=0.8.0a -Flask==2.3.2 +Flask>=3.0 pycryptodome>=3.4.11 requests>=2.19.1 beautifulsoup4>=4.6.3 diff --git a/setup.py b/setup.py index fd657e29..7579e1b4 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ install_requires=[ 'warcio>=1.5.3', 'ipfshttpclient>=0.8.0a', - 'Flask==2.3.2', + 'Flask>=3.0', 'pycryptodome>=3.4.11', 'requests>=2.19.1', 'beautifulsoup4>=4.6.3', From 3de623ddf76a28190a1764a84f7445ef137d5491 Mon Sep 17 00:00:00 2001 From: Mat Kelly Date: Fri, 24 May 2024 14:25:17 -0400 Subject: [PATCH 2/8] Fix version reported of SW to UI --- ipwb/assets/webui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipwb/assets/webui.js b/ipwb/assets/webui.js index 75e6973e..0dfec66a 100644 --- a/ipwb/assets/webui.js +++ b/ipwb/assets/webui.js @@ -234,7 +234,7 @@ function injectIPWBJS () { // eslint-disable-line no-unused-vars function getServiceWorkerVersion () { return window.fetch(document.location.href) .then(function (resp) { - return Promise.resolve(resp.headers.get('Server').split('/')[1]) + return Promise.resolve(resp.headers.get('Server').split('/').at(-1)) }) } From 629ae1729ef8a878742d2b69da9cab2f0fb50da6 Mon Sep 17 00:00:00 2001 From: Mat Kelly Date: Fri, 24 May 2024 14:42:23 -0400 Subject: [PATCH 3/8] RELEASE: Bump version to 0.2024.05.24.1842 --- ipwb/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipwb/__init__.py b/ipwb/__init__.py index a71b1ba2..c4e01198 100644 --- a/ipwb/__init__.py +++ b/ipwb/__init__.py @@ -1 +1 @@ -__version__ = '0.2023.08.16.1719' +__version__ = '0.2024.05.24.1842' From 385d55bdc34d7255c4e68a2a40ee083f5c9f8965 Mon Sep 17 00:00:00 2001 From: Mat Kelly Date: Wed, 12 Jun 2024 09:28:02 -0400 Subject: [PATCH 4/8] Update tests to use kubo 0.29.0 Closes #833 --- .github/workflows/test.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02518955..488876c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,10 +20,10 @@ jobs: - "3.10" - "3.11" ipfs: - - "0.25" - "0.26" - "0.27" - "0.28" + - "0.29" runs-on: ${{ matrix.os }} name: ${{ matrix.os }} Py-${{ matrix.python }} IPFS-${{ matrix.ipfs }} steps: diff --git a/Dockerfile b/Dockerfile index 73988567..47a9d6d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN mkdir -p /data/{warc,cdxj,ipfs} # Download and install IPFS ENV IPFS_PATH=/data/ipfs -ARG IPFS_VERSION=v0.28.0 +ARG IPFS_VERSION=v0.29.0 RUN cd /tmp \ && wget -q https://dist.ipfs.io/kubo/${IPFS_VERSION}/kubo_${IPFS_VERSION}_linux-amd64.tar.gz \ && tar xvfz kubo*.tar.gz \ From cbf8a4bfa97a603f8f0974b697890c0a9f9e3ace Mon Sep 17 00:00:00 2001 From: Mat Kelly Date: Wed, 26 Jun 2024 14:14:57 -0400 Subject: [PATCH 5/8] Pull arch-specific version of kubo in Dockerfile Closes #835 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 47a9d6d4..9c0f9cd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,8 +22,9 @@ RUN mkdir -p /data/{warc,cdxj,ipfs} # Download and install IPFS ENV IPFS_PATH=/data/ipfs ARG IPFS_VERSION=v0.29.0 +ARG BUILDARCH RUN cd /tmp \ - && wget -q https://dist.ipfs.io/kubo/${IPFS_VERSION}/kubo_${IPFS_VERSION}_linux-amd64.tar.gz \ + && wget -q https://dist.ipfs.io/kubo/${IPFS_VERSION}/kubo_${IPFS_VERSION}_linux-$BUILDARCH.tar.gz \ && tar xvfz kubo*.tar.gz \ && mv kubo/ipfs /usr/local/bin/ipfs \ && rm -rf kubo* \ From c67f55a96b4ea077756a6f18f1d76c572e7f9227 Mon Sep 17 00:00:00 2001 From: Mat Kelly Date: Wed, 26 Jun 2024 14:35:00 -0400 Subject: [PATCH 6/8] Update GH actions of setup python and checkout for #789 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 488876c5..35f5a9d5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,9 +27,9 @@ jobs: runs-on: ${{ matrix.os }} name: ${{ matrix.os }} Py-${{ matrix.python }} IPFS-${{ matrix.ipfs }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} - name: Set up IPFS ${{ matrix.ipfs }} From dde665bbea4f5c99640a36fd6ea4326e36fc3b70 Mon Sep 17 00:00:00 2001 From: Mat Kelly Date: Wed, 26 Jun 2024 14:39:27 -0400 Subject: [PATCH 7/8] Update GitHub Actions' versions to latest --- .github/workflows/build.yml | 4 ++-- .github/workflows/codeql.yml | 2 +- .github/workflows/comment-run.yml | 4 ++-- .github/workflows/dist.yml | 4 ++-- .github/workflows/lint.yml | 2 +- .github/workflows/release.yml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5ccfabe..2a51a1c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,13 +12,13 @@ jobs: runs-on: ubuntu-latest name: Docker Image steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - id: imgtagger run: | imgtags=$(echo "${{ github.ref }}" | sed 's/refs\/tags\//latest,/; s/refs\/heads\///') echo "::set-output name=imgtags::$imgtags" - name: Build and Push to DockerHub - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 69cc0ef8..823668cd 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. diff --git a/.github/workflows/comment-run.yml b/.github/workflows/comment-run.yml index 73befaad..4e88e5ef 100644 --- a/.github/workflows/comment-run.yml +++ b/.github/workflows/comment-run.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code (Deep) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up IPFS and Rub Daemon @@ -20,7 +20,7 @@ jobs: with: run_daemon: true - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 - name: Install Test Dependencies run: pip install -r test-requirements.txt - name: Install IPWB from Source diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 74bf9d1d..c383d9df 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -10,9 +10,9 @@ jobs: name: Build and Publish Package runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.8 - name: Upgrade setuptools and wheel diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a1476d99..3ea575be 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest name: Py and JS steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Lint JavaScript run: | npm install standard diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49a2bbab..c67ab363 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Extract Repo Attributes From 92be84dead2381368f8e506382f82116d4fc719c Mon Sep 17 00:00:00 2001 From: Mat Kelly Date: Wed, 26 Jun 2024 15:03:12 -0400 Subject: [PATCH 8/8] Update actions to use WS-DL variant of setup-ipfs --- .github/workflows/comment-run.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/comment-run.yml b/.github/workflows/comment-run.yml index 4e88e5ef..2afc91b9 100644 --- a/.github/workflows/comment-run.yml +++ b/.github/workflows/comment-run.yml @@ -16,7 +16,7 @@ jobs: with: fetch-depth: 0 - name: Set up IPFS and Rub Daemon - uses: ibnesayeed/setup-ipfs@master + uses: oduwsdl/setup-ipfs@main with: run_daemon: true - name: Set up Python diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35f5a9d5..7a758b2c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: with: python-version: ${{ matrix.python }} - name: Set up IPFS ${{ matrix.ipfs }} - uses: ibnesayeed/setup-ipfs@master + uses: oduwsdl/setup-ipfs@main with: ipfs_version: ${{ matrix.ipfs }} run_daemon: true