diff --git a/fabric-2.7.1.tar.gz b/fabric-2.7.1.tar.gz
deleted file mode 100644
index c6d26e2..0000000
--- a/fabric-2.7.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76f8fef59cf2061dbd849bbce4fe49bdd820884385004b0ca59136ac3db129e4
-size 167922
diff --git a/fabric-3.0.1.tar.gz b/fabric-3.0.1.tar.gz
new file mode 100644
index 0000000..96445f5
--- /dev/null
+++ b/fabric-3.0.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65af8199f3e90c226db0aa03984989084099b9758315d9a4001f5e32c8599a84
+size 169085
diff --git a/python-Fabric.changes b/python-Fabric.changes
index db47015..b965b1d 100644
--- a/python-Fabric.changes
+++ b/python-Fabric.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Sun Jul  2 08:57:33 UTC 2023 - ecsos <ecsos@opensuse.org>
+
+- Update to 3.0.1
+  * [Bug] #2241: A typo prevented Fabric’s command runner from properly
+    calling its superclass stop() method, which in tandem with a related
+    Invoke bug meant messy or long shutdowns in many scenarios.
+- Changes from 3.0.0
+  * [Feature]: Change the default configuration value for inline_ssh_env
+    from False to True, to better align with the practicalities of common
+    SSH server configurations.
+    - Warning
+      This change is backwards incompatible if you were using 
+      environment-variable-setting kwargs or config settings,
+      such as Connection.run(command, env={'SOME': 'ENV VARS'}),
+      and were not already explicitly specifying the value of inline_ssh_env.
+  * [Bug] #1981: (fixed in #2195) Automatically close any open SFTP session
+    during fabric.connection.Connection.close; this avoids issues encountered
+    upon re-opening a previously-closed connection object.
+  * [Support]: Drop support for Python <3.6, including Python 2.
+    - Warning
+      This is a backwards incompatible change if you are not yet on
+      Python 3.6 or above; however, pip shouldn’t offer you this
+      version of Fabric as long as your pip version understands
+      python_requires metadata.
+- Drop remove-mock.patch because now in upstream.
+- Drop remove-pathlib2.patch because now in upstream.
+
 -------------------------------------------------------------------
 Sat Jul  1 09:04:21 UTC 2023 - ecsos <ecsos@opensuse.org>
 
diff --git a/python-Fabric.spec b/python-Fabric.spec
index 4f0940f..7dad269 100644
--- a/python-Fabric.spec
+++ b/python-Fabric.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-Fabric
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-Fabric
-Version:        2.7.1
+Version:        3.0.1
 Release:        0
 Summary:        A Pythonic tool for remote execution and deployment
 License:        BSD-2-Clause
@@ -26,13 +26,9 @@ URL:            https://fabfile.org
 Source:         https://files.pythonhosted.org/packages/source/f/fabric/fabric-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM gh#fabric/fabric#2209
 Patch0:         fix-executable.patch
-# PATCH-FIX-UPSTREAM gh#fabric/fabric#2210
-Patch1:         remove-mock.patch
-# PATCH-FIX-OPENSUSE remove pathlib2 requirement gh#fabric/fabric#2180
-Patch2:         remove-pathlib2.patch
 BuildRequires:  %{python_module cryptography >= 1.1}
 BuildRequires:  %{python_module decorator}
-BuildRequires:  %{python_module invoke >= 1.3}
+BuildRequires:  %{python_module invoke >= 2.0}
 BuildRequires:  %{python_module paramiko >= 2.4}
 BuildRequires:  %{python_module pytest-relaxed}
 BuildRequires:  %{python_module setuptools}
@@ -41,7 +37,7 @@ BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-cryptography >= 1.1
 Requires:       python-decorator
-Requires:       python-invoke >= 1.3
+Requires:       python-invoke >= 2.0
 Requires:       python-paramiko >= 2.4
 Requires:       python-setuptools
 Requires:       python-six
