From ca38a5e7c1f6aa7fa434e391afb454d7890b3f0d Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Mon, 20 Dec 2021 14:59:07 +1000 Subject: [PATCH] Make pip install work. - Having trouble with recursive dependencies not being installed. - Try using install_requires in setup.py instead of requirements.txt files. - Putting back version numbers. --- eris/requirements.txt | 10 ---------- eris/setup.py | 8 +++++++- fill3/requirements.txt | 1 - fill3/setup.py | 4 +++- install | 2 +- termstr/requirements.txt | 1 - termstr/setup.py | 4 +++- 7 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 eris/requirements.txt delete mode 100644 fill3/requirements.txt delete mode 100644 termstr/requirements.txt diff --git a/eris/requirements.txt b/eris/requirements.txt deleted file mode 100644 index a43082e..0000000 --- a/eris/requirements.txt +++ /dev/null @@ -1,10 +0,0 @@ -pyinotify==0.9.6 -pygments==2.10.0 -docopt==0.6.2 -pillow==8.4.0 -toml==0.10.2 -decorator==5.1.0 -pexpect==4.8.0 -git+https://github.com/ahamilton/eris@2021.12.16#subdirectory=termstr -git+https://github.com/ahamilton/eris@2021.12.16#subdirectory=fill3 -git+https://github.com/ahamilton/eris@2021.12.16#subdirectory=lscolors diff --git a/eris/setup.py b/eris/setup.py index 5936d00..053bfd4 100755 --- a/eris/setup.py +++ b/eris/setup.py @@ -8,6 +8,7 @@ except ImportError: setup(name="eris", + version="2021.12.16", description=("Eris maintains an up-to-date set of reports for every file in a codebase."), url="https://github.com/ahamilton/eris", author="Andrew Hamilton", @@ -19,4 +20,9 @@ setup(name="eris", entry_points={"console_scripts": ["eris=eris.__main__:entry_point", "eris-worker=eris.worker:main", "eris-webserver=eris.webserver:main", - "pydoc_color=eris.pydoc_color:main"]}) + "pydoc_color=eris.pydoc_color:main"]}, + install_requires=["pyinotify==0.9.6", "pygments==2.10.0", "docopt==0.6.2", "pillow==8.4.0", + "toml==0.10.2", "decorator==5.1.0", "pexpect==4.8.0", + "termstr @ git+https://github.com/ahamilton/eris@2021.12.16#subdirectory=termstr", + "fill3 @ git+https://github.com/ahamilton/eris@2021.12.16#subdirectory=fill3", + "lscolors @ git+https://github.com/ahamilton/eris@2021.12.16#subdirectory=lscolors"]) diff --git a/fill3/requirements.txt b/fill3/requirements.txt deleted file mode 100644 index 185608d..0000000 --- a/fill3/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -./termstr diff --git a/fill3/setup.py b/fill3/setup.py index 820e446..feea7f3 100755 --- a/fill3/setup.py +++ b/fill3/setup.py @@ -8,9 +8,11 @@ except ImportError: setup(name="fill3", + version="2021.12.16", description=("Fill3 provides basic widgets for a tui."), url="https://github.com/ahamilton/eris", author="Andrew Hamilton", author_email="and_hamilton@yahoo.com", license="Artistic 2.0", - packages=["fill3"]) + packages=["fill3"], + install_requires=["termstr @ git+https://github.com/ahamilton/eris@2021.12.16#subdirectory=termstr"]) diff --git a/install b/install index eeb9392..44112e6 100755 --- a/install +++ b/install @@ -5,6 +5,6 @@ set -e sudo apt-get install -y python3.9 python3-pip -python3.9 -m pip install -r ./eris/requirements.txt ./eris +python3.9 -m pip install ./eris # python3.9 -m pip install -e ./eris -e ./termstr -e ./fill3 -e ./lscolors # When developing. ./install-tools diff --git a/termstr/requirements.txt b/termstr/requirements.txt deleted file mode 100644 index 7db594d..0000000 --- a/termstr/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -cwcwidth==0.1.5 diff --git a/termstr/setup.py b/termstr/setup.py index ecc0818..e098059 100755 --- a/termstr/setup.py +++ b/termstr/setup.py @@ -8,9 +8,11 @@ except ImportError: setup(name="termstr", + version="2021.12.16", description=("Termstr provides strings with extra terminal styling."), url="https://github.com/ahamilton/eris", author="Andrew Hamilton", author_email="and_hamilton@yahoo.com", license="Artistic 2.0", - py_modules=["termstr"]) + py_modules=["termstr"], + install_requires=["cwcwidth==0.1.5"])