Skip to content
This repository has been archived by the owner on Feb 13, 2024. It is now read-only.

Commit

Permalink
Switch versioning, license
Browse files Browse the repository at this point in the history
  • Loading branch information
lasley committed Oct 18, 2017
1 parent 422f034 commit b35faaf
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 17 deletions.
14 changes: 11 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,21 @@ python:
- "3.5"
- "3.6"

deploy:
provider: pypi
user: laslabs
password:
secure: "UOFAfNJj1NNP3qI73IzrTncleyxSHwnYVpRe5vgAzlg0ojZWFTPRzac9JxKOvZPViuPnS+v8/UOequEz7sEOwLnYQIZcW1k4TAYWSNeAhjn7MpcboaSsujgGE1eMYWor3pgnU6f0EvBp0bhgfxciwHhjfU6PSr2CAfmJDjT02G1lsk8N94gTSYNwy+FV3QRPWlsB+ZyGGoUwf+Ap0gh7U3EaFSeVZ8P+y8oP99A1Zyz4dd0GjW2/5zj4eXm6boDUGt8sPAATf0Lni3xMfE/T+43MfMYRj1Yw6Ho7+mgYLL+RpgrY7pHA3pfOTomoz11yHnNYZq3sCKjDclspq64XSryICGOYC9hDT5vz+GbFzbpcnimbitdhO8STLPK9O0AMbrbanPaHVtNpC7dA+ZKpXtkD2UYN/GUVcc//nDCkGs6T1bFHFV9NUKfEqLr6LpS6Yb9MLc0g+x3b1+632FfoZ5+8uxM+NKHgh6uos9DPiLx8ZOCfgqVUqXexJq21bFuELqMkHZEu01Pe2MIB5K5ol3KDETYTYJJq4XF6+kF4Ge64LV+iRCP9WVxnX8OtovYxE5/56lB9S7Qc57Y1PpVupUGCo67wVE0UP7LHcs7qfEKmS/ulr2ARYNBVO0vfWrWm+9EnP/HNwqok4cna2/voVgoXNFeAj4u8+v2TfvKfIGg=" distributions: "sdist bdist_wheel"
skip_upload_docs: Utrue
on:
repo: oca/oca-decorators
branch: master
tags: true

env:
global:
- VERSION="0.0.1"
- RELEASE="0.1.0"
- PROJECT="oca-decorators"
- ODOO="10.0"
- secure: "N4FxLhiQYktu5TUym48Kf5GoCeqSn/iNZT4rK9ktN18gOazkj5P9tPz33p8vde06f+yDTw6ETOZaTHUv7oGwlpc58ToMFey+XxlSyCeGoNVGi7uojs5DqF48lfKZbbTjCiiyj/6Ub7FH3IzcizbN+9WzJ6JB7v8U6eX8LwAW7YKPhdPctFM7rFZiLQp/r8lf0xN5WpMhufg3xloBJkS+iuQopULK7Il2g6Ag8Qo54IUFJzWQbZYKN8RMy0Ek41rgx88sKrTp9TDo0RBircy7f/6WH/CERTGRYtHCQDF0RToYaH9qiRiZ3w6vaxepbIicJCMCMvOQaSJ8IibIwBstwpkM0P2dHVP9WQiwxGgYMeCxS2MNkacQLAfxGXcMiRlfliq7SQpBYp7t3uEpby1l1UqDyTb+5aNUF8Y5CFx1hbbr2r++U8vLRxxvQRAzfl48Dy1jWw5N1hug/1VbGU7XuWPHiZd2WRngs2r7kUJVig9b3jQoi87kIr0V8FHjRALfsfo/swPD5mwI00qQ2eOySTKC8SSCToudByub1DYAPvuLn0JDGH1z7pDIe4rucZSSztvkiCOtlndYcm2hbyNLLVUN5Fn/GCmNZp2yer/h5Myn2kw3bMjdDLkVcgK5Ku2/eb5IMUWrjL4MbdczsUeqfNRK9oy5HEAAh+4sfre5Dw0="
matrix:
- TESTS="1"
- LINT_CHECK="1"
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
|License MIT| | |PyPi Package| | |PyPi Versions|
|License LGPL-3| | |PyPi Package| | |PyPi Versions|

|Build Status| | |Test Coverage| | |Code Climate|

Expand Down Expand Up @@ -69,9 +69,9 @@ To contribute to this module, please visit https://odoo-community.org.
:target: https://codecov.io/gh/OCA/oca-decorators
.. |Code Climate| image:: https://img.shields.io/codeclimate/github/OCA/oca-decorators.svg
:target: https://codeclimate.com/github/OCA/oca-decorators
.. |License MIT| image:: https://img.shields.io/github/license/OCA/oca-decorators.svg
:target: https://opensource.org/licenses/MIT
:alt: License: MIT
.. |License LGPL-3| image:: https://img.shields.io/github/license/OCA/oca-decorators.svg
:target: http://www.gnu.org/licenses/lgpl
:alt: License: LGPL-3
.. |PyPi Package| image:: https://img.shields.io/pypi/v/oca-decorators.svg
:target: https://pypi.python.org/pypi/oca-decorators
:alt: PyPi Package
Expand Down
15 changes: 5 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright 2016-2017 LasLabs Inc.
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
Expand All @@ -6,7 +7,7 @@
from setuptools import find_packages
from unittest import TestLoader, TextTestRunner

from os import environ, path
from os import path

PROJECT = 'oca-decorators'
SHORT_DESC = (
Expand All @@ -30,12 +31,6 @@
'Topic :: Software Development :: Libraries :: Python Modules',
]

version = environ.get('RELEASE') or environ.get('VERSION') or '0.0.1'

if environ.get('TRAVIS_BUILD_NUMBER'):
version += 'b%s' % environ.get('TRAVIS_BUILD_NUMBER')


setup_vals = {
'name': PROJECT,
'author': 'Odoo Community Association (OCA)',
Expand All @@ -45,7 +40,6 @@
'download_url': 'https://github.com/OCA/%s' % PROJECT,
'license': 'LGPL-3',
'classifiers': CLASSIFIERS,
'version': version,
}


Expand Down Expand Up @@ -88,9 +82,10 @@ def run(self, ):
if __name__ == "__main__":
setup(
packages=find_packages(exclude=('tests')),
use_scm_version=True,
cmdclass={'test': Tests},
tests_require=[
'mock',
setup_requires=[
'setuptools_scm',
],
install_requires=install_requires,
**setup_vals
Expand Down

0 comments on commit b35faaf

Please sign in to comment.