From b54759b02ab3bc608d1c09bddbb21b034f7ca380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sondre=20Lilleb=C3=B8=20Gundersen?= <sondrelg@otovo.com>
Date: Sat, 28 Nov 2020 12:32:15 +0000
Subject: [PATCH] Remove dev-requirements.txt

---
 .github/workflows/pythonpackage.yml |  24 +++--
 .idea/workspace.xml                 | 155 ++++++++++++++++++++++++++++
 CONTRIBUTING.md                     |  12 ++-
 requirements-dev.txt                |   5 -
 rich/bar.py                         |   2 +-
 rich/containers.py                  |   2 -
 rich/jupyter.py                     |   1 -
 rich/prompt.py                      |   2 +-
 8 files changed, 179 insertions(+), 24 deletions(-)
 create mode 100644 .idea/workspace.xml
 delete mode 100644 requirements-dev.txt

diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index a4cae13b..ff13bd43 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -6,10 +6,13 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
         python-version: [3.6, 3.7, 3.8, 3.9]
-
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python ${{ matrix.python-version }}
@@ -17,22 +20,22 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
+      - name: Install and configure Poetry
+        uses: snok/install-poetry@v1.1.1
+        with:
+          version: 1.1.4
+          virtualenvs-create: false
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements-dev.txt
-          poetry install
+        run: poetry install
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
       - name: Format check with black
-        run: |
-          make format-check
+        run: make format-check
       - name: Typecheck with mypy
-        run: |
-          make typecheck
+        run: make typecheck
       - name: Test with pytest
         run: |
           pip install .
           python -m pytest tests -v --cov=./rich --cov-report=xml:./coverage.xml --cov-report term-missing
-
       - name: Upload code coverage
         uses: codecov/codecov-action@v1.0.10
         with:
@@ -41,3 +44,4 @@ jobs:
           name: rich
           flags: unittests
           env_vars: OS,PYTHON
+          fail_ci_if_error: true
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..02d20e2e
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="BranchesTreeState">
+    <expand>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="GROUP_NODE:sondrelg" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+    </expand>
+    <select />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="71ff3e8e-157c-452c-bec8-e8e042909eaa" name="Default Changelist" comment="Correct cache key" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="JupyterTrust" id="85a5579d-1202-4634-9acb-6a9de9efd8d5" />
+  <component name="ProjectId" id="1kukuTVNVHGmA4ZiM9f1lDVSBWJ" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+  </component>
+  <component name="RunManager">
+    <configuration name="pytest for tests.test_card.test_card_render" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <module name="rich" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_parameters" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;tests.test_card.test_card_render&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python tests.pytest for tests.test_card.test_card_render" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="71ff3e8e-157c-452c-bec8-e8e042909eaa" name="Default Changelist" comment="" />
+      <created>1606558089069</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1606558089069</updated>
+      <workItem from="1606558091048" duration="318000" />
+      <workItem from="1606558414836" duration="4396000" />
+    </task>
+    <task id="LOCAL-00001" summary="Add dev dependencies">
+      <created>1606560519943</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1606560519943</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Remove dev-requirements.txt">
+      <created>1606566735500</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1606566735500</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Correct cache key">
+      <created>1606569271696</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1606569271696</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Add dev dependencies" />
+    <MESSAGE value="Remove dev-requirements.txt" />
+    <MESSAGE value="Correct cache key" />
+    <option name="LAST_COMMIT_MESSAGE" value="Correct cache key" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state width="1878" height="305" key="GridCell.Tab.0.bottom" timestamp="1606560005051">
+      <screen x="-336" y="-1080" width="1920" height="1080" />
+    </state>
+    <state width="1878" height="305" key="GridCell.Tab.0.bottom/0.0.1440.900/-336.-1080.1920.1080@-336.-1080.1920.1080" timestamp="1606560005051" />
+    <state width="1878" height="305" key="GridCell.Tab.0.center" timestamp="1606560005049">
+      <screen x="-336" y="-1080" width="1920" height="1080" />
+    </state>
+    <state width="1878" height="305" key="GridCell.Tab.0.center/0.0.1440.900/-336.-1080.1920.1080@-336.-1080.1920.1080" timestamp="1606560005049" />
+    <state width="1878" height="305" key="GridCell.Tab.0.left" timestamp="1606560005047">
+      <screen x="-336" y="-1080" width="1920" height="1080" />
+    </state>
+    <state width="1878" height="305" key="GridCell.Tab.0.left/0.0.1440.900/-336.-1080.1920.1080@-336.-1080.1920.1080" timestamp="1606560005047" />
+    <state width="1878" height="305" key="GridCell.Tab.0.right" timestamp="1606560005049">
+      <screen x="-336" y="-1080" width="1920" height="1080" />
+    </state>
+    <state width="1878" height="305" key="GridCell.Tab.0.right/0.0.1440.900/-336.-1080.1920.1080@-336.-1080.1920.1080" timestamp="1606560005049" />
+    <state x="133" y="-901" key="SettingsEditor" timestamp="1606566079957">
+      <screen x="-336" y="-1080" width="1920" height="1080" />
+    </state>
+    <state x="133" y="-901" key="SettingsEditor/0.0.1440.900/-336.-1080.1920.1080@-336.-1080.1920.1080" timestamp="1606566079957" />
+  </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/rich$pytest_for_tests_test_card_test_card_render.coverage" NAME="pytest for tests.test_card.test_card_render Coverage Results" MODIFIED="1606560000614" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b9650cee..1a9ceb0d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,13 +1,16 @@
 # Contributing to Rich
 
