Merge branch 'master' into pr137

Author: tartley

.github/FUNDING.yml

@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+# issuehunt: # Replace with a single IssueHunt username
+# ko_fi: # Replace with a single Ko-fi username
+# liberapay: # Replace with a single Liberapay username
+# open_collective: # Replace with a single Open Collective username
+# otechie: # Replace with a single Otechie username
+# patreon: # Replace with a single Patreon username
+custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2MZ9D2GMLYCUJ&item_name=Colorama&currency_code=USD"]
+tidelift: "pypi/colorama"
+

.github/workflows/lint_python.yml

@@ -0,0 +1,24 @@
+name: lint_python
+on: [pull_request, push]
+jobs:
+  lint_python:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - run: pip install --upgrade pip wheel
+      - run: pip install bandit black codespell flake8 flake8-bugbear
+                         flake8-comprehensions isort mypy pytest pyupgrade safety
+      - run: bandit --recursive --skip B311 .
+      - run: black --check . || true
+      - run: codespell  # --ignore-words-list="" --skip="*.css,*.js,*.lock"
+      - run: flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+      - run: flake8 . --count --exit-zero --max-complexity=10 --max-line-length=88
+                      --show-source --statistics
+      - run: isort --check-only --profile black . || true
+      - run: pip install -r requirements.txt
+      - run: mkdir --parents --verbose .mypy_cache
+      - run: mypy --ignore-missing-imports --install-types --non-interactive . || true
+      - run: pytest .
+      - run: shopt -s globstar && pyupgrade --py36-plus **/*.py || true
+      - run: safety check

.github/workflows/test.yml

@@ -0,0 +1,57 @@
+name: Test
+
+on: [push, pull_request, workflow_dispatch]
+
+env:
+  FORCE_COLOR: 1
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["pypy-2.7", "pypy-3.8", "2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        include:
+          # Add new helper variables to existing jobs
+          - {python-version: "pypy-2.7", toxenv: "pypy"}
+          - {python-version: "pypy-3.8", toxenv: "pypy3"}
+          - {python-version: "2.7", toxenv: "py27"}
+          - {python-version: "3.7", toxenv: "py37"}
+          - {python-version: "3.8", toxenv: "py38"}
+          - {python-version: "3.9", toxenv: "py39"}
+          - {python-version: "3.10", toxenv: "py310"}
+          - {python-version: "3.11", toxenv: "py311"}
+          - {python-version: "3.12", toxenv: "py312"}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
+
+      - name: Get pip cache dir
+        id: pip-cache
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key:
+            ${{ matrix.os }}-${{ matrix.python-version }}-v1-${{ hashFiles('**/tox.ini') }}
+          restore-keys: |
+            ${{ matrix.os }}-${{ matrix.python-version }}-v1-
+
+      - name: Install dependencies
+        run: |
+          python -m pip install tox
+
+      - name: Tox tests
+        run: |
+          tox -e ${{ matrix.toxenv }}

.gitignore

@@ -1,10 +1,13 @@
 *.pyc
 *.egg-info
-MANIFEST
-dist
-tags
+.coverage
+.tox/
+/MANIFEST
+/build/
+/dist/
+/sandbox/
+/tags
 virtualenv
-build
 
 # PyCharm
-.idea
+.idea

.travis.yml

