Skip to content

Commit

Permalink
Merge pull request #3 from KeoH/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
KeoH authored Apr 13, 2018
2 parents 5a207ac + 6f627f6 commit e2b1d76
Show file tree
Hide file tree
Showing 33 changed files with 446 additions and 261 deletions.
4 changes: 4 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[run]
branch = True
cover_pylib = False
source = src
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ bin
var
sdist
develop-eggs
econopy.egg-info
.installed.cfg

# Installer logs
Expand All @@ -20,9 +21,11 @@ pip-log.txt
# Unit test / coverage reports
.coverage
.tox
.pytest_cache/

#Translations
*.mo

#Mr Developer
.mr.developer.cfg
.vscode/
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: python

matrix:
include:
- python: 3.4
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36

install: pip install tox

script: tox
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased] - XXXX-XX-XX
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2018 Francisco Manzano Magaña

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
6 changes: 6 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Include the README
include *.md

# Include the license file
include LICENSE
include VERSION
17 changes: 17 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[[source]]

verify_ssl = true
name = "pypi"
url = "https://pypi.python.org/simple"

[packages]

[dev-packages]

pytest = "*"
pytest-cov = "*"
"pytest-flake8" = "*"

[requires]

python_version = "3.6"
151 changes: 151 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ Conjuntos de funciones económicas y econométricas programadas en
Python con la vista puesta en el uso como módulo, y ser reutilizado
en varios proyectos.

## Author
Francisco Manzano Magaña <[email protected]>
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.0.3
25 changes: 0 additions & 25 deletions calculos/__init__.py

This file was deleted.

12 changes: 0 additions & 12 deletions doc/index.html

This file was deleted.

25 changes: 0 additions & 25 deletions doc/rentas.actualizacion.html

This file was deleted.

36 changes: 0 additions & 36 deletions doc/rentas.capitalizacion.html

This file was deleted.

Loading

0 comments on commit e2b1d76

Please sign in to comment.