-This project welcomes contributions in the form of Pull Requests. For clear bug-fixes / typos etc. just submit a PR. For new features or if there is any doubt in how to fix a bug, you might want to open an issue prior to starting work, or email willmcgugan+rich@gmail.com to discuss it first.
+This project welcomes contributions in the form of Pull Requests. 
+For clear bug-fixes / typos etc. just submit a PR. 
+For new features or if there is any doubt in how to fix a bug, you might want 
+to open an issue prior to starting work, or email willmcgugan+rich@gmail.com 
+to discuss it first.
 
 ## Development Environment
 
-To start developing with Rich, first create a _virtual environment_ then run the following to install development requirements:
+To start developing with Rich, run the following to install requirements:
 
 ```
-pip install -r requirements-dev.txt
 poetry install
 ```
 
@@ -29,7 +32,8 @@ New code should ideally have tests and not break existing tests.
 
 ### Type Checking
 
-Rich uses type annotations throughout, and `mypy` to do the checking. Run the following to type check Rich:
+Rich uses type annotations throughout, and `mypy` to do the checking. 
+Run the following to type check Rich:
 
 ```
 make typecheck
diff --git a/requirements-dev.txt b/requirements-dev.txt
deleted file mode 100644
index 9f21ab68..00000000
--- a/requirements-dev.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-black==20.8b1
-mypy==0.790
-poetry==1.1.4
-pytest==6.1.2
-pytest-cov==2.10.1
diff --git a/rich/bar.py b/rich/bar.py
index 637b75cc..5764b85c 100644
--- a/rich/bar.py
+++ b/rich/bar.py
@@ -1,4 +1,4 @@
-from typing import Optional, Union
+from typing import Union
 
 from .color import Color
 from .console import Console, ConsoleOptions, RenderResult
diff --git a/rich/containers.py b/rich/containers.py
index 4ef865a2..d6c82491 100644
--- a/rich/containers.py
+++ b/rich/containers.py
@@ -8,8 +8,6 @@ from typing import (
     TYPE_CHECKING,
 )
 
-from .style import Style
-
 if TYPE_CHECKING:
     from .console import (
         Console,
diff --git a/rich/jupyter.py b/rich/jupyter.py
index 3218e527..970415a9 100644
--- a/rich/jupyter.py
+++ b/rich/jupyter.py
@@ -1,6 +1,5 @@
 from typing import Iterable, List, TYPE_CHECKING
 
-# from .console import Console as BaseConsole
 from .__init__ import get_console
 from .segment import Segment
 from .terminal_theme import DEFAULT_TERMINAL_THEME
diff --git a/rich/prompt.py b/rich/prompt.py
index 8976fa98..70004b4c 100644
--- a/rich/prompt.py
+++ b/rich/prompt.py
@@ -1,4 +1,4 @@
-from typing import IO, Any, Generic, List, Optional, TextIO, TypeVar, Union, overload
+from typing import Any, Generic, List, Optional, TextIO, TypeVar, Union, overload
 
 from .__init__ import get_console
 from .console import Console