Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6a4da74 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Merge branch 'nicofonk/sync-upstream' into 'master' 

Sync upstream

See merge request e/cloud/my-spot!68
parents 40c698b6 834e9b34

.github/workflows/data-update.yml

+1 −2
Original line number Original line Diff line number Diff line
@@ -40,8 +40,7 @@ jobs: 
        env:

        env:

          FETCH_SCRIPT: ./searx_extra/update/${{ matrix.fetch }}

          FETCH_SCRIPT: ./searx_extra/update/${{ matrix.fetch }}

        run: |

        run: |

          source local/py3/bin/activate

          V=1 ./manage pyenv.cmd python "$FETCH_SCRIPT"

          $FETCH_SCRIPT





      - name: Create Pull Request

      - name: Create Pull Request

        id: cpr

        id: cpr

.github/workflows/integration.yml

+4 −3
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ jobs: 
    - name: Install node dependencies

    - name: Install node dependencies

      run: make V=1 node.env

      run: make V=1 node.env

    - name: Build themes

    - name: Build themes

      run: make V=1 themes

      run: make V=1 themes.all





  documentation:

  documentation:

    name: Documentation

    name: Documentation
@@ -77,14 +77,15 @@ jobs: 
        python-version: '3.9'

        python-version: '3.9'

        architecture: 'x64'

        architecture: 'x64'

    - name: Build documentation

    - name: Build documentation

      run: SEARX_DEBUG=1 make V=1 ci-gh-pages

      run: |

        make V=1 docs.clean docs.html

    - name: Deploy

    - name: Deploy

      if:  github.ref == 'refs/heads/master'

      if:  github.ref == 'refs/heads/master'

      uses: JamesIves/github-pages-deploy-action@3.7.1

      uses: JamesIves/github-pages-deploy-action@3.7.1

      with:

      with:

        GITHUB_TOKEN: ${{ github.token }}

        GITHUB_TOKEN: ${{ github.token }}

        BRANCH: gh-pages

        BRANCH: gh-pages

        FOLDER: build/gh-pages

        FOLDER: dist/docs

        CLEAN: true # Automatically remove deleted files from the deploy branch

        CLEAN: true # Automatically remove deleted files from the deploy branch





  dockers:

  dockers:

.gitlab-ci.yml

+6 −11
Original line number Original line Diff line number Diff line
@@ -11,20 +11,17 @@ services: 




python:

python:

  stage: check

  stage: check

  before_script:

    - ./manage.sh update_dev_packages

  script:

  script:

    - make test.pep8

    - ./manage test.pep8

    - make test.pylint

    - ./manage test.pylint





build:web:

build:web:

  stage: build

  stage: build

  before_script:

  before_script:

    - ./manage.sh npm_packages

    - ./manage node.env

    - ./manage.sh update_dev_packages

  script:

  script:

    - ./manage.sh locales

    - ./manage themes.etheme

    - make V=1 themes.etheme

    - ./manage babel.compile





.build:docker:

.build:docker:

  stage: build

  stage: build
@@ -56,10 +53,8 @@ build:docker:tags: 




test:unit:

test:unit:

  stage: test

  stage: test

  before_script:

    - ./manage.sh update_dev_packages

  script:

  script:

    - make test.coverage

    - ./manage test.coverage

  coverage: '/TOTAL.*\s+(\d+%)$/'

  coverage: '/TOTAL.*\s+(\d+%)$/'





.deploy:template:

.deploy:template:

AUTHORS.rst

+4 −2
Original line number Original line Diff line number Diff line 
Searx was created by Adam Tauber and is maintained by Adam Tauber, Alexandre Flament, Noémi Ványi, @pofilo, Gaspard d'Hautefeuille and Markus Heiser.

Searx was created by Adam Tauber and is maintained by Adam Tauber, Noémi Ványi, @pofilo, Gaspard d'Hautefeuille and Émilien Devos.





Major contributing authors:

Major contributing authors:
@@ -12,8 +12,9 @@ Major contributing authors: 
- @pofilo

- @pofilo

- Markus Heiser @return42

- Markus Heiser @return42

- Émilien Devos @unixfox

- Émilien Devos @unixfox

- Alexandre Flament





People who have submitted patches/translates, reported bugs, consulted features or

People who have submitted patches/translations, reported bugs, consulted features or

generally made searx better:

generally made searx better:





- Laszlo Hammerl

- Laszlo Hammerl
@@ -164,3 +165,4 @@ generally made searx better: 
- @jhigginbotham

- @jhigginbotham

- @xenrox

- @xenrox

- @OliveiraHermogenes

- @OliveiraHermogenes

- Paul Alcock @Guilvareux

Dockerfile

+0 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,6 @@ FROM registry.gitlab.e.foundation:5000/e/cloud/my-spot/env as builder 
COPY . /src/

COPY . /src/

RUN pip install --force-reinstall --prefix /install /src

RUN pip install --force-reinstall --prefix /install /src







FROM python:3.9-slim

FROM python:3.9-slim

LABEL maintainer="spot <https://gitlab.e.foundation/e/cloud/my-spot/>"

LABEL maintainer="spot <https://gitlab.e.foundation/e/cloud/my-spot/>"

LABEL description="A privacy-respecting, hackable metasearch engine."

LABEL description="A privacy-respecting, hackable metasearch engine."