From 4e61848a1f3479c776504eea9b2c4769780560c7 Mon Sep 17 00:00:00 2001 From: Francisco Manzano Date: Thu, 12 Apr 2018 18:17:12 +0200 Subject: [PATCH 1/8] [packaging] Start refactor for packaging ... 6 years later --- .gitignore | 1 + VERSION | 1 + econoPy.py => main.py | 1 + 3 files changed, 3 insertions(+) create mode 100644 VERSION rename econoPy.py => main.py (99%) diff --git a/.gitignore b/.gitignore index c7175e6..4a4c0af 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ pip-log.txt #Mr Developer .mr.developer.cfg +.vscode/ \ No newline at end of file diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..8a9ecc2 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.0.1 \ No newline at end of file diff --git a/econoPy.py b/main.py similarity index 99% rename from econoPy.py rename to main.py index 97125d5..7cfa2bc 100644 --- a/econoPy.py +++ b/main.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import os + class EcoConsole: def __init__(self): From 9c255b4b0200fd9db3216ab9ade7c5691ea8e3ce Mon Sep 17 00:00:00 2001 From: Francisco Manzano Date: Thu, 12 Apr 2018 18:32:17 +0200 Subject: [PATCH 2/8] [packaging] directory refactor --- doc/doc-estilo.css => docs/.gitkeep | 0 setup.py | 33 +++++++++++++++++++++ {calculos => src/calculos}/__init__.py | 0 src/doc/doc-estilo.css | 0 {doc => src/doc}/index.html | 0 {doc => src/doc}/rentas.actualizacion.html | 0 {doc => src/doc}/rentas.capitalizacion.html | 0 {doc => src/doc}/rentas.html | 0 main.py => src/main.py | 0 {prestamos => src/prestamos}/__init__.py | 0 {rentas => src/rentas}/__init__.py | 0 {rentas => src/rentas}/actualizacion.py | 0 {rentas => src/rentas}/capitalizacion.py | 0 {tipos => src/tipos}/__init__.py | 0 14 files changed, 33 insertions(+) rename doc/doc-estilo.css => docs/.gitkeep (100%) create mode 100644 setup.py rename {calculos => src/calculos}/__init__.py (100%) create mode 100644 src/doc/doc-estilo.css rename {doc => src/doc}/index.html (100%) rename {doc => src/doc}/rentas.actualizacion.html (100%) rename {doc => src/doc}/rentas.capitalizacion.html (100%) rename {doc => src/doc}/rentas.html (100%) rename main.py => src/main.py (100%) rename {prestamos => src/prestamos}/__init__.py (100%) rename {rentas => src/rentas}/__init__.py (100%) rename {rentas => src/rentas}/actualizacion.py (100%) rename {rentas => src/rentas}/capitalizacion.py (100%) rename {tipos => src/tipos}/__init__.py (100%) diff --git a/doc/doc-estilo.css b/docs/.gitkeep similarity index 100% rename from doc/doc-estilo.css rename to docs/.gitkeep diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..35ac40f --- /dev/null +++ b/setup.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python + +import os +import sys +import subprocess +from setuptools import setup + +action = sys.argv[1] + + +def update_reqs(): + """Updates requirements files.""" + if not os.path.exists('Pipfile'): + return + subprocess.check_call('pipenv lock', shell=True) + subprocess.check_call( + 'pipenv lock -r | cut -d\- -f1 > tools/pip-requires', + shell=True) + subprocess.check_call( + 'pipenv lock --dev -r |cut -d\- -f1 > tools/test-requires', + shell=True) + + +if action == "update_requirements": + update_reqs() + sys.exit(0) +elif action == "build_sphinx": + subprocess.check_call('pipenv run pip install -e ".[doc]"', shell=True) +elif 'dist' in action: + update_reqs() + +setup(setup_requires=['pbr>=1.9', 'setuptools>=17.1', 'pytest-runner'], + pbr=True) \ No newline at end of file diff --git a/calculos/__init__.py b/src/calculos/__init__.py similarity index 100% rename from calculos/__init__.py rename to src/calculos/__init__.py diff --git a/src/doc/doc-estilo.css b/src/doc/doc-estilo.css new file mode 100644 index 0000000..e69de29 diff --git a/doc/index.html b/src/doc/index.html similarity index 100% rename from doc/index.html rename to src/doc/index.html diff --git a/doc/rentas.actualizacion.html b/src/doc/rentas.actualizacion.html similarity index 100% rename from doc/rentas.actualizacion.html rename to src/doc/rentas.actualizacion.html diff --git a/doc/rentas.capitalizacion.html b/src/doc/rentas.capitalizacion.html similarity index 100% rename from doc/rentas.capitalizacion.html rename to src/doc/rentas.capitalizacion.html diff --git a/doc/rentas.html b/src/doc/rentas.html similarity index 100% rename from doc/rentas.html rename to src/doc/rentas.html diff --git a/main.py b/src/main.py similarity index 100% rename from main.py rename to src/main.py diff --git a/prestamos/__init__.py b/src/prestamos/__init__.py similarity index 100% rename from prestamos/__init__.py rename to src/prestamos/__init__.py diff --git a/rentas/__init__.py b/src/rentas/__init__.py similarity index 100% rename from rentas/__init__.py rename to src/rentas/__init__.py diff --git a/rentas/actualizacion.py b/src/rentas/actualizacion.py similarity index 100% rename from rentas/actualizacion.py rename to src/rentas/actualizacion.py diff --git a/rentas/capitalizacion.py b/src/rentas/capitalizacion.py similarity index 100% rename from rentas/capitalizacion.py rename to src/rentas/capitalizacion.py diff --git a/tipos/__init__.py b/src/tipos/__init__.py similarity index 100% rename from tipos/__init__.py rename to src/tipos/__init__.py From 46d1d930a0c8278506e5e644423ce3866aef0bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Manzano=20Maga=C3=B1a?= Date: Thu, 12 Apr 2018 21:33:58 +0200 Subject: [PATCH 3/8] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3c509b3 --- /dev/null +++ b/LICENSE @@ -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. From a91c0f39160fd6acc01b3fa7d36149360eb85001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Manzano=20Maga=C3=B1a?= Date: Thu, 12 Apr 2018 23:37:18 +0200 Subject: [PATCH 4/8] configuration basics --- .gitignore | 1 + .travis.yml | 14 +++++ MANIFEST.in | 5 ++ README.md | 2 + VERSION | 2 +- setup.cfg | 2 + setup.py | 73 +++++++++++++++--------- src/calculos/__init__.py | 27 +++++---- src/doc/doc-estilo.css | 0 src/doc/index.html | 12 ---- src/doc/rentas.actualizacion.html | 25 -------- src/doc/rentas.capitalizacion.html | 36 ------------ src/doc/rentas.html | 36 ------------ src/main.py | 30 +++++----- src/prestamos/__init__.py | 91 ++++++++++++++++-------------- src/rentas/__init__.py | 3 +- src/rentas/actualizacion.py | 22 ++++---- src/rentas/capitalizacion.py | 46 +++++++-------- src/tipos/__init__.py | 1 - tox.ini | 22 ++++++++ 20 files changed, 208 insertions(+), 242 deletions(-) create mode 100644 .travis.yml create mode 100644 MANIFEST.in create mode 100644 setup.cfg delete mode 100644 src/doc/doc-estilo.css delete mode 100644 src/doc/index.html delete mode 100644 src/doc/rentas.actualizacion.html delete mode 100644 src/doc/rentas.capitalizacion.html delete mode 100644 src/doc/rentas.html create mode 100644 tox.ini diff --git a/.gitignore b/.gitignore index 4a4c0af..c71b52e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ bin var sdist develop-eggs +econopy.egg-info .installed.cfg # Installer logs diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6f34d07 --- /dev/null +++ b/.travis.yml @@ -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 \ No newline at end of file diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..a2453a1 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,5 @@ +# Include the README +include *.md + +# Include the license file +include LICENSE \ No newline at end of file diff --git a/README.md b/README.md index 5ee263c..26fcd91 100644 --- a/README.md +++ b/README.md @@ -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 \ No newline at end of file diff --git a/VERSION b/VERSION index 8a9ecc2..7bcd0e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.1 \ No newline at end of file +0.0.2 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..68c61a2 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=0 \ No newline at end of file diff --git a/setup.py b/setup.py index 35ac40f..a5b434c 100644 --- a/setup.py +++ b/setup.py @@ -1,33 +1,52 @@ -#!/usr/bin/env python -import os -import sys -import subprocess -from setuptools import setup +from setuptools import setup, find_packages +from codecs import open +from os import path -action = sys.argv[1] +here = path.abspath(path.dirname(__file__)) +with open(path.join(here, 'README.md'), encoding='utf-8') as f: + long_description = f.read() -def update_reqs(): - """Updates requirements files.""" - if not os.path.exists('Pipfile'): - return - subprocess.check_call('pipenv lock', shell=True) - subprocess.check_call( - 'pipenv lock -r | cut -d\- -f1 > tools/pip-requires', - shell=True) - subprocess.check_call( - 'pipenv lock --dev -r |cut -d\- -f1 > tools/test-requires', - shell=True) +with open(path.join(here, 'VERSION'), encoding='utf-8') as f: + version = f.read() +print(version) -if action == "update_requirements": - update_reqs() - sys.exit(0) -elif action == "build_sphinx": - subprocess.check_call('pipenv run pip install -e ".[doc]"', shell=True) -elif 'dist' in action: - update_reqs() - -setup(setup_requires=['pbr>=1.9', 'setuptools>=17.1', 'pytest-runner'], - pbr=True) \ No newline at end of file +setup( + name='econopy', version=version, + description='Simple economic utilities', + long_description=long_description, + long_description_content_type='text/markdown', + url='https://github.com/KeoH/econoPy', + author='Francisco Manzano Magaña', + author_email='keoh77@gmail.com', + classifiers=[ + 'Development Status :: 1 - Planning', + 'Intended Audience :: Developers', + 'Topic :: Office/Business :: Financial :: Accounting', + 'License :: OSI Approved :: MIT License', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7' + ], + keywords='economic,financial,business,accounting', + packages=find_packages(exclude=['contrib', 'docs', 'tests']), + install_requires=[], + extras_require={ + 'dev': ['check-manifest'], + 'test': ['coverage'], + }, + package_data={}, + data_files=[], + entry_points={ + 'console_scripts': [], + }, + project_urls={ + 'Bug Reports': 'https://github.com/KeoH/econoPy/issues', + 'Funding': 'https://donate.pypi.org', + 'Source': 'https://github.com/KeoH/econoPy/', + }, +) diff --git a/src/calculos/__init__.py b/src/calculos/__init__.py index 697f601..c968206 100644 --- a/src/calculos/__init__.py +++ b/src/calculos/__init__.py @@ -1,25 +1,28 @@ -# -*- coding: utf-8 -*- -# Modulo para calculos variados +"""Modulo para calculos variados.""" IS = 0.2 # Impuesto de sociedades a aplicar -IVA = 0.21 # Impuesto de valor añadido +IVA = 0.21 # Impuesto de valor añadido COMISION_STORE = 0.3 + def deflactar_IVA(cantidad): - deflactor = 1 + IVA - return cantidad / deflactor + deflactor = 1 + IVA + return cantidad / deflactor + def calcular_IS(cantidad): - return cantidad*IS + return cantidad*IS + def calcular_comision(cantidad): - return cantidad*COMISION_STORE + return cantidad*COMISION_STORE + def beneficio_por_venta(precio_venta): - siniva = deflactar_IVA(precio_venta) - comision = calcular_comision(siniva) - ingreso = siniva - comision - isoc = calcular_IS(ingreso) - return ingreso - isoc \ No newline at end of file + siniva = deflactar_IVA(precio_venta) + comision = calcular_comision(siniva) + ingreso = siniva - comision + isoc = calcular_IS(ingreso) + return ingreso - isoc diff --git a/src/doc/doc-estilo.css b/src/doc/doc-estilo.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/doc/index.html b/src/doc/index.html deleted file mode 100644 index 6ed7cf6..0000000 --- a/src/doc/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - -

