resolve merge conflicts

setup.cfg

@@ -98,7 +98,6 @@ dev =
     flake8-deprecated
     flake8-mutable
     flake8-tuple
-    pyopenssl
     pytest-cov
     pyyaml
     twine

tests/test_cli.py

@@ -2,7 +2,7 @@
 import argparse
 
 import pytest
-from niquests.exceptions import InvalidSchema
+from niquests.exceptions import InvalidSchema, MissingSchema
 
 import httpie.cli.argparser
 from httpie.cli import constants
@@ -363,13 +363,13 @@ class TestSchemes:
         # InvalidSchema is expected because HTTPie
         # shouldn't touch a formally valid scheme.
         with pytest.raises(InvalidSchema):
-            http('foo+bar-BAZ.123://bah')
+            http('foo+bar://bah')
 
     def test_invalid_scheme_via_via_default_scheme(self):
         # InvalidSchema is expected because HTTPie
         # shouldn't touch a formally valid scheme.
-        with pytest.raises(InvalidSchema):
-            http('bah', '--default=scheme=foo+bar-BAZ.123')
+        with pytest.raises((InvalidSchema, MissingSchema,)):
+            http('bah', '--default=scheme=foo+bar')
 
     def test_default_scheme_option(self, httpbin_secure):
         url = f'{httpbin_secure.host}:{httpbin_secure.port}'

tests/test_uploads.py

@@ -5,8 +5,6 @@ import subprocess
 import time
 import contextlib
 
-from flaky import flaky
-
 import httpie.__main__ as main
 
 import pytest
@@ -128,7 +126,6 @@ def stdin_processes(httpbin, *args, warn_threshold=0.1):
 @pytest.mark.parametrize("wait", (True, False))
 @pytest.mark.requires_external_processes
 @pytest.mark.skipif(is_windows, reason="Windows doesn't support select() calls into files")
-@flaky(max_runs=6)
 def test_reading_from_stdin(httpbin, wait):
     with stdin_processes(httpbin) as (process_1, process_2):
         process_1.communicate(timeout=0.1, input=b"bleh")
@@ -147,7 +144,6 @@ def test_reading_from_stdin(httpbin, wait):
 
 @pytest.mark.requires_external_processes
 @pytest.mark.skipif(is_windows, reason="Windows doesn't support select() calls into files")
-@flaky(max_runs=6)
 def test_stdin_read_warning(httpbin):
     with stdin_processes(httpbin) as (process_1, process_2):
         # Wait before sending any data
@@ -164,7 +160,6 @@ def test_stdin_read_warning(httpbin):
 
 @pytest.mark.requires_external_processes
 @pytest.mark.skipif(is_windows, reason="Windows doesn't support select() calls into files")
-@flaky(max_runs=6)
 def test_stdin_read_warning_with_quiet(httpbin):
     with stdin_processes(httpbin, "-qq") as (process_1, process_2):
         # Wait before sending any data
@@ -181,7 +176,6 @@ def test_stdin_read_warning_with_quiet(httpbin):
 
 @pytest.mark.requires_external_processes
 @pytest.mark.skipif(is_windows, reason="Windows doesn't support select() calls into files")
-@flaky(max_runs=6)
 def test_stdin_read_warning_blocking_exit(httpbin):
     # Use a very large number.
     with stdin_processes(httpbin, warn_threshold=999) as (process_1, process_2):