diff --git a/remove-mock.patch b/remove-mock.patch
deleted file mode 100644
index 0093c99..0000000
--- a/remove-mock.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-Index: fabric-2.7.0/fabric/testing/base.py
-===================================================================
---- fabric-2.7.0.orig/fabric/testing/base.py
-+++ fabric-2.7.0/fabric/testing/base.py
-@@ -20,7 +20,10 @@ from io import BytesIO
- import os
- 
- try:
--    from mock import Mock, PropertyMock, call, patch, ANY
-+    try:
-+        from unittest.mock import Mock, PropertyMock, call, patch, ANY
-+    except ImportError:
-+        from mock import Mock, PropertyMock, call, patch, ANY
- except ImportError:
-     import warnings
- 
-Index: fabric-2.7.0/fabric/testing/fixtures.py
-===================================================================
---- fabric-2.7.0.orig/fabric/testing/fixtures.py
-+++ fabric-2.7.0/fabric/testing/fixtures.py
-@@ -17,7 +17,10 @@ For example, if you intend to use the `r
- 
- try:
-     from pytest import fixture
--    from mock import patch, Mock
-+    try:
-+        from unittest.mock import patch, Mock
-+    except ImportError:
-+        from mock import patch, Mock
- except ImportError:
-     import warnings
- 
-Index: fabric-2.7.0/setup.py
-===================================================================
---- fabric-2.7.0.orig/setup.py
-+++ fabric-2.7.0/setup.py
-@@ -77,8 +77,9 @@ setuptools.setup(
-     },
-     install_requires=["invoke>=1.3,<2.0", "paramiko>=2.4", "pathlib2"],
-     extras_require={
--        "testing": testing_deps,
--        "pytest": testing_deps + pytest_deps,
-+        "testing:python_version<='3.3'": testing_deps,
-+        "pytest:python_version<='3.3'": testing_deps + pytest_deps,
-+        "pytest:python_version>='3.4'": pytest_deps,
-     },
-     packages=packages,
-     entry_points={
-Index: fabric-2.7.0/tests/config.py
-===================================================================
---- fabric-2.7.0.orig/tests/config.py
-+++ fabric-2.7.0/tests/config.py
-@@ -8,7 +8,10 @@ from lexicon import Lexicon
- from fabric import Config, Remote, RemoteShell
- from fabric.util import get_local_user
- 
--from mock import patch, call
-+try:
-+    from unittest.mock import patch, call
-+except ImportError:
-+    from mock import patch, call
- 
- from _util import support, faux_v1_env
- 
-Index: fabric-2.7.0/tests/conftest.py
-===================================================================
---- fabric-2.7.0.orig/tests/conftest.py
-+++ fabric-2.7.0/tests/conftest.py
-@@ -5,7 +5,10 @@ from os.path import isfile, expanduser
- 
- from pytest import fixture
- 
--from mock import patch
-+try:
-+    from unittest.mock import patch
-+except ImportError:
-+    from mock import patch
- 
- 
- # TODO: does this want to end up in the public fixtures module too?
-Index: fabric-2.7.0/tests/connection.py
-===================================================================
---- fabric-2.7.0.orig/tests/connection.py
-+++ fabric-2.7.0/tests/connection.py
-@@ -10,7 +10,10 @@ from os.path import join
- import socket
- import time
- 
--from mock import patch, Mock, call, ANY
-+try:
-+    from unittest.mock import patch, Mock, call, ANY
-+except ImportError:
-+    from mock import patch, Mock, call, ANY
- from paramiko.client import SSHClient, AutoAddPolicy
- from paramiko import SSHConfig
- import pytest  # for mark, internal raises
-Index: fabric-2.7.0/tests/executor.py
-===================================================================
---- fabric-2.7.0.orig/tests/executor.py
-+++ fabric-2.7.0/tests/executor.py
-@@ -4,7 +4,10 @@ from fabric import Executor, Task, Conne
- from fabric.executor import ConnectionCall
- from fabric.exceptions import NothingToDo
- 
--from mock import Mock
-+try:
-+    from unittest.mock import Mock
-+except ImportError:
-+    from mock import Mock
- from pytest import skip, raises  # noqa
- 
- 
-Index: fabric-2.7.0/tests/group.py
-===================================================================
---- fabric-2.7.0.orig/tests/group.py
-+++ fabric-2.7.0/tests/group.py
-@@ -1,4 +1,7 @@
--from mock import Mock, patch, call
-+try:
-+    from unittest.mock import Mock, patch, call
-+except ImportError:
-+    from mock import Mock, patch, call
- from pytest import mark, raises
- 
- from fabric import Connection, Group, SerialGroup, ThreadingGroup, GroupResult
-Index: fabric-2.7.0/tests/main.py
-===================================================================
---- fabric-2.7.0.orig/tests/main.py
-+++ fabric-2.7.0/tests/main.py
-@@ -8,7 +8,10 @@ import re
- 
- from invoke import run
- from invoke.util import cd
--from mock import patch
-+try:
-+    from unittest.mock import patch
-+except ImportError:
-+    from mock import patch
- import pytest  # because WHY would you expose @skip normally? -_-
- from pytest_relaxed import raises
- 
-Index: fabric-2.7.0/tests/runners.py
-===================================================================
---- fabric-2.7.0.orig/tests/runners.py
-+++ fabric-2.7.0/tests/runners.py
-@@ -3,7 +3,10 @@ try:
- except ImportError:
-     from six import StringIO
- 
--from mock import Mock, patch
-+try:
-+    from unittest.mock import Mock, patch
-+except ImportError:
-+    from mock import Mock, patch
- from pytest import skip  # noqa
- 
- from invoke import pty_size, Result
-Index: fabric-2.7.0/tests/task.py
-===================================================================
---- fabric-2.7.0.orig/tests/task.py
-+++ fabric-2.7.0/tests/task.py
-@@ -1,6 +1,9 @@
- # NOTE: named task.py, not tasks.py, to avoid some occasional pytest weirdness
- 
--from mock import Mock
-+try:
-+    from unittest.mock import Mock
-+except ImportError:
-+    from mock import Mock
- from pytest import skip  # noqa
- 
- import fabric
-Index: fabric-2.7.0/tests/transfer.py
-===================================================================
---- fabric-2.7.0.orig/tests/transfer.py
-+++ fabric-2.7.0/tests/transfer.py
-@@ -3,7 +3,10 @@ try:
- except ImportError:
-     from six import StringIO
- 
--from mock import Mock, call, patch
-+try:
-+    from unittest.mock import Mock, call, patch
-+except ImportError:
-+    from mock import Mock, call, patch
- from pytest_relaxed import raises
- from pytest import skip  # noqa
- from paramiko import SFTPAttributes
-Index: fabric-2.7.0/tests/util.py
-===================================================================
---- fabric-2.7.0.orig/tests/util.py
-+++ fabric-2.7.0/tests/util.py
-@@ -2,7 +2,10 @@
- Tests testing the fabric.util module, not utils for the tests!
- """
- 
--from mock import patch
-+try:
-+    from unittest.mock import patch
-+except ImportError:
-+    from mock import patch
- 
- from fabric.util import get_local_user
- 
diff --git a/remove-pathlib2.patch b/remove-pathlib2.patch
deleted file mode 100644
index b3bdb01..0000000
--- a/remove-pathlib2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fabric-2.7.1/setup.py
-===================================================================
---- fabric-2.7.1.orig/setup.py
-+++ fabric-2.7.1/setup.py
-@@ -65,7 +65,7 @@ setuptools.setup(
-         "CI": "https://app.circleci.com/pipelines/github/fabric/fabric",
-         "Twitter": "https://twitter.com/pyfabric",
-     },
--    install_requires=["invoke>=1.3,<2.0", "paramiko>=2.4", "pathlib2"],
-+    install_requires=["invoke>=1.3,<2.0", "paramiko>=2.4"],
-     extras_require={
-         "testing:python_version<='3.3'": testing_deps,
-         "pytest:python_version<='3.3'": testing_deps + pytest_deps,