From 2e2e0a5606f52728540c4db502477f1f361362f6 Mon Sep 17 00:00:00 2001 From: mreficent Date: Fri, 8 Jun 2018 14:11:03 +0200 Subject: [PATCH] [FIX] gitignore & travis --- .gitignore | 36 +++++++++++++++++++++++++++++-- .travis.yml | 50 ++------------------------------------------ oca_dependencies.txt | 13 +----------- 3 files changed, 37 insertions(+), 62 deletions(-) diff --git a/.gitignore b/.gitignore index f7f8a40..84f7b9b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,24 @@ __pycache__/ # C extensions *.so +# Distribution / packaging +.Python +env/ +bin/ +build/ +develop-eggs/ +dist/ +eggs/ +# Project specific +oca.cfg + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# C extensions +*.so + # Distribution / packaging .Python env/ @@ -21,6 +39,7 @@ var/ *.egg-info/ .installed.cfg *.egg +*.eggs # Installer logs pip-log.txt @@ -36,10 +55,23 @@ coverage.xml # Translations *.mo +*.pot # Pycharm .idea +# Eclipse +.settings + +# Visual Studio cache/options directory +.vs/ + +# OSX Files +.DS_Store + +# Django stuff: +*.log + # Mr Developer .mr.developer.cfg .project @@ -55,5 +87,5 @@ docs/_build/ *~ *.swp -# OSX Files -*.DS_Store +# OCA rules +!static/lib/ diff --git a/.travis.yml b/.travis.yml index 558c5e4..a1004cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,71 +10,25 @@ python: addons: apt: -# sources: -# Search your sources alias here: -# https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json packages: - - expect-dev # provides unbuffer utility - - python-lxml # because pip installation is slow + - expect-dev + - python-lxml - python-simplejson - python-serial - python-yaml -# Search your packages here: -# https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise -# For wkhtmltopdf, see the env section below - -# Sometimes complicated website repos need Compass & SaSS: -#before_install: -# - rvm install ruby --latest -# - gem install bootstrap-sass -# - gem install compass --pre env: global: - VERSION="10.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" - # Set this variable to some version existing as linux-generic build on - # https://github.com/wkhtmltopdf/wkhtmltopdf/releases - # if you need to install wkhtmltopdf - # - WKHTMLTOPDF_VERSION="0.12.4" - # Set the above to install a `wkhtmltopdf` version that is not the one provided - # by the `pov-wkhtmltopdf` repo. - PHANTOMJS_VERSION="latest" - # The above line controls the PhantomJS version that is used for JS testing. - # It is not necessary to include this value unless you are altering the default. - # Use `OS` to skip the PhantomJS upgrade & use the system version instead. - WEBSITE_REPO="1" - # Use the above line to install dependencies that are required for website repos: - # * SASS & Bootstrap-SASS - # * Compass - TRANSIFEX_USER='transbot@odoo-community.org' - # This line contains the encrypted transifex password - # To encrypt transifex password, install travis ruby utils with: - # $ gem install travis --user-install - # and use: - # $ travis encrypt TRANSIFEX_PASSWORD=your-password -r owner/project - # Secure list for current OCA projects is in https://github.com/OCA/maintainer-quality-tools/issues/194 - secure: yHr0UC45NBliMtTpZCYhNc2BdRgiHtXSQKBejHHWw2MXvOogZ+JqdwuqCPbHeP3NIKJYruUpYzXNdqCGP4Vll4xueSsA8CzeFp+gdJqxK6Z+gZiUZJ4W+vqckt2Q6YfdfqIGV8csNEUITCdidarGFSI/3EmDV1xl7Kkq8IMaIhUgd29MQ/R4CzCVcXfdZiN/mXZG7Ta1mLilcZwO7wlVed5IDsOJzXXglkQIYUbp73IraZsp9euXnO7pu+OQz19FuAJWOcPFV7Mgg0cPq+6fU+7lqyAdoj6d5NFrUpjKYbuT88L8wFrto4k0AHXLtL7cl+KNYahXNtnIvfnKNIwJ2lDN61I024mx4f8TQ7PNvSfv+nEdy0KVVk7rlw/JgudWEZFNIjlLYSGn6xdQVgiTrY53GEr9ASd4e/ELdfrNmHUw2JdOM1sg7GA4uwjAoNsF2IMfuvQJyhJRqEXowt9PKEL0ww4uVpxrwZLNWfV+oVvw3iV+QtV9dO18/LMBOXRj/DnfjZ3HVLim4WqjbpsgP5biiCRxKOqeBv+8D3jRcDTK56G8KX9+HnJAhLct/r+DragLufE2yoMCnMHH9AbhyI2omOVM7RoQ9+7PJhsR9ipsifGD+5Xi14sRxOCLPy5yV27FuzwwLkiBowkqeuUaS57DqrRlBjIJK8+Ea53xr14= - # Use the following lines if you need to manually change the transifex project slug or/and the transifex organization. - # The default project slug is owner-repo_name-version (with dash in the version string). - # The default organization is the owner of the repo. - # The default fill up resources (TM) is True. - # The default team is 23907. https://www.transifex.com/organization/oca/team/23907/ - # - TRANSIFEX_PROJECT_SLUG= - # - TRANSIFEX_ORGANIZATION= - # - TRANSIFEX_FILL_UP_RESOURCES= - # - TRANSIFEX_TEAM= - matrix: - LINT_CHECK="1" - TRANSIFEX="1" - TESTS="1" ODOO_REPO="odoo/odoo" - TESTS="1" ODOO_REPO="OCA/OCB" -# either use the two lines above or the two below. Don't change the default if -# it's not necessary (it is only necessary if modules in your repository can't -# be installed in the same database. And you get a huge speed penalty in your -# tests) -# - TESTS="1.0" ODOO_REPO="odoo/odoo" UNIT_TEST="1" -# - TESTS="1.0" ODOO_REPO="OCA/OCB" UNIT_TEST="1" virtualenv: system_site_packages: true diff --git a/oca_dependencies.txt b/oca_dependencies.txt index ac0117d..480d897 100644 --- a/oca_dependencies.txt +++ b/oca_dependencies.txt @@ -1,15 +1,4 @@ # List the OCA project dependencies, one per line # Add a repository url and branch if you need a forked version # -# Examples -# ======== -# -# To depend on the standard version of sale-workflow, use: -# sale-workflow -# -# To explicitely give the URL of a fork, and still use the version specified in -# .travis.yml, use: -# sale-workflow https://github.com/OCA/sale-workflow -# -# To provide both the URL and a branch, use: -# sale-workflow https://github.com/OCA/sale-workflow branchname +reporting-engine