diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-10-15 19:42:17 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-10-15 20:51:14 +0200 |
commit | c89051fc253b08be2255b5bd5ea2695155bb4624 (patch) | |
tree | a86b9fe04493470959e595eda3c141a926ae9cdf | |
parent | 4aa0d978067e535b8fed94710a2893de900a4851 (diff) | |
download | Ishtar-c89051fc253b08be2255b5bd5ea2695155bb4624.tar.bz2 Ishtar-c89051fc253b08be2255b5bd5ea2695155bb4624.zip |
🚀 Debian package: delete unecessary files, adapt and add install templates
-rw-r--r-- | .coveragerc | 13 | ||||
-rw-r--r-- | .gitlab-ci.yml | 29 | ||||
-rw-r--r-- | .readthedocs.yaml | 23 | ||||
-rw-r--r-- | .weblate | 3 | ||||
-rw-r--r-- | DEV_DOC.md | 9 | ||||
-rw-r--r-- | example_project/settings.py | 11 | ||||
-rw-r--r-- | install/extra_settings.py | 1 | ||||
-rwxr-xr-x | install/ishtar-install | 6 |
8 files changed, 12 insertions, 83 deletions
diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index a0ec2734c..000000000 --- a/.coveragerc +++ /dev/null @@ -1,13 +0,0 @@ -[run] -omit = - */management/* - */migrations/* - -[report] -exclude_lines = - pragma: no cover - def __repr__ - if self.debug: - if settings.DEBUG - if __name__ == .__main__.: - @(abc\.)?abstractmethod
\ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 5d33f4ce9..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,29 +0,0 @@ -before_script: - - apt-get update - - apt-get upgrade -qy - - /etc/init.d/postgresql start - - cp Makefile.example Makefile - -build-v5: - stage: "build" - script: - - sed -i -e 's/"registration"/"django_registration"/' example_project/settings.py - - cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py - - mkdir -p /var/log/django/ - - make build_gitlab - tags: - - bookworm - only: - - develop-5.0 - -test-v5: - stage: "test" - script: - - sed -i -e 's/"registration"/"django_registration"/' example_project/settings.py - - cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py - - mkdir -p /var/log/django/ - - make soft_test_gitlab - tags: - - bookworm - only: - - develop-5.0 diff --git a/.readthedocs.yaml b/.readthedocs.yaml deleted file mode 100644 index 52faf18dd..000000000 --- a/.readthedocs.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# .readthedocs.yaml -# Read the Docs configuration file -# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details - -# Required -version: 2 - -formats: - - pdf - -# Set the version of Python and other tools you might need -build: - os: ubuntu-22.04 - tools: - python: "3.9" - -# Build documentation in the docs/ directory with Sphinx -sphinx: - configuration: docs/fr/source/conf.py - -python: - install: - - requirements: requirements_rtd.txt
\ No newline at end of file diff --git a/.weblate b/.weblate deleted file mode 100644 index 41a384f54..000000000 --- a/.weblate +++ /dev/null @@ -1,3 +0,0 @@ -[weblate] -url = https://translate.iggdrasil.net/ -translation = WIP/i18n diff --git a/DEV_DOC.md b/DEV_DOC.md deleted file mode 100644 index b3556fcfe..000000000 --- a/DEV_DOC.md +++ /dev/null @@ -1,9 +0,0 @@ -Attributes use to manage post-process: - -- `skip_history_when_saving`: do not record last modified date and creation/update author -- `_post_saved_geo`: do not process geo item attached -- `_cached_label_checked`: do not process cached labels -- `_external_id_changed`: do not check external_id -- `_search_updated`: do not reindex search -- `_no_move`: do not move associated images on save - to be checked -- `no_post_process()`: set to True previous attributes diff --git a/example_project/settings.py b/example_project/settings.py index a0ebf1e63..2c3dca99f 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -335,7 +335,7 @@ DATA_UPLOAD_MAX_NUMBER_FIELDS = 10240 # path to the "dot" program to generate graph DOT_BINARY = "/usr/bin/dot" -PDFTOPPM_BINARY = "" +PDFTOPPM_BINARY = "/usr/bin/pdftoppm" UNOCONV_BINARY = "/usr/bin/unoconv" @@ -344,8 +344,8 @@ SELENIUM_TEST = False CELERY_BROKER_URL = "" SENTRY_ID = None DISTRIBUTION = "source" -LIB_BASE_PATH = ROOT_PATH + "../" -FIXTURE_AUTH_PATH = ROOT_PATH + "../" +LIB_BASE_PATH = "/usr/lib/python3/dist-packages/" +FIXTURE_AUTH_PATH = "/usr/share/python3-django-ishtar/" SHARE_BASE_PATH = FIXTURE_AUTH_PATH AUTH_PASSWORD_VALIDATORS = [] @@ -479,6 +479,11 @@ def filter_irrelevant_errors(event, hint): return event +try: + from custom_settings import * +except ImportError: + pass + if SENTRY_ID and sentry_sdk: sentry_integrations = [DjangoIntegration()] if USE_BACKGROUND_TASK: diff --git a/install/extra_settings.py b/install/extra_settings.py new file mode 100644 index 000000000..df20af1bb --- /dev/null +++ b/install/extra_settings.py @@ -0,0 +1 @@ +EXTRA_VERSION = 'debian' diff --git a/install/ishtar-install b/install/ishtar-install index 2e4ef9fc0..ced980082 100755 --- a/install/ishtar-install +++ b/install/ishtar-install @@ -331,7 +331,7 @@ EOF # Run setup for each distro accordingly case "$lsb_dist" in ubuntu|debian|raspbian) - if [ "$dist_version" != "buster" ] ; then + if [ "$dist_version" != "bullseye" ] ; then echo "" cecho r " Sorry this script cannot manage your version of Debian/Ubuntu." echo "" @@ -396,12 +396,12 @@ EOF ( set -x; $sh_c 'sleep 3; apt-get install -y -q uwsgi uwsgi-plugin-python3 nginx' ) fi - if [ "$dist_version" == "buster" ]; then + if [ "$dist_version" == "bullseye" ]; then if [ "$default_db" == '127.0.0.1' ]; then echo "-------------------------------------------------------------------------------"; cecho y "Installing postgresql" echo "" - POSTGIS=postgresql-11-postgis-2.5 + POSTGIS=postgresql-13-postgis-3 ( set -x; $sh_c 'sleep 3; apt-get install -y -q postgresql postgresql-contrib '$POSTGIS' '$POSTGIS'-scripts' ) fi echo "-------------------------------------------------------------------------------"; |