Skip to content

Commit

Permalink
fix pyyaml dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
jpfleischer committed Aug 16, 2023
1 parent 763754d commit 2c5fda0
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 29 deletions.
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ cloudmesh-progress
#
# pip-compile setup.py
#
pyyaml
pyyaml>=5.5
psutil
yamldb
docker-compose
networkx[default]
pydot
graphviz
Expand Down
57 changes: 30 additions & 27 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,44 +17,47 @@

from setuptools import find_packages, setup
from cloudmesh.common.systeminfo import os_is_windows
from cloudmesh.common.util import readfile
import io

def readfile(filename):
with io.open(filename, encoding="utf-8") as stream:
return stream.read().split()
# def readfile(filename):
# with io.open(filename, encoding="utf-8") as stream:
# return stream.read().split()


#requiers = readfile ('requirements.txt')
requiers = readfile('requirements.txt').splitlines()
#
# add minimum requirements here
#
requiers = """
cloudmesh-cmd5
cloudmesh-sys
cloudmesh-inventory
cloudmesh-configuration
cloudmesh-progress
pyyaml==5.4.1
psutil
yamldb
docker-compose
networkx[default]
pydot
graphviz
fastapi[all]
httpx
trio
papermill
pandas
markdown
sse-starlette
ipython
ipykernel
""".split("\n")
# requiers = """
# cloudmesh-cmd5
# cloudmesh-sys
# cloudmesh-inventory
# cloudmesh-configuration
# cloudmesh-progress
# pyyaml==5.4.1
# psutil
# yamldb
# docker-compose
# networkx[default]
# pydot
# graphviz
# fastapi[all]
# httpx
# trio
# papermill
# pandas
# markdown
# sse-starlette
# ipython
# ipykernel
# """.split("\n")

if os_is_windows():
requiers.append('pywin32')

print(requiers)

# dependency_links = ['http://github.com/nicolaiarocci/eve.git@develop']

version = readfile("VERSION")[0].strip()
Expand Down

0 comments on commit 2c5fda0

Please sign in to comment.