@@ -1,3 +1,66 @@
+0.4.6 Current release
+  * https://github.com/tartley/colorama/pull/139 Add alternative to 'init()',
+    called 'just_fix_windows_console'. This fixes many longstanding problems
+    with 'init', such as working incorrectly on modern Windows terminals, and
+    wonkiness when init gets called multiple times. The intention is that it
+    just makes all Windows terminals treat ANSI the same way as other terminals
+    do. Many thanks the njsmith for fixing our messes. 
+  * https://github.com/tartley/colorama/pull/352 Support Windows 10's ANSI/VT
+    console. This didn't exist when Colorama was created, and avoiding us
+    causing havok there is long overdue. Thanks to segeviner for the initial
+    approach, and to njsmith for getting it merged.
+  * https://github.com/tartley/colorama/pull/338 Internal overhaul of package
+    metadata declaration, which abolishes our use of the now heavily
+    discouraged setuptools (and hence setup.py, setup.cfg and MANIFEST.in), in
+    favor of hatchling (and hence pyproject.toml), generously contributed by
+    ofek (author of hatchling). This includes dropping support Python3.5 and
+    3.6, which are EOL, and were already dropped from setuptools, so this
+    should not affect our users.
+  * https://github.com/tartley/colorama/pull/353 Attention to detail award to
+    LqdBcnAtWork for a spelling fix in demo06
+0.4.5
+  * Catch a racy ValueError that could occur on exit.
+  * Create README-hacking.md, for Colorama contributors.
+  * Tweak some README unicode characters that don't render correctly on PyPI.
+  * Fix some tests that were failing on some operating systems.
+  * Add support for Python 3.9.
+  * Add support for PyPy3.
+  * Add support for pickling with the ``dill`` module.
+0.4.4
+  * Re-org of README, to put the most insteresting parts near the top.
+  * Added Linux makefile targets and Windows powershell scripts to automate
+    bootstrapping a development environment, and automate the process of
+    testing wheels before they are uploaded to PyPI.
+  * Use stdlib unittest.mock where available
+  * Travis CI now also builds on arm64
+  * Demo06 demonstrates existing cursor positioning feature
+  * Fix OSC regex & handling to prevent hang or crash
+  * Document enterprise support by Tidelift
+0.4.3
+  * Fix release 0.4.2 which was uploaded with missing files.
+0.4.2 BROKEN DO NOT USE
+  * #228: Drop support for EOL Python 3.4, and add 3.7 and 3.8. Thanks to
+    hugovk.
+  * Several additions and fixes to documentation and metadata.
+  * Added Tidelift subscription information.
+0.4.1
+  * Fix issue #196: prevent exponential number of calls when calling 'init'
+    multiple times. Reported by bbayles and fixed by Delgan.
+0.4.0
+  * Fix issue #142: reset LIGHT_EX colors with RESET_ALL. Reported by Delgan
+  * Fix issue #147: ignore invalid "erase" ANSI codes. Reported by shin-
+  * Fix issues #163 and #164: fix stream wrapping under PyCharm. Contributed by
+    veleek and Delgan.
+  * Thanks to jdufresne for various code cleanup and updates to documentation
+    and project metadata. (pull requests #171, #172, #173, #174, #176, #177,
+    #189, #190, #192)
+  * #186: added contextlib magic methods to ansitowin32.StreamWrapper.
+    Contributed by hoefling.
+  * Fix issue #131: don't cache stdio handles, since they might be
+    closed/changed by fd redirection. This fixes an issue with pytest.
+    Contributed by segevfiner.
+  * #146, #157: Drop support for EOL Python 2.5, 2.6, 3.1, 3.2 and 3.3, and add
+    3.6. Thanks to hugovk.
 0.3.9
   * Revert fix for issue #103 which causes problems for dependent applications
 0.3.8
@@ -16,11 +79,11 @@
   * Fix issue #47 and #80 - stream redirection now strips ANSI codes on Linux
   * Fix issue #53 - strip readline markers
   * Fix issue #32 - assign orig_stdout and orig_stderr when initialising
-  * Fix issue #57 - Fore.RESET did not reset style of LIGHT_EX colors.
-    Fixed by Andy Neff
+  * Fix issue #57 - Fore.RESET did not reset style of LIGHT_EX colors. Fixed by
+    Andy Neff
   * Fix issue #51 - add context manager syntax. Thanks to Matt Olsen.
-  * Fix issue #48 - colorama didn't work on Windows when environment
-    variable 'TERM' was set.
+  * Fix issue #48 - colorama didn't work on Windows when environment variable
+    'TERM' was set.
   * Fix issue #54 - fix pylint errors in client code.
   * Changes to readme and other improvements by Marc Abramowitz and Zearin
 0.3.3
@@ -42,17 +105,17 @@
   * Thanks to Charles Merriam for adding documentation to demos
 0.3.2
   * Thanks to Marc Schlaich (schlamar) for a setup.py fix for Python2.5
-  * Thanks to Jurko for fix on 64-bit Windows CPython2.5 w/o ctypes
-    (Google Code issue #56)
+  * Thanks to Jurko for fix on 64-bit Windows CPython2.5 w/o ctypes (Google
+    Code issue #56)
   * Thanks to Remi Rampin for:
     * better github integration, incl rendered README and Travis config.
     * fixed forward slashes in README
   * Thanks to Florian Bruhin for fix when stdout or stderr are None
   * Thanks to Simeon Visser for:
     * closing a file handle using 'with'
     * updating classifiers to include Python 3.3 and 3.4
-  * Thanks to Thomas Weininger for fix ValueError on Windows
-    (Google Code issue #50)
+  * Thanks to Thomas Weininger for fix ValueError on Windows (Google Code issue
+    #50)
 0.3.1
   * Fixed crash on exit with closed stdout, with thanks to Marc Abramowitz.
   * Now uses setuptools if available, and falls back to distutils if not.
@@ -64,15 +127,14 @@
   * Fix always-crash on non-Windows platforms, reported by Matt McCormick.
   * Fix Google Code issue #47, incompatible with pyreadline.
 0.2.7
-  * Fix problem under 64-bit windows due to ctypes HANDLE size.
-    Submitted by the rather magnificent Ben Hoyt.
-    This fixes Google Code issue #43
+  * Fix problem under 64-bit windows due to ctypes HANDLE size. Submitted by
+    the rather magnificent Ben Hoyt. This fixes Google Code issue #43
 0.2.6
   * Add copyright & licensing info to every file, as requested by a large
     downstream project which has problems making sure that all 3rd party
     contributions have appropriate license.
 0.2.5
-  * Severeral documentation & demo fixes.
+  * Several documentation & demo fixes.
 0.2.4
   * Fix to work on Windows 7.
   * Python 3 compatibility in docs and demos.
@@ -81,9 +143,9 @@
   * Split changelog out into separate file.
 0.2.2
   * Fix bug which caused init() to raise, introduced in 0.2.1.
-  * Remove asserts which cause problems in various circumstances. At least
-    some users saw asserts fail on 'success' returned from win32 functions,
-    even though the win32 functions appear to have worked correctly.
+  * Remove asserts which cause problems in various circumstances. At least some
+    users saw asserts fail on 'success' returned from win32 functions, even
+    though the win32 functions appear to have worked correctly.
 0.2.1
   * Completely broken: I added a bug which caused init() to raise.
   * Added some documentation for cursor positioning and clear screen to README.
@@ -107,9 +169,9 @@
     file from building on a different platform.
   * Fix python3 incompatibility kindly reported by G |uumlaut| nter Kolousek
 0.1.14
-  * Fix hard-coded reset to white-on-black colors. Fore.RESET, Back.RESET
-    and Style.RESET_ALL now revert to the colors as they were when init()
-    was called. Some lessons hopefully learned about testing prior to release.
+  * Fix hard-coded reset to white-on-black colors. Fore.RESET, Back.RESET and
+    Style.RESET_ALL now revert to the colors as they were when init() was
+    called. Some lessons hopefully learned about testing prior to release.
 0.1.13
   * Completely broken: barfed when installed using pip.
 0.1.12
@@ -125,11 +187,11 @@
   * Remove setup.py dependency on setuptools, now uses stdlib distutils.
 0.1.8
   * Fix ghastly errors all over the place on Ubuntu.
-  * Add init kwargs 'convert' and 'strip', which supercede the old 'wrap'.
+  * Add init kwargs 'convert' and 'strip', which supersede the old 'wrap'.
 0.1.7
   * Python 3 compatible.
-  * Fix: Now strips ansi on windows without necessarily converting it to
-    win32 calls (eg. if output is not a tty.)
+  * Fix: Now strips ansi on windows without necessarily converting it to win32
+    calls (eg. if output is not a tty.)
   * Fix: Flaky interaction of interleaved ansi sent to stdout and stderr.
   * Improved demo.sh (hg checkout only.)
 0.1.6
@@ -156,4 +218,3 @@
 
 .. |uumlaut| unicode:: U+00FC .. u with umlaut
    :trim:
-

CHANGELOG.rst

@@ -0,0 +1,51 @@
+# Colorama for enterprise.
+
+*Available as part of the Tidelift Subscription.*
+
+Tidelift is working with the maintainers of Colorama and thousands of other
+open source projects to deliver commercial support and maintenance for the open
+source dependencies you use to build your applications. Save time, reduce risk,
+and improve code health, while paying the maintainers of the exact dependencies
+you use.
+
+[\[Learn More\]](https://tidelift.com/subscription/pkg/pypi-colorama?utm_source=pypi-colorama&utm_medium=referral&utm_campaign=enterprise) [\[Request a demo\]](https://tidelift.com/subscription/request-a-demo?utm_source=pypi-colorama&utm_medium=referral&utm_campaign=enterprise)
+
+### Enterprise-ready open source software—managed for you
+
+The Tidelift Subscription is a managed open source subscription for application dependencies covering millions of open source projects across JavaScript, Python, Java, PHP, Ruby, .NET, and more.
+
+Your subscription includes:
+
+**Security updates:**
+Tidelift’s security response team coordinates patches for new breaking security
+vulnerabilities and alerts immediately through a private channel, so your
+software supply chain is always secure. 
+
+**Licensing verification and indemnification:**
+Tidelift verifies license information to enable easy policy enforcement and
+adds intellectual property indemnification to cover creators and users in case
+something goes wrong. You always have a 100% up-to-date bill of materials for
+your dependencies to share with your legal team, customers, or partners.
+
+**Maintenance and code improvement:**
+Tidelift ensures the software you rely on keeps working as long as you need it
+to work. Your managed dependencies are actively maintained and we recruit
+additional maintainers where required.
+
+**Package selection and version guidance:**
+We help you choose the best open source packages from the start—and then guide
+you through updates to stay on the best releases as new issues arise.
+
+**Roadmap input:**
+Take a seat at the table with the creators behind the software you use.
+Tidelift’s participating maintainers earn more income as their software is used
+by more subscribers, so they’re interested in knowing what you need.
+
+**Tooling and cloud integration:**
+Tidelift works with GitHub, GitLab, BitBucket, and more. We support every cloud
+platform (and other deployment targets, too).
+
+The end result? All of the capabilities you expect from commercial-grade software, for the full breadth of open source you use. That means less time grappling with esoteric open source trivia, and more time building your own applications—and your business.
+
+[\[Learn More\]](https://tidelift.com/subscription/pkg/pypi-colorama?utm_source=pypi-colorama&utm_medium=referral&utm_campaign=enterprise) [\[Request a demo\]](https://tidelift.com/subscription/request-a-demo?utm_source=pypi-colorama&utm_medium=referral&utm_campaign=enterprise)
+

ENTERPRISE.md

@@ -25,4 +25,3 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-