From c018e9f7d4d57bc8f91ff9836b126890cc302295 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Thu, 4 Nov 2021 21:37:38 +1000 Subject: [PATCH] Extracted termstr into its own python project. --- eris/requirements.txt | 2 +- eris/setup.py | 2 +- install | 3 ++- termstr/requirements.txt | 1 + termstr/setup.py | 16 ++++++++++++++++ {eris => termstr}/termstr/ColorMap.py | 0 {eris => termstr}/termstr/__init__.py | 0 7 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 termstr/requirements.txt create mode 100755 termstr/setup.py rename {eris => termstr}/termstr/ColorMap.py (100%) rename {eris => termstr}/termstr/__init__.py (100%) diff --git a/eris/requirements.txt b/eris/requirements.txt index 050af80..b9aa19a 100644 --- a/eris/requirements.txt +++ b/eris/requirements.txt @@ -5,4 +5,4 @@ pillow==8.4.0 toml==0.10.2 decorator==5.1.0 pexpect==4.8.0 -cwcwidth==0.1.5 +termstr==2021.10.18 diff --git a/eris/setup.py b/eris/setup.py index 007931e..16b879a 100755 --- a/eris/setup.py +++ b/eris/setup.py @@ -14,7 +14,7 @@ setup(name="eris", url="https://github.com/ahamilton/eris", author="Andrew Hamilton", license="Artistic 2.0", - packages=["eris", "termstr", "fill3"], + packages=["eris", "fill3"], py_modules=["lscolors", "sorted_collection"], package_data={"eris": ["LS_COLORS.sh", "tools.toml"]}, entry_points={"console_scripts": diff --git a/install b/install index 66e9032..9506bf3 100755 --- a/install +++ b/install @@ -4,5 +4,6 @@ set -e -python3.9 -m pip install -r ./eris/requirements.txt ./eris +python3.9 -m pip install -r ./termstr/requirements.txt $1 ./termstr +python3.9 -m pip install -r ./eris/requirements.txt $1 ./eris ./install-tools diff --git a/termstr/requirements.txt b/termstr/requirements.txt new file mode 100644 index 0000000..7db594d --- /dev/null +++ b/termstr/requirements.txt @@ -0,0 +1 @@ +cwcwidth==0.1.5 diff --git a/termstr/setup.py b/termstr/setup.py new file mode 100755 index 0000000..9b477eb --- /dev/null +++ b/termstr/setup.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3.9 + + +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + + +setup(name="termstr", + version="2021.10.18", + description=("Termstr provides strings with extra terminal styling."), + url="https://github.com/ahamilton/eris", + author="Andrew Hamilton", + license="Artistic 2.0", + packages=["termstr"]) diff --git a/eris/termstr/ColorMap.py b/termstr/termstr/ColorMap.py similarity index 100% rename from eris/termstr/ColorMap.py rename to termstr/termstr/ColorMap.py diff --git a/eris/termstr/__init__.py b/termstr/termstr/__init__.py similarity index 100% rename from eris/termstr/__init__.py rename to termstr/termstr/__init__.py