diff --git a/.travis.yml b/.travis.yml index 9e87e35a..9ab773d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,8 +33,9 @@ cache: env: global: - SETUP_XVFB=true - - PYTHON36=3.6.3 - - PYTHON37=3.7.1 + - PYTHON36=3.6.9 + - PYTHON37=3.7.5 + - PYTHON38=3.8.2 matrix: include: @@ -52,6 +53,7 @@ install: export DISPLAY=:99.0 /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX +render -noreset sleep 3 + cd $(pyenv root) && git pull origin master && cd $TRAVIS_BUILD_DIR elif [ $TRAVIS_OS_NAME = "osx" ]; then brew upgrade pyenv fi @@ -60,7 +62,7 @@ install: eval "$(pyenv init -)" pyenv shell $PYTHON36 $PYTHON37 -- pip install -U setuptools pip==18.1 +- pip install -U setuptools pip - pip install . - pip install borgbackup - pip install -r requirements.d/dev.txt @@ -72,24 +74,6 @@ before_script: script: - tox -#after_script: -#- | -# if [ $RUN_PYINSTALLER = "true" ]; then -# # Cleanup -# pip uninstall -y $PIP_DEPENDENCIES -# -# # https://github.com/wkentaro/labelme/issues/183 -# if [ $TRAVIS_OS_NAME = "osx" ]; then -# pip uninstall -y Pillow -# conda install -y Pillow -# fi -# -# # Build the standalone executable -# pip install pyinstaller -# pyinstaller labelme.spec -# dist/labelme --version -# fi - branches: only: - master diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 00000000..2b1fbe2a --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,31 @@ +# Vorta Contributors + +## Programming +The following authors made major code contributions to Vorta source code: + +### [Manuel Riel](https://github.com/m3nu) +- Original author +- Maintainer + +### [Thomas Waldmann](https://github.com/ThomasWaldmann) +- Major contributions to implement translations +- Clean up style and formatting +- Maintainer + +### [Julian Hofer](https://github.com/Hofer-Julian) +- Flatpak packaging for Linux +- Numerous incremental features +- Maintainer + +### Others +For other contributors, see [here](https://github.com/borgbase/vorta/graphs/contributors). + + +## Translations +The following authors contributed translations: + +- German: [Thomas Waldmann](https://github.com/ThomasWaldmann) +- Italian: [Luigi Operoso](https://github.com/brokenpip3) +- French: [David Brassard](https://github.com/dbrassard) +- Czech: [Pavel Borecki](https://www.transifex.com/user/profile/pavelb/) +- Finnish: [Jiri Grönroos](https://en.liberapay.com/artnay/) \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index f288702d..9d81a5ee 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,3 +1,5 @@ +Copyright (C) 2018-2020 Manuel Riel and Vorta contributors (see CONTRIBUTORS.md) + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/README.md b/README.md index 03b189df..33998ec5 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ See our website for [download links and and install instructions](https://vorta. - If you have questions or simply want to talk about Vorta, find us on [Matrix](https://matrix.to/#/#vorta:matrix.org). For Borg-specific topics, join the `#borgbackup` IRC channel on `chat.freenode.net` instead. ## License and Credits -- Thank you to all the people who already contributed to Vorta: [code](https://github.com/borgbase/vorta/graphs/contributors), [translations](https://github.com/borgbase/vorta/issues/159) -- Licensed under GPLv3. See [LICENSE.txt](LICENSE.txt) for details. +- See [CONTRIBUTORS.md](CONTRIBUTORS.md) to see who programmed and translated Vorta. +- Licensed under [GPLv3](LICENSE.txt). © 2018-2020 Manuel Riel and Vorta contributors - Based on [PyQt](https://riverbankcomputing.com/software/pyqt/intro) and [Qt](https://www.qt.io). - Icons by [FontAwesome](https://fontawesome.com)