From d013928a6ce3944a93519a7e24996db21ede8382 Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Fri, 27 Dec 2024 12:16:14 +0100 Subject: [PATCH] link to pypi version --- .github/workflows/build-deb-package.yml | 9 ++++++++- MANIFEST.in | 3 +++ .../usr/share/doc/changedetection.io/changelog.Debian | 5 ----- debian/changelog | 2 +- debian/control | 1 + debian/rules | 1 + 6 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 debian/changedetection.io/usr/share/doc/changedetection.io/changelog.Debian diff --git a/.github/workflows/build-deb-package.yml b/.github/workflows/build-deb-package.yml index b72dc83b..89491fcc 100644 --- a/.github/workflows/build-deb-package.yml +++ b/.github/workflows/build-deb-package.yml @@ -7,10 +7,14 @@ jobs: build-deb: runs-on: ubuntu-latest name: Build and Package changedetection.io + env: + PACKAGE_VERSION: 0.48.5 # or load from somewhere else steps: - name: Checkout repository uses: actions/checkout@v3 + with: + path: changedetection.io-${{ env.PACKAGE_VERSION }} - name: Set up Python 3.10 uses: actions/setup-python@v4 @@ -33,8 +37,11 @@ jobs: debhelper-compat - name: Build the Debian Package + # Build it the same as the pypi way, then use the same package tar run: | - tar cvzf changedetection.io_1.0.orig.tar.gz . + mkdir /tmp/changedetection.io + python3 -m build + mv dist/*gz . debuild -us -uc - name: Upload Debian Package Artifact diff --git a/MANIFEST.in b/MANIFEST.in index 47d95225..343553e2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -10,6 +10,8 @@ recursive-include changedetectionio/tests * prune changedetectionio/static/package-lock.json prune changedetectionio/static/styles/node_modules prune changedetectionio/static/styles/package-lock.json +prune changedetectionio/tests/test-datastore + include changedetection.py include requirements.txt include README-pip.md @@ -18,5 +20,6 @@ global-exclude node_modules global-exclude venv global-exclude test-datastore +global-exclude changedetectionio/tests/test-datastore global-exclude changedetection.io*dist-info global-exclude changedetectionio/tests/proxy_socks5/test-datastore diff --git a/debian/changedetection.io/usr/share/doc/changedetection.io/changelog.Debian b/debian/changedetection.io/usr/share/doc/changedetection.io/changelog.Debian deleted file mode 100644 index e9265678..00000000 --- a/debian/changedetection.io/usr/share/doc/changedetection.io/changelog.Debian +++ /dev/null @@ -1,5 +0,0 @@ -changedetection.io (1.0-1) unstable; urgency=medium - - * Initial release. - - -- Your Name Wed, 01 Nov 2023 12:00:00 +0000 diff --git a/debian/changelog b/debian/changelog index e9265678..637bc42a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -changedetection.io (1.0-1) unstable; urgency=medium +changedetection.io (0.48.5) unstable; urgency=medium * Initial release. diff --git a/debian/control b/debian/control index f0f9c488..2821574d 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper-compat (= 13), dh-virtualenv, dh-python, python3-all (> Standards-Version: 4.6.0 Rules-Requires-Root: no Homepage: https://github.com/dgtlmoon/changedetection.io +X-Python3-Version: >= 3.10 Package: changedetection.io Architecture: all diff --git a/debian/rules b/debian/rules index daccd392..b0166a65 100755 --- a/debian/rules +++ b/debian/rules @@ -8,5 +8,6 @@ PYTHON_VERSION := $(shell py3versions -r '>= 3.10 << 3.13' -i) override_dh_virtualenv: dh_virtualenv --sourcedirectory=. \ --install-suffix='' \ + --destdir=/tmp/changedetection.io \ --requirements=requirements.txt \ --python=/usr/bin/$(PYTHON_VERSION) \ No newline at end of file