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

Unverified Commit fcb44c65 authored by Noémi Ványi's avatar Noémi Ványi Committed by GitHub
Browse files

Merge branch 'master' into fix_startpage_ValueError_on_spanish_datetime

parents 4f90fb6a 4eddbca8

.dockerignore

+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
*/*/*/*~

*/*/*/*/*~



#

local/



# Git

.git

.gitignore
@@ -36,6 +39,11 @@ robot_report.html 
test_basic/

setup.cfg



# node_modules

node_modules/

*/node_modules/

*/*/node_modules/

*/*/*/node_modules/

*/*/*/*/node_modules/



.tx/
 
 No newline at end of file

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ setup.cfg 
*/*.pyc

*~



node_modules/

/node_modules



.tx/

.travis.yml

+16 −15
Original line number Diff line number Diff line 
os: linux

dist: bionic

language: python

sudo: false

cache:

  - pip

  - npm

  - directories:

    - $HOME/.cache/pip



addons:

  firefox: "latest"



install:

  - ./manage.sh install_geckodriver ~/drivers

  - export PATH=~/drivers:$PATH

  - ./manage.sh npm_packages

  - ./manage.sh update_dev_packages

  - pip install codecov

  - env

  - which python; python --version

  - make V=1 install

  - make V=1 gecko.driver

  - make V=1 node.env

  - make V=1 travis.codecov

script:

  - ./manage.sh styles

  - ./manage.sh grunt_build

  - ./manage.sh tests

  - make V=1 themes

  - make V=1 test

after_success:

  - ./manage.sh py_test_coverage

  - make V=1 test.coverage

  - codecov



stages:
@@ -31,10 +29,13 @@ stages: 
jobs:

  include:

    - python: "2.7"

      env: PY=2

    - python: "3.5"

    - python: "3.6"

    - python: "3.7"

    - python: "3.8"

    - stage: docker

      python: "3.6"

      python: "3.8"

      git:

        depth: false

      services:
@@ -44,7 +45,7 @@ jobs: 
      install: true

      script:

        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

        - ./manage.sh docker_build push

        - make -e GIT_URL=$(git remote get-url origin) docker.push

      after_success: true



notifications:

AUTHORS.rst

+1 −0
Original line number Diff line number Diff line
@@ -123,3 +123,4 @@ generally made searx better: 
- Vipul @finn0

- @CaffeinatedTech

- Robin Schneider @ypid

- @splintah

Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ EXPOSE 8080 
VOLUME /etc/searx

VOLUME /var/log/uwsgi



ARG GIT_URL=unknown

ARG VERSION_GITCOMMIT=unknown

ARG SEARX_GIT_VERSION=unknown
@@ -66,7 +67,7 @@ RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \ 


# Keep this argument at the end since it change each time

ARG LABEL_DATE=

LABEL maintainer="searx <https://github.com/asciimoo/searx>" \

LABEL maintainer="searx <${GIT_URL}>" \

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

      version="${SEARX_GIT_VERSION}" \

      org.label-schema.schema-version="1.0" \