diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a3bb0b..3dcc683 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,10 +28,12 @@ jobs: role-session-name: deploy-ideas mask-aws-account-id: false - - name: Set up Python 3 - uses: actions/setup-python@v2 + - name: Set up Python & PDM + uses: pdm-project/setup-pdm@v3 with: python-version: "3.11" + cache: true + cache-dependency-path: ./pyproject.toml - name: Set up Node uses: actions/setup-node@v2 @@ -40,8 +42,6 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade pip pip-tools - pip-sync requirements.txt npm install echo "$GITHUB_WORKSPACE/node_modules/.bin" >> $GITHUB_PATH diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8ab5fc2..e231da9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -18,10 +18,12 @@ jobs: - uses: actions/checkout@v2 - uses: extractions/setup-just@v1 - - name: Set up Python 3 - uses: actions/setup-python@v2 + - name: Set up Python & PDM + uses: pdm-project/setup-pdm@v3 with: python-version: "3.11" + cache: true + cache-dependency-path: ./pyproject.toml - name: Set up Node uses: actions/setup-node@v2 @@ -30,8 +32,6 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade pip pip-tools - pip-sync requirements.txt npm install echo "$GITHUB_WORKSPACE/node_modules/.bin" >> $GITHUB_PATH @@ -39,4 +39,4 @@ jobs: run: git clone https://github.com/getpelican/pelican-plugins - name: Build the page - run: just build + run: just generate diff --git a/pdm.lock b/pdm.lock index 58d01aa..6ebd1d7 100644 --- a/pdm.lock +++ b/pdm.lock @@ -389,10 +389,10 @@ name = "pelican-photos" version = "1.4.0" requires_python = ">=3.8.1,<4.0" git = "https://github.com/pelican-plugins/photos.git" -revision = "ff1796102b6aafd4f401bf3fe3da004f881afc52" +revision = "d924688922de3cf873183fefcfe2e76c8be58c71" summary = "Add a photo or a gallery of photos to an article" dependencies = [ - "Pillow~=9.0.1", + "Pillow~=10.0.1", "beautifulsoup4~=4.12.2", "pelican>=4.5", "piexif~=1.1.3", @@ -464,15 +464,37 @@ files = [ [[package]] name = "pillow" -version = "9.0.1" -requires_python = ">=3.7" +version = "10.0.1" +requires_python = ">=3.8" summary = "Python Imaging Library (Fork)" files = [ - {file = "Pillow-9.0.1-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:011233e0c42a4a7836498e98c1acf5e744c96a67dd5032a6f666cc1fb97eab97"}, - {file = "Pillow-9.0.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:253e8a302a96df6927310a9d44e6103055e8fb96a6822f8b7f514bb7ef77de56"}, - {file = "Pillow-9.0.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6295f6763749b89c994fcb6d8a7f7ce03c3992e695f89f00b741b4580b199b7e"}, - {file = "Pillow-9.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:a9f44cd7e162ac6191491d7249cceb02b8116b0f7e847ee33f739d7cb1ea1f70"}, - {file = "Pillow-9.0.1.tar.gz", hash = "sha256:6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa"}, + {file = "Pillow-10.0.1-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:fd2a5403a75b54661182b75ec6132437a181209b901446ee5724b589af8edef1"}, + {file = "Pillow-10.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2d7e91b4379f7a76b31c2dda84ab9e20c6220488e50f7822e59dac36b0cd92b1"}, + {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19e9adb3f22d4c416e7cd79b01375b17159d6990003633ff1d8377e21b7f1b21"}, + {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:93139acd8109edcdeffd85e3af8ae7d88b258b3a1e13a038f542b79b6d255c54"}, + {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:92a23b0431941a33242b1f0ce6c88a952e09feeea9af4e8be48236a68ffe2205"}, + {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:cbe68deb8580462ca0d9eb56a81912f59eb4542e1ef8f987405e35a0179f4ea2"}, + {file = "Pillow-10.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:522ff4ac3aaf839242c6f4e5b406634bfea002469656ae8358644fc6c4856a3b"}, + {file = "Pillow-10.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:84efb46e8d881bb06b35d1d541aa87f574b58e87f781cbba8d200daa835b42e1"}, + {file = "Pillow-10.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:898f1d306298ff40dc1b9ca24824f0488f6f039bc0e25cfb549d3195ffa17088"}, + {file = "Pillow-10.0.1-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:bcf1207e2f2385a576832af02702de104be71301c2696d0012b1b93fe34aaa5b"}, + {file = "Pillow-10.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5d6c9049c6274c1bb565021367431ad04481ebb54872edecfcd6088d27edd6ed"}, + {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28444cb6ad49726127d6b340217f0627abc8732f1194fd5352dec5e6a0105635"}, + {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de596695a75496deb3b499c8c4f8e60376e0516e1a774e7bc046f0f48cd620ad"}, + {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:2872f2d7846cf39b3dbff64bc1104cc48c76145854256451d33c5faa55c04d1a"}, + {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:4ce90f8a24e1c15465048959f1e94309dfef93af272633e8f37361b824532e91"}, + {file = "Pillow-10.0.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:ee7810cf7c83fa227ba9125de6084e5e8b08c59038a7b2c9045ef4dde61663b4"}, + {file = "Pillow-10.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b1be1c872b9b5fcc229adeadbeb51422a9633abd847c0ff87dc4ef9bb184ae08"}, + {file = "Pillow-10.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:98533fd7fa764e5f85eebe56c8e4094db912ccbe6fbf3a58778d543cadd0db08"}, + {file = "Pillow-10.0.1-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:32bec7423cdf25c9038fef614a853c9d25c07590e1a870ed471f47fb80b244db"}, + {file = "Pillow-10.0.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7cf63d2c6928b51d35dfdbda6f2c1fddbe51a6bc4a9d4ee6ea0e11670dd981e"}, + {file = "Pillow-10.0.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f6d3d4c905e26354e8f9d82548475c46d8e0889538cb0657aa9c6f0872a37aa4"}, + {file = "Pillow-10.0.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:847e8d1017c741c735d3cd1883fa7b03ded4f825a6e5fcb9378fd813edee995f"}, + {file = "Pillow-10.0.1-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:7f771e7219ff04b79e231d099c0a28ed83aa82af91fd5fa9fdb28f5b8d5addaf"}, + {file = "Pillow-10.0.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:459307cacdd4138edee3875bbe22a2492519e060660eaf378ba3b405d1c66317"}, + {file = "Pillow-10.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b059ac2c4c7a97daafa7dc850b43b2d3667def858a4f112d1aa082e5c3d6cf7d"}, + {file = "Pillow-10.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:d6caf3cd38449ec3cd8a68b375e0c6fe4b6fd04edb6c9766b55ef84a6e8ddf2d"}, + {file = "Pillow-10.0.1.tar.gz", hash = "sha256:d72967b06be9300fed5cfbc8b5bafceec48bf7cdc7dab66b1d2549035287191d"}, ] [[package]] diff --git a/pyproject.toml b/pyproject.toml index 9853e84..960e5ef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ dependencies = [ "pelican-embed-microblog >= 1.1.0", "pelican-gist", "pelican-githubprojects", - # "pelican-photos < 1.4", + #"pelican-photos ~= 1.5.0", "pelican-photos @ git+https://github.com/pelican-plugins/photos.git", "pelican-simple-footnotes", "pelican-sitemap", diff --git a/requirements.in b/requirements.in deleted file mode 100644 index 9c558e3..0000000 --- a/requirements.in +++ /dev/null @@ -1 +0,0 @@ -. diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 8626081..0000000 --- a/requirements.txt +++ /dev/null @@ -1,142 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-emit-index-url --no-emit-trusted-host --unsafe-package=distribute --unsafe-package=offby1-website --unsafe-package=offby1.website --unsafe-package=pip --unsafe-package=setuptools requirements.in -# -beautifulsoup4==4.12.2 - # via - # feed2toot - # mf2py - # pelican-embed-microblog -blinker==1.6.2 - # via pelican -blurhash==1.1.4 - # via mastodon-py -certifi==2023.7.22 - # via requests -charset-normalizer==3.3.0 - # via requests -closure==20191111 - # via offby1-website -cssmin==0.2.0 - # via offby1-website -decorator==5.1.1 - # via mastodon-py -docutils==0.20.1 - # via pelican -feed2toot==0.17 - # via offby1-website -feedgenerator==2.1.0 - # via pelican -feedparser==6.0.10 - # via feed2toot -html5lib==1.1 - # via - # mf2py - # pelican-simple-footnotes -idna==3.4 - # via requests -invoke==2.2.0 - # via offby1-website -isort==5.12.0 - # via offby1-website -jinja2==3.1.2 - # via pelican -markdown==3.4.4 - # via offby1-website -markdown-it-py==3.0.0 - # via rich -markupsafe==2.1.3 - # via jinja2 -mastodon-py==1.8.1 - # via feed2toot -mdurl==0.1.2 - # via markdown-it-py -mf2py==1.1.3 - # via offby1-website -pelican==4.8.0 - # via - # offby1-website - # pelican-edit-url - # pelican-photos - # pelican-simple-footnotes - # pelican-sitemap - # pelican-tag-cloud - # pelican-webassets -pelican-edit-url==0.1.1 - # via offby1-website -pelican-embed-microblog==1.1.0 - # via offby1-website -pelican-gist==0.3.4 - # via offby1-website -pelican-githubprojects==0.1.1 - # via offby1-website -pelican-photos @ git+https://github.com/pelican-plugins/photos.git - # via offby1-website -pelican-simple-footnotes==1.0.2 - # via offby1-website -pelican-sitemap==1.1.0 - # via offby1-website -pelican-tag-cloud==1.0.1 - # via offby1-website -pelican-webassets==2.0.0 - # via offby1-website -piexif==1.1.3 - # via - # offby1-website - # pelican-photos -pillow==9.5.0 - # via pelican-photos -pygments==2.16.1 - # via - # pelican - # pelican-gist - # rich -python-dateutil==2.8.2 - # via - # mastodon-py - # pelican -python-magic==0.4.27 - # via mastodon-py -python-slugify==8.0.1 - # via offby1-website -pytz==2023.3.post1 - # via - # feedgenerator - # pelican -requests==2.31.0 - # via - # mastodon-py - # mf2py - # pelican-gist -rich==13.6.0 - # via - # offby1-website - # pelican -sgmllib3k==1.0.0 - # via feedparser -six==1.16.0 - # via - # html5lib - # mastodon-py - # python-dateutil -soupsieve==2.5 - # via beautifulsoup4 -text-unidecode==1.3 - # via python-slugify -unidecode==1.3.7 - # via pelican -urllib3==2.0.6 - # via requests -webassets==2.0 - # via - # offby1-website - # pelican-webassets -webencodings==0.5.1 - # via html5lib -wheel==0.41.2 - # via offby1-website - -# The following packages are considered to be unsafe in a requirements file: -# offby1-website