Update minor enhancement (#102)

* Bump versions

* [Minor]: Update bashplot

* Updae pyproject

* Update poetry

* Float 2 Str

* Update bashplot

* Extend by 3.10

Author: Anselmoo

.github/workflows/pypi_publish.yml

@@ -7,11 +7,10 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
 
     steps:
     - uses: actions/checkout@v3

.github/workflows/python-package.yml

@@ -5,43 +5,42 @@ name: Python Package
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install poetry
-        poetry install
-    - name: Lint with flake8, black, isort, pydocstyle
-      run: |
-        poetry run flake8 bashplot/ --count --statistic
-        poetry run black . --check -v
-        poetry run isort . --check -v
-        poetry run flake8 . --count --exit-zero --max-complexity=10 --statistics
-        poetry run pydocstyle --convention=numpy -e bashplot/bashplot.py
-    - name: Test with pytest and coverage
-      run: |
-        poetry run coverage run -m pytest -vv
-        poetry run coverage report -m
-        poetry run coverage xml
-    - name: Codecov
-      uses: codecov/[email protected]
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        env_vars: OS,PYTHON
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install poetry
+          poetry install
+      - name: Lint with flake8, black, isort, pydocstyle
+        run: |
+          poetry run flake8 bashplot/ --count --statistic
+          poetry run black . --check -v
+          poetry run isort . --check -v
+          poetry run flake8 . --count --exit-zero --max-complexity=10 --statistics
+          poetry run pydocstyle --convention=numpy -e bashplot/bashplot.py
+      - name: Test with pytest and coverage
+        run: |
+          poetry run coverage run -m pytest -vv
+          poetry run coverage report -m
+          poetry run coverage xml
+      - name: Codecov
+        uses: codecov/[email protected]
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          env_vars: OS,PYTHON

azure-pipelines.yml

@@ -18,6 +18,8 @@ strategy:
       python.version: "3.8"
     Python39:
       python.version: "3.9"
+    Python310:
+      python.version: "3.10"
 
 steps:
   - task: UsePythonVersion@0

bashplot/__init__.py

@@ -1,2 +1,2 @@
 """Bashplot: Instant data plotting from the terminal into the terminal."""
-__version__ = "1.1.1"
+__version__ = "1.1.2"

bashplot/bashplot.py

@@ -64,7 +64,7 @@ def load_data(fname: str, args: dict) -> np.ndarray:
     )
 
 
-def plot_plot(fig: Any, x: np.ndarray, Y: np.ndarray, label: str) -> Any:
+def plot_plot(fig: Any, x: np.ndarray, y: np.ndarray, label: str) -> Any:
     """Make the plot-figures.
 
     plot_plot() is generating a single- or multi-plot by recursively calling plot().
@@ -75,8 +75,8 @@ def plot_plot(fig: Any, x: np.ndarray, Y: np.ndarray, label: str) -> Any:
         Figure class for the terminal plot
     x : float-array
         1D-Numpy-array with the float column x-values.
-    Y : float-array
-        1D- or 2D-Numpy-array with the float column Y-values.
+    y : float-array
+        1D- or 2D-Numpy-array with the float column y-values.
     label : str
         The label of the plot(s) is the current filename.
 
@@ -85,16 +85,16 @@ def plot_plot(fig: Any, x: np.ndarray, Y: np.ndarray, label: str) -> Any:
     fig :  class
         Updated figure class for the terminal plot
     plot_plot() : function
-        Returns the function itself for a smaller (n-1) float-array (Y) until it is an
+        Returns the function itself for a smaller (n-1) float-array (y) until it is an
         1D-array.
     """
-    fig.plot(x, Y[:, 0], label=label)
-    if Y.shape[1] == 1:
+    fig.plot(x, y[:, 0], label=label)
+    if y.shape[1] == 1:
         return fig
-    return plot_plot(fig, x, Y[:, 1:], label=label)
+    return plot_plot(fig, x, y[:, 1:], label=label)
 
 
-def plot_scatter(fig, x: np.ndarray, Y: np.ndarray, label: str):
+def plot_scatter(fig, x: np.ndarray, y: np.ndarray, label: str):
     """Make the scatter-figures.
 
     plot_scatter() is generating a single- or multi-plot by recursive calling
@@ -106,8 +106,8 @@ def plot_scatter(fig, x: np.ndarray, Y: np.ndarray, label: str):
         Figure class for the terminal plot
     x : np.ndarray
         1D-Numpy-array with the float column x-values.
-    Y : np.ndarray
-        1D- or 2D-Numpy-array with the float column Y-values.
+    y : np.ndarray
+        1D- or 2D-Numpy-array with the float column y-values.
     label : str
         The label of the scatter-plot(s) is the current filename.
 
@@ -116,13 +116,34 @@ def plot_scatter(fig, x: np.ndarray, Y: np.ndarray, label: str):
     fig :  class
         Updated figure class for the terminal plot
     plot_scatter() : function
-        Returns the function itself for a smaller (n-1) float-array (Y) until it is an
+        Returns the function itself for a smaller (n-1) float-array (y) until it is an
         1D-array.
     """
-    fig.scatter(x, Y[:, 0], label=label)
-    if Y.shape[1] == 1:
+    fig.scatter(x, y[:, 0], label=label)
+    if y.shape[1] == 1:
         return fig
-    return plot_plot(fig, x, Y[:, 1:], label=label)
+    return plot_scatter(fig, x, y[:, 1:], label=label)
+
+
+def fig_size(width: float, height: float) -> Any:
+    """Set the figure size.
+
+    Parameters
+    ----------
+    width : float
+        Width of the terminal plot.
+    height : float
+        Height of the terminal plot.
+
+    Returns
+    -------
+    fig : class
+        Figure class for the terminal plot
+    """
+    fig = plt.Figure()
+    fig.width = width
+    fig.height = height
+    return fig
 
 
 def plot(data: np.ndarray, args: dict, label: str) -> None:
@@ -140,9 +161,7 @@ def plot(data: np.ndarray, args: dict, label: str) -> None:
     label : str
         The label of the scatter-plot(s) is the current filename.
     """
-    fig = plt.Figure()
-    fig.width = args["size"][0]
-    fig.height = args["size"][1]
+    fig = fig_size(width=args["size"][0], height=args["size"][1])
     try:
 
         if args["x_limits"]:
@@ -167,14 +186,12 @@ def plot(data: np.ndarray, args: dict, label: str) -> None:
         y = data[:, 1:]
 
         if args["scatter"]:
-            fig = plot_scatter(fig, x=x, Y=y, label=label)
+            fig = plot_scatter(fig, x=x, y=y, label=label)
         else:
-            fig = plot_plot(fig, x=x, Y=y, label=label)
+            fig = plot_plot(fig, x=x, y=y, label=label)
+
+        log(fig.show(legend=args["legend"]))
 
-        if args["legend"]:
-            log(fig.show(legend=True))
-        else:
-            log(fig.show(legend=False))
     except IndexError:
         log(f"corrupted data in {label}", mode=1)
         sys.exit(1)
@@ -351,7 +368,3 @@ def command_line_runner() -> None:
 
     fnames = args["infile"]
     bashplot(fnames, args)
-
-
-if __name__ == "__main__":
-    command_line_runner()