Skip to content

Commit

Permalink
Merge branch 'pull/9'
Browse files Browse the repository at this point in the history
# Conflicts:
#	setup.py
  • Loading branch information
Nekmo committed May 1, 2020
2 parents a4ea2f7 + df6f66b commit caaa4dc
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from fnmatch import fnmatchcase
import os
import sys
import uuid

###############################
# Configuración del paquete #
Expand Down Expand Up @@ -172,15 +171,6 @@ def find_package_data(where='.', package='',

##############################################################################

# Lista de dependencias a instalar
if os.path.exists(requirements_path):
requirements = list(parse_requirements(requirements_path, session=uuid.uuid1()))
install_requires = [str(ir.req) for ir in requirements]
dependency_links = [get_url(ir) for ir in requirements if get_url(ir)]
else:
install_requires = INSTALL_REQUIRES
dependency_links = []

# Todos los módulos y submódulos a instalar (module, module.submodule, module.submodule2...)
packages = find_packages(__dir__)
# Prevent include symbolic links
Expand Down Expand Up @@ -244,6 +234,11 @@ def find_package_data(where='.', package='',
CLASSIFIERS.append('Operating System :: {0}'.format(' :: '.join(parts)))


def read_file(file):
with open(file, 'r') as f:
return f.read()


# Añadir la versión de Python a los Classifiers
def frange(x, y, jump):
while x < y:
Expand Down Expand Up @@ -279,7 +274,10 @@ def frange(x, y, jump):
'Development Status :: {0} - {1}'.format(STATUS_LEVEL, status_name),
])

print(install_requires)

install_requires = read_file(requirements_path)


setup(
name=PACKAGE_NAME,
version=package_version,
Expand All @@ -299,7 +297,7 @@ def frange(x, y, jump):

provides=modules,
install_requires=install_requires,
dependency_links=dependency_links,
dependency_links=[],

packages=packages,
include_package_data=True,
Expand Down

0 comments on commit caaa4dc

Please sign in to comment.