Unverified Commit 3d4b4a09 authored by Tao Feng's avatar Tao Feng Committed by GitHub

Update setup.py to include requirment3 file (#82)

parent a9fb7af1
...@@ -46,7 +46,7 @@ flask==1.0.2 ...@@ -46,7 +46,7 @@ flask==1.0.2
# The wheel project provides a bdist_wheel command for setuptools >= 0.8.0 # The wheel project provides a bdist_wheel command for setuptools >= 0.8.0
# License: MIT # License: MIT
# Upstream url: https://github.com/pypa/wheel # Upstream url: https://github.com/pypa/wheel
wheel==0.31.1 wheel==0.33.1
# HTTP for Humans # HTTP for Humans
# License: Apache # License: Apache
......
...@@ -22,6 +22,7 @@ def build_js() -> None: ...@@ -22,6 +22,7 @@ def build_js() -> None:
try: try:
subprocess.check_call(['npm install --only=prod'], cwd=PACKAGE_DIR, shell=True) subprocess.check_call(['npm install --only=prod'], cwd=PACKAGE_DIR, shell=True)
subprocess.check_call(['npm run build'], cwd=PACKAGE_DIR, shell=True)
except Exception as e: except Exception as e:
logging.warn('Installation of npm dependencies failed') logging.warn('Installation of npm dependencies failed')
logging.warn(str(e)) logging.warn(str(e))
...@@ -29,7 +30,11 @@ def build_js() -> None: ...@@ -29,7 +30,11 @@ def build_js() -> None:
build_js() build_js()
__version__ = '1.0.0' requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'requirements3.txt')
with open(requirements_path) as requirements_file:
requirements = requirements_file.readlines()
__version__ = '1.0.1'
setup( setup(
...@@ -42,23 +47,7 @@ setup( ...@@ -42,23 +47,7 @@ setup(
packages=find_packages(exclude=['tests*']), packages=find_packages(exclude=['tests*']),
include_package_data=True, include_package_data=True,
dependency_links=[], dependency_links=[],
install_requires=[ install_requires=requirements,
# Packages in here should rarely be pinned. This is because these
# packages (at the specified version) are required for project
# consuming this library. By pinning to a specific version you are the
# number of projects that can consume this or forcing them to
# upgrade/downgrade any dependencies pinned here in their project.
#
# Generally packages listed here are pinned to a major version range.
#
# e.g.
# Python FooBar package for foobaring
# pyfoobar>=1.0, <2.0
#
# This will allow for any consuming projects to use this library as
# long as they have a version of pyfoobar equal to or greater than 1.x
# and less than 2.x installed.
],
python_requires=">=3.6", python_requires=">=3.6",
entry_points=""" entry_points="""
[action_log.post_exec.plugin] [action_log.post_exec.plugin]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment