diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 39f813f..c1a5053 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -23,11 +23,11 @@ jobs: run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_OUTPUT shell: bash - name: "Install Dependencies" - run: python -m pip install build + run: python -m pip install -U setuptools wheel build - name: "Generate Python Package" run: python -m build - name: "Publish Distribution to PyPI" - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_PASSWORD }} - name: "Publish Distribution to AUR" diff --git a/deploy/arch/PKGBUILD.template b/deploy/arch/PKGBUILD.template index 96e7c6b..753a422 100644 --- a/deploy/arch/PKGBUILD.template +++ b/deploy/arch/PKGBUILD.template @@ -8,20 +8,30 @@ arch=('any') url="https://instaloader.github.io/" license=('MIT') groups=() -depends=('python>=3.8' 'python-requests>=2.4') -makedepends=('python-setuptools') +depends=( + python + python-requests +) +makedepends=( + python-build + python-installer + python-setuptools + python-wheel +) +optdepends=( + 'python-browser-cookie3: Import session cookies from browser' +) options=('!emptydirs') source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/instaloader/instaloader/tar.gz/v$pkgver) sha512sums=('{{hash}}') build() { cd "$srcdir/$pkgname-$pkgver" - python setup.py clean --all - python setup.py build + python -m build --wheel --no-isolation } package() { cd "$srcdir/$pkgname-$pkgver" install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - python setup.py install --root "$pkgdir/" --skip-build + python -m installer --destdir="$pkgdir" dist/*.whl }