Esta es la documentacion oficial de econoPy.

- -
econoPy © Francisco Manzano Magaña
- - - diff --git a/src/doc/rentas.actualizacion.html b/src/doc/rentas.actualizacion.html deleted file mode 100644 index b3b8290..0000000 --- a/src/doc/rentas.actualizacion.html +++ /dev/null @@ -1,25 +0,0 @@ - - -Python: module rentas.actualizacion - - - - -
 
- 
rentas.actualizacion		index
/home/keoh/Codigo/misGitHubs/econoPy/rentas/actualizacion.py
-

# -*- coding: utf-8 -*-
-# Actualizaciones financieras. Traer una cantidad de dinero del futuro a un tipo de interes dado.

-

- - - - - -
 
-Functions
       
actualizar_cantidad(cantidad, tipo_interes, numero_de_periodos)
-
actualizar_renta(cuota, tipo_interes, numero_de_periodos)
-
actualizar_renta_perpetua(cuota, tipo_interes)
-
- \ No newline at end of file diff --git a/src/doc/rentas.capitalizacion.html b/src/doc/rentas.capitalizacion.html deleted file mode 100644 index 27288a0..0000000 --- a/src/doc/rentas.capitalizacion.html +++ /dev/null @@ -1,36 +0,0 @@ - - -Python: module rentas.capitalizacion - - - - -
 
- 
rentas.capitalizacion		index
/home/keoh/Codigo/misGitHubs/econoPy/rentas/capitalizacion.py
-

# -*- coding: utf-8 -*-
-# Capitalizaciones financieras .. llevar dinero al futuro

-

- - - - - -
 
-Modules
       
rentas
-

- - - - - -
 
-Functions
       
capitalizar_cantidad_compuesto(cantidad, tipo_interes, numero_periodos)
Capitaliza una cantidad de dinero un determinado número de períodos
-por el metodo compuesto, los cuales han sido pasados en los parámetros.
-
capitalizar_cantidad_simple(cantidad, tipo_interes, numero_periodos)
Capitaliza una cantidad de dinero un determinado número de períodos
-por el metodo simple, los cuales han sido pasados en los parámetros.
-
capitalizar_renta_compuesto(cuota, tipo_interes, numero_periodos)
Capitaliza una renta con los datos de cuota, tipo de interes y número
-de períodos pasados como parámetro. Supone todas las cuotas iguales.
-
- \ No newline at end of file diff --git a/src/doc/rentas.html b/src/doc/rentas.html deleted file mode 100644 index 9a66cfd..0000000 --- a/src/doc/rentas.html +++ /dev/null @@ -1,36 +0,0 @@ - - -Python: package rentas - - - - -
 
- 
rentas		index
/home/keoh/Codigo/misGitHubs/econoPy/rentas/__init__.py
-

# -*- coding: utf-8 -*-

-

- - - - - -
 
-Package Contents
       
actualizacion
-		capitalizacion
-

- - - - - -
 
-Data
       ANUAL = 1.0
-BIANUAL = 0.5
-BIMENSUAL = 6.0
-CUATRIMESTRAL = 3.0
-MENSUAL = 12.0
-SEMESTRAL = 2.0
-TRIMESTRAL = 4.0
- \ No newline at end of file diff --git a/src/main.py b/src/main.py index 7cfa2bc..544fbbe 100644 --- a/src/main.py +++ b/src/main.py @@ -1,20 +1,20 @@ -# -*- coding: utf-8 -*- import os class EcoConsole: - - def __init__(self): - self.membrete() - - def membrete(self): - print "+"*32 - print "+++ Bienvenido econoPy +++" - print "+"*32 - print " " - - def menu(self): - pass - + + def __init__(self): + self.membrete() + + def membrete(self): + print("+"*32) + print("+++ Bienvenido econoPy +++") + print("+"*32) + print(" ") + + def menu(self): + pass + + if __name__ == "__main__": - EcoConsole() + EcoConsole() diff --git a/src/prestamos/__init__.py b/src/prestamos/__init__.py index d4c2eeb..e21e916 100644 --- a/src/prestamos/__init__.py +++ b/src/prestamos/__init__.py @@ -1,47 +1,52 @@ import rentas + class PrestamoFrances: - cuota = 0 - principal = 10 - interes_anual = 0.1 - interes = 0.01 - periodos = 1 - tipo_periodo = rentas.ANUAL - cuotas_interes = [] - cuotas_amortizacion = [] - capital_vivo = [] - total_amortizado = [] - - def __init__(self): - pass - - def calcula_interes(self): - self.interes = self.interes_anual / self.tipo_periodo - - def calcula_cuota(self): - self.calcula_interes() - cuota = self.principal * ((self.interes*(1+self.interes)**self.periodos)/(-1+(1+self.interes)**self.periodos)) - self.cuota = cuota - - def calcula_tabla_amortizacion(self): - self.capital_vivo.append(self.principal) - self.cuotas_interes.append(0) - self.cuotas_amortizacion.append(0) - self.total_amortizado.append(0) - for periodo in range(1, self.periodos+1): - interes = self.capital_vivo[periodo-1]*self.interes - amortizado = self.cuota - interes - self.cuotas_interes.append(interes) - self.cuotas_amortizacion.append(amortizado) - self.capital_vivo.append(self.capital_vivo[periodo-1]-amortizado) - self.total_amortizado.append(self.total_amortizado[periodo-1]+amortizado) - - def pinta_cuadro(self): - self.calcula_cuota() - self.calcula_tabla_amortizacion() - print " "+"-"*69 - print "| Periodo | Cuota | Capital Vivo | Cuota Interes | Cuota Amortizacion |" - print " "+"-"*69 - for i in range(1, self.periodos+1): - print "| %d | %f | %f | %f | %f |"%(i, round(self.cuota,2), round(self.capital_vivo[i],2), round(self.cuotas_interes[i],2), round(self.cuotas_amortizacion[i],2)) + cuota = 0 + principal = 10 + interes_anual = 0.1 + interes = 0.01 + periodos = 1 + tipo_periodo = rentas.ANUAL + cuotas_interes = [] + cuotas_amortizacion = [] + capital_vivo = [] + total_amortizado = [] + + def __init__(self): + pass + + def calcula_interes(self): + self.interes = self.interes_anual / self.tipo_periodo + + def calcula_cuota(self): + self.calcula_interes() + cuota = self.principal * \ + ((self.interes*(1+self.interes)**self.periodos) / + (-1+(1+self.interes)**self.periodos)) + self.cuota = cuota + + def calcula_tabla_amortizacion(self): + self.capital_vivo.append(self.principal) + self.cuotas_interes.append(0) + self.cuotas_amortizacion.append(0) + self.total_amortizado.append(0) + for periodo in range(1, self.periodos+1): + interes = self.capital_vivo[periodo-1]*self.interes + amortizado = self.cuota - interes + self.cuotas_interes.append(interes) + self.cuotas_amortizacion.append(amortizado) + self.capital_vivo.append(self.capital_vivo[periodo-1]-amortizado) + self.total_amortizado.append( + self.total_amortizado[periodo-1]+amortizado) + + def pinta_cuadro(self): + self.calcula_cuota() + self.calcula_tabla_amortizacion() + print(" "+"-"*69) + print("| Periodo | Cuota | Capital Vivo | Cuota Interes | Cuota Amortizacion |") + print(" "+"-"*69) + for i in range(1, self.periodos+1): + print("| {} | {} | {} | {} | {} |").format(i, round(self.cuota, 2), round( + self.capital_vivo[i], 2), round(self.cuotas_interes[i], 2), round(self.cuotas_amortizacion[i], 2)) diff --git a/src/rentas/__init__.py b/src/rentas/__init__.py index acf8e98..b358a86 100644 --- a/src/rentas/__init__.py +++ b/src/rentas/__init__.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- SEMESTRAL = 2.0 MENSUAL = 12.0 ANUAL = 1.0 CUATRIMESTRAL = 3.0 TRIMESTRAL = 4.0 BIANUAL = 0.5 -BIMENSUAL = 6.0 \ No newline at end of file +BIMENSUAL = 6.0 diff --git a/src/rentas/actualizacion.py b/src/rentas/actualizacion.py index ecd1c05..1ca426f 100644 --- a/src/rentas/actualizacion.py +++ b/src/rentas/actualizacion.py @@ -1,23 +1,25 @@ -# -*- coding: utf-8 -*- -# Actualizaciones financieras. Traer una cantidad de dinero del futuro a un tipo de interes dado. +"""Actualizaciones financieras. Traer una cantidad de dinero del futuro a un tipo de interes dado.""" + def actualizar_cantidad(cantidad, tipo_interes, numero_de_periodos): - cantidad_actualizada = cantidad / (1 + tipo_interes)**numero_de_periodos + cantidad_actualizada = cantidad / (1 + tipo_interes)**numero_de_periodos + + return cantidad_actualizada - return cantidad_actualizada def actualizar_renta(cuota, tipo_interes, numero_de_periodos): - cantidad_actualizada = 0 + cantidad_actualizada = 0 + + for i in range(1, numero_de_periodos+1): + cantidad_actualizada += actualizar_cantidad(cuota, tipo_interes, i) - for i in range(1, numero_de_periodos+1): - cantidad_actualizada += actualiza_cantidad(cuota, tipo_interes, i) + return cantidad_actualizada - return cantidad_actualizada def actualizar_renta_perpetua(cuota, tipo_interes): - cantidad_actualizada = cuota / tipo_interes + cantidad_actualizada = cuota / tipo_interes - return cantidad_actualizada \ No newline at end of file + return cantidad_actualizada diff --git a/src/rentas/capitalizacion.py b/src/rentas/capitalizacion.py index cc40295..4ef78c0 100644 --- a/src/rentas/capitalizacion.py +++ b/src/rentas/capitalizacion.py @@ -1,35 +1,37 @@ -# -*- coding: utf-8 -*- -# Capitalizaciones financieras .. llevar dinero al futuro +"""Capitalizaciones financieras .. llevar dinero al futuro.""" import rentas + def capitalizar_cantidad_compuesto(cantidad, tipo_interes, numero_periodos): - """ - Capitaliza una cantidad de dinero un determinado número de períodos - por el metodo compuesto, los cuales han sido pasados en los parámetros. + """ + Capitaliza una cantidad de dinero un determinado número de períodos + por el metodo compuesto, los cuales han sido pasados en los parámetros. + + """ - """ + cantidad_capitalizada = cantidad*(1+tipo_interes)**numero_periodos + return cantidad_capitalizada - cantidad_capitalizada = cantidad*(1+tipo_interes)**numero_periodos - return cantidad_capitalizada def capitalizar_cantidad_simple(cantidad, tipo_interes, numero_periodos): - """ - Capitaliza una cantidad de dinero un determinado número de períodos - por el metodo simple, los cuales han sido pasados en los parámetros. + """ + Capitaliza una cantidad de dinero un determinado número de períodos + por el metodo simple, los cuales han sido pasados en los parámetros. + + """ - """ + cantidad_capitalizada = cantidad*(1+(tipo_interes*numero_periodos)) + return cantidad_capitalizada - cantidad_capitalizada = cantidad*(1+(tipo_interes*numero_periodos)) - return cantidad_capitalizada def capitalizar_renta_compuesto(cuota, tipo_interes, numero_periodos): - """ - Capitaliza una renta con los datos de cuota, tipo de interes y número - de períodos pasados como parámetro. Supone todas las cuotas iguales. - """ - renta_capitalizada = 0 + """ + Capitaliza una renta con los datos de cuota, tipo de interes y número + de períodos pasados como parámetro. Supone todas las cuotas iguales. + """ + renta_capitalizada = 0 - for i in range(1, numero_periodos+1): - renta_capitalizada += capitalizar_cantidad(cuota, tipo_interes, i) + for i in range(1, numero_periodos+1): + renta_capitalizada += capitalizar_cantidad_compuesto(cuota, tipo_interes, i) - return renta_capitalizada + return renta_capitalizada diff --git a/src/tipos/__init__.py b/src/tipos/__init__.py index b8f0e80..8577d7c 100644 --- a/src/tipos/__init__.py +++ b/src/tipos/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import rentas def interes_mensual_simple(tipo_interes_anual): diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..9deac84 --- /dev/null +++ b/tox.ini @@ -0,0 +1,22 @@ +[tox] +envlist = py{34,35,36} + +[testenv] +basepython = + py27: python2.7 + py34: python3.4 + py35: python3.5 + py36: python3.6 +deps = + check-manifest + readme_renderer + flake8 + pytest +commands = + check-manifest --ignore tox.ini,tests* + python setup.py check -m -r -s + flake8 . + py.test tests +[flake8] +exclude = .tox,*.egg,build,data +select = E,W,F \ No newline at end of file From 8ede19158d80518161a845c06c68391f6591862b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Manzano=20Maga=C3=B1a?= Date: Fri, 13 Apr 2018 00:18:48 +0200 Subject: [PATCH 5/8] tox and pytest --- .coveragerc | 4 + .gitignore | 1 + .travis.yml | 2 - CHANGELOG.md | 7 ++ MANIFEST.in | 3 +- Pipfile | 17 +++++ Pipfile.lock | 151 ++++++++++++++++++++++++++++++++++++++ setup.py | 9 +-- tests/__init__.py | 1 + tests/unit/__init__.py | 1 + tests/unit/test_import.py | 10 +++ tox.ini | 31 ++++---- 12 files changed, 209 insertions(+), 28 deletions(-) create mode 100644 .coveragerc create mode 100644 CHANGELOG.md create mode 100644 Pipfile create mode 100644 Pipfile.lock create mode 100644 tests/__init__.py create mode 100644 tests/unit/__init__.py create mode 100644 tests/unit/test_import.py diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..14100e0 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,4 @@ +[run] +branch = True +cover_pylib = False +source = src \ No newline at end of file diff --git a/.gitignore b/.gitignore index c71b52e..bbd1efb 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ pip-log.txt # Unit test / coverage reports .coverage .tox +.pytest_cache/ #Translations *.mo diff --git a/.travis.yml b/.travis.yml index 6f34d07..20854d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: python matrix: include: - - python: 3.4 - env: TOXENV=py34 - python: 3.5 env: TOXENV=py35 - python: 3.6 diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..25f111d --- /dev/null +++ b/CHANGELOG.md @@ -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 diff --git a/MANIFEST.in b/MANIFEST.in index a2453a1..97f597a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,4 +2,5 @@ include *.md # Include the license file -include LICENSE \ No newline at end of file +include LICENSE +include VERSION \ No newline at end of file diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..afda596 --- /dev/null +++ b/Pipfile @@ -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" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..2f09fbc --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,151 @@ +{ + "_meta": { + "hash": { + "sha256": "c852bfaeccb2cc6e3115e30b85cc624082e5f727d27d4a4774b7f563bbcefa33" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.6" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.python.org/simple", + "verify_ssl": true + } + ] + }, + "default": {}, + "develop": { + "attrs": { + "hashes": [ + "sha256:1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9", + "sha256:a17a9573a6f475c99b551c0e0a812707ddda1ec9653bed04c13841404ed6f450" + ], + "version": "==17.4.0" + }, + "coverage": { + "hashes": [ + "sha256:03481e81d558d30d230bc12999e3edffe392d244349a90f4ef9b88425fac74ba", + "sha256:0b136648de27201056c1869a6c0d4e23f464750fd9a9ba9750b8336a244429ed", + "sha256:104ab3934abaf5be871a583541e8829d6c19ce7bde2923b2751e0d3ca44db60a", + "sha256:15b111b6a0f46ee1a485414a52a7ad1d703bdf984e9ed3c288a4414d3871dcbd", + "sha256:198626739a79b09fa0a2f06e083ffd12eb55449b5f8bfdbeed1df4910b2ca640", + "sha256:1c383d2ef13ade2acc636556fd544dba6e14fa30755f26812f54300e401f98f2", + "sha256:28b2191e7283f4f3568962e373b47ef7f0392993bb6660d079c62bd50fe9d162", + "sha256:2eb564bbf7816a9d68dd3369a510be3327f1c618d2357fa6b1216994c2e3d508", + "sha256:337ded681dd2ef9ca04ef5d93cfc87e52e09db2594c296b4a0a3662cb1b41249", + "sha256:3a2184c6d797a125dca8367878d3b9a178b6fdd05fdc2d35d758c3006a1cd694", + "sha256:3c79a6f7b95751cdebcd9037e4d06f8d5a9b60e4ed0cd231342aa8ad7124882a", + "sha256:3d72c20bd105022d29b14a7d628462ebdc61de2f303322c0212a054352f3b287", + "sha256:3eb42bf89a6be7deb64116dd1cc4b08171734d721e7a7e57ad64cc4ef29ed2f1", + "sha256:4635a184d0bbe537aa185a34193898eee409332a8ccb27eea36f262566585000", + "sha256:56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1", + "sha256:5a13ea7911ff5e1796b6d5e4fbbf6952381a611209b736d48e675c2756f3f74e", + "sha256:69bf008a06b76619d3c3f3b1983f5145c75a305a0fea513aca094cae5c40a8f5", + "sha256:6bc583dc18d5979dc0f6cec26a8603129de0304d5ae1f17e57a12834e7235062", + "sha256:701cd6093d63e6b8ad7009d8a92425428bc4d6e7ab8d75efbb665c806c1d79ba", + "sha256:7608a3dd5d73cb06c531b8925e0ef8d3de31fed2544a7de6c63960a1e73ea4bc", + "sha256:76ecd006d1d8f739430ec50cc872889af1f9c1b6b8f48e29941814b09b0fd3cc", + "sha256:7aa36d2b844a3e4a4b356708d79fd2c260281a7390d678a10b91ca595ddc9e99", + "sha256:7d3f553904b0c5c016d1dad058a7554c7ac4c91a789fca496e7d8347ad040653", + "sha256:7e1fe19bd6dce69d9fd159d8e4a80a8f52101380d5d3a4d374b6d3eae0e5de9c", + "sha256:8c3cb8c35ec4d9506979b4cf90ee9918bc2e49f84189d9bf5c36c0c1119c6558", + "sha256:9d6dd10d49e01571bf6e147d3b505141ffc093a06756c60b053a859cb2128b1f", + "sha256:9e112fcbe0148a6fa4f0a02e8d58e94470fc6cb82a5481618fea901699bf34c4", + "sha256:ac4fef68da01116a5c117eba4dd46f2e06847a497de5ed1d64bb99a5fda1ef91", + "sha256:b8815995e050764c8610dbc82641807d196927c3dbed207f0a079833ffcf588d", + "sha256:be6cfcd8053d13f5f5eeb284aa8a814220c3da1b0078fa859011c7fffd86dab9", + "sha256:c1bb572fab8208c400adaf06a8133ac0712179a334c09224fb11393e920abcdd", + "sha256:de4418dadaa1c01d497e539210cb6baa015965526ff5afc078c57ca69160108d", + "sha256:e05cb4d9aad6233d67e0541caa7e511fa4047ed7750ec2510d466e806e0255d6", + "sha256:e4d96c07229f58cb686120f168276e434660e4358cc9cf3b0464210b04913e77", + "sha256:f3f501f345f24383c0000395b26b726e46758b71393267aeae0bd36f8b3ade80", + "sha256:f8a923a85cb099422ad5a2e345fe877bbc89a8a8b23235824a93488150e45f6e" + ], + "version": "==4.5.1" + }, + "flake8": { + "hashes": [ + "sha256:7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0", + "sha256:c7841163e2b576d435799169b78703ad6ac1bbb0f199994fc05f700b2a90ea37" + ], + "version": "==3.5.0" + }, + "mccabe": { + "hashes": [ + "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", + "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" + ], + "version": "==0.6.1" + }, + "more-itertools": { + "hashes": [ + "sha256:0dd8f72eeab0d2c3bd489025bb2f6a1b8342f9b198f6fc37b52d15cfa4531fea", + "sha256:11a625025954c20145b37ff6309cd54e39ca94f72f6bb9576d1195db6fa2442e", + "sha256:c9ce7eccdcb901a2c75d326ea134e0886abfbea5f93e91cc95de9507c0816c44" + ], + "version": "==4.1.0" + }, + "pluggy": { + "hashes": [ + "sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff" + ], + "version": "==0.6.0" + }, + "py": { + "hashes": [ + "sha256:29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881", + "sha256:983f77f3331356039fdd792e9220b7b8ee1aa6bd2b25f567a963ff1de5a64f6a" + ], + "version": "==1.5.3" + }, + "pycodestyle": { + "hashes": [ + "sha256:1ec08a51c901dfe44921576ed6e4c1f5b7ecbad403f871397feedb5eb8e4fa14", + "sha256:5ff2fbcbab997895ba9ead77e1b38b3ebc2e5c3b8a6194ef918666e4c790a00e", + "sha256:682256a5b318149ca0d2a9185d365d8864a768a28db66a84a2ea946bcc426766", + "sha256:6c4245ade1edfad79c3446fadfc96b0de2759662dc29d07d80a6f27ad1ca6ba9" + ], + "version": "==2.3.1" + }, + "pyflakes": { + "hashes": [ + "sha256:08bd6a50edf8cffa9fa09a463063c425ecaaf10d1eb0335a7e8b1401aef89e6f", + "sha256:8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805" + ], + "version": "==1.6.0" + }, + "pytest": { + "hashes": [ + "sha256:6266f87ab64692112e5477eba395cfedda53b1933ccd29478e671e73b420c19c", + "sha256:fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1" + ], + "index": "pypi", + "version": "==3.5.0" + }, + "pytest-cov": { + "hashes": [ + "sha256:03aa752cf11db41d281ea1d807d954c4eda35cfa1b21d6971966cc041bbf6e2d", + "sha256:890fe5565400902b0c78b5357004aab1c814115894f4f21370e2433256a3eeec" + ], + "index": "pypi", + "version": "==2.5.1" + }, + "pytest-flake8": { + "hashes": [ + "sha256:3996de65a1219697596acac755090c70c47ec901edc438ea88ce1aa6098fb905", + "sha256:43598dfa211242525897866ff35fa553ebd88177383783079099057c7ad04331" + ], + "index": "pypi", + "version": "==1.0.0" + }, + "six": { + "hashes": [ + "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", + "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + ], + "version": "==1.11.0" + } + } +} diff --git a/setup.py b/setup.py index a5b434c..86c2c5b 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,9 @@ -from setuptools import setup, find_packages from codecs import open from os import path +from setuptools import find_packages, setup + here = path.abspath(path.dirname(__file__)) with open(path.join(here, 'README.md'), encoding='utf-8') as f: @@ -39,14 +40,8 @@ 'dev': ['check-manifest'], 'test': ['coverage'], }, - package_data={}, - data_files=[], - entry_points={ - 'console_scripts': [], - }, project_urls={ 'Bug Reports': 'https://github.com/KeoH/econoPy/issues', - 'Funding': 'https://donate.pypi.org', 'Source': 'https://github.com/KeoH/econoPy/', }, ) diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..2813bd3 --- /dev/null +++ b/tests/__init__.py @@ -0,0 +1 @@ +"""Unit tests.""" \ No newline at end of file diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py new file mode 100644 index 0000000..2813bd3 --- /dev/null +++ b/tests/unit/__init__.py @@ -0,0 +1 @@ +"""Unit tests.""" \ No newline at end of file diff --git a/tests/unit/test_import.py b/tests/unit/test_import.py new file mode 100644 index 0000000..a17d7dc --- /dev/null +++ b/tests/unit/test_import.py @@ -0,0 +1,10 @@ +"""Base library tests.""" + + +def test_import(): + """Test basic import.""" + import importlib + try: + importlib.import_module('econopy') + except ImportError: + assert False \ No newline at end of file diff --git a/tox.ini b/tox.ini index 9deac84..a64684f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,22 +1,17 @@ [tox] -envlist = py{34,35,36} +envlist = py36 [testenv] -basepython = - py27: python2.7 - py34: python3.4 - py35: python3.5 - py36: python3.6 -deps = - check-manifest - readme_renderer - flake8 - pytest +passenv=HOME +deps = pipenv +usedevelop = True commands = - check-manifest --ignore tox.ini,tests* - python setup.py check -m -r -s - flake8 . - py.test tests -[flake8] -exclude = .tox,*.egg,build,data -select = E,W,F \ No newline at end of file + pipenv install --dev + pipenv run py.test + +[testenv:doc] +passenv=HOME +usedevelop = True +deps = pipenv +commands= + pipenv run python setup.py sphinx_build \ No newline at end of file From 1e7cbab6dc9cba1668550f3d5e3524d70a4cf182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Manzano=20Maga=C3=B1a?= Date: Fri, 13 Apr 2018 00:32:33 +0200 Subject: [PATCH 6/8] travisCL config --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 20854d3..6f34d07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: python matrix: include: + - python: 3.4 + env: TOXENV=py34 - python: 3.5 env: TOXENV=py35 - python: 3.6 From 0d06413436f3ef7f21d3b1a75426c17de723e694 Mon Sep 17 00:00:00 2001 From: Francisco Manzano Date: Fri, 13 Apr 2018 11:59:05 +0200 Subject: [PATCH 7/8] [packaging] reestructured code --- README.md | 2 +- src/__init__.py | 0 src/econopy/__init__.py | 0 src/{ => econopy}/calculos/__init__.py | 0 src/{ => econopy}/prestamos/__init__.py | 0 src/{ => econopy}/rentas/__init__.py | 0 src/{ => econopy}/rentas/actualizacion.py | 0 src/{ => econopy}/rentas/capitalizacion.py | 0 src/{ => econopy}/tipos/__init__.py | 0 src/main.py | 20 -------------------- 10 files changed, 1 insertion(+), 21 deletions(-) create mode 100644 src/__init__.py create mode 100644 src/econopy/__init__.py rename src/{ => econopy}/calculos/__init__.py (100%) rename src/{ => econopy}/prestamos/__init__.py (100%) rename src/{ => econopy}/rentas/__init__.py (100%) rename src/{ => econopy}/rentas/actualizacion.py (100%) rename src/{ => econopy}/rentas/capitalizacion.py (100%) rename src/{ => econopy}/tipos/__init__.py (100%) delete mode 100644 src/main.py diff --git a/README.md b/README.md index 26fcd91..fcb7901 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ Python con la vista puesta en el uso como módulo, y ser reutilizado en varios proyectos. ## Author -Francisco Manzano Magaña \ No newline at end of file +Francisco Manzano Magaña diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/econopy/__init__.py b/src/econopy/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/calculos/__init__.py b/src/econopy/calculos/__init__.py similarity index 100% rename from src/calculos/__init__.py rename to src/econopy/calculos/__init__.py diff --git a/src/prestamos/__init__.py b/src/econopy/prestamos/__init__.py similarity index 100% rename from src/prestamos/__init__.py rename to src/econopy/prestamos/__init__.py diff --git a/src/rentas/__init__.py b/src/econopy/rentas/__init__.py similarity index 100% rename from src/rentas/__init__.py rename to src/econopy/rentas/__init__.py diff --git a/src/rentas/actualizacion.py b/src/econopy/rentas/actualizacion.py similarity index 100% rename from src/rentas/actualizacion.py rename to src/econopy/rentas/actualizacion.py diff --git a/src/rentas/capitalizacion.py b/src/econopy/rentas/capitalizacion.py similarity index 100% rename from src/rentas/capitalizacion.py rename to src/econopy/rentas/capitalizacion.py diff --git a/src/tipos/__init__.py b/src/econopy/tipos/__init__.py similarity index 100% rename from src/tipos/__init__.py rename to src/econopy/tipos/__init__.py diff --git a/src/main.py b/src/main.py deleted file mode 100644 index 544fbbe..0000000 --- a/src/main.py +++ /dev/null @@ -1,20 +0,0 @@ -import os - - -class EcoConsole: - - def __init__(self): - self.membrete() - - def membrete(self): - print("+"*32) - print("+++ Bienvenido econoPy +++") - print("+"*32) - print(" ") - - def menu(self): - pass - - -if __name__ == "__main__": - EcoConsole() From c4ab7c37656e9273b16db986a21c4d342006771a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Manzano=20Maga=C3=B1a?= Date: Fri, 13 Apr 2018 18:59:12 +0200 Subject: [PATCH 8/8] working package --- VERSION | 2 +- {src => econopy}/__init__.py | 0 {src/econopy => econopy}/calculos/__init__.py | 0 {src/econopy => econopy}/prestamos/__init__.py | 0 {src/econopy => econopy}/rentas/__init__.py | 0 {src/econopy => econopy}/rentas/actualizacion.py | 0 {src/econopy => econopy}/rentas/capitalizacion.py | 0 {src/econopy => econopy}/tipos/__init__.py | 0 setup.py | 1 - src/econopy/__init__.py | 0 10 files changed, 1 insertion(+), 2 deletions(-) rename {src => econopy}/__init__.py (100%) rename {src/econopy => econopy}/calculos/__init__.py (100%) rename {src/econopy => econopy}/prestamos/__init__.py (100%) rename {src/econopy => econopy}/rentas/__init__.py (100%) rename {src/econopy => econopy}/rentas/actualizacion.py (100%) rename {src/econopy => econopy}/rentas/capitalizacion.py (100%) rename {src/econopy => econopy}/tipos/__init__.py (100%) delete mode 100644 src/econopy/__init__.py diff --git a/VERSION b/VERSION index 7bcd0e3..6812f81 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.2 \ No newline at end of file +0.0.3 \ No newline at end of file diff --git a/src/__init__.py b/econopy/__init__.py similarity index 100% rename from src/__init__.py rename to econopy/__init__.py diff --git a/src/econopy/calculos/__init__.py b/econopy/calculos/__init__.py similarity index 100% rename from src/econopy/calculos/__init__.py rename to econopy/calculos/__init__.py diff --git a/src/econopy/prestamos/__init__.py b/econopy/prestamos/__init__.py similarity index 100% rename from src/econopy/prestamos/__init__.py rename to econopy/prestamos/__init__.py diff --git a/src/econopy/rentas/__init__.py b/econopy/rentas/__init__.py similarity index 100% rename from src/econopy/rentas/__init__.py rename to econopy/rentas/__init__.py diff --git a/src/econopy/rentas/actualizacion.py b/econopy/rentas/actualizacion.py similarity index 100% rename from src/econopy/rentas/actualizacion.py rename to econopy/rentas/actualizacion.py diff --git a/src/econopy/rentas/capitalizacion.py b/econopy/rentas/capitalizacion.py similarity index 100% rename from src/econopy/rentas/capitalizacion.py rename to econopy/rentas/capitalizacion.py diff --git a/src/econopy/tipos/__init__.py b/econopy/tipos/__init__.py similarity index 100% rename from src/econopy/tipos/__init__.py rename to econopy/tipos/__init__.py diff --git a/setup.py b/setup.py index 86c2c5b..42aa004 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ with open(path.join(here, 'VERSION'), encoding='utf-8') as f: version = f.read() -print(version) setup( name='econopy', version=version, diff --git a/src/econopy/__init__.py b/src/econopy/__init__.py deleted file mode 100644 index e69de29..0000000