diff --git a/python-versioningit.changes b/python-versioningit.changes
index 51be277..499eb11 100644
--- a/python-versioningit.changes
+++ b/python-versioningit.changes
@@ -1,4 +1,22 @@
 -------------------------------------------------------------------
+Thu Mar 21 08:20:56 UTC 2024 - Markéta Machová <mmachova@suse.com>
+
+- Update to 3.1.0
+  * Improve some error messages
+
+-------------------------------------------------------------------
+Thu Mar 14 11:08:49 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 3.0.0:
+  * Migrated from setuptools to hatch
+  * Support using the `onbuild` step with Hatch
+  * **Breaking**: The `build_dir` argument passed to
+    `Versioningit.do_onbuild()`
+  * and `onbuild` method callables has been changed to an
+    `OnbuildFileProvider`
+  * ABC
+
+------------------------------------------------------------------
 Sun Feb 12 01:30:01 UTC 2023 - Tejas Guruswamy <tejas.guruswamy@opensuse.org>
 
 - Update to version 2.2.0
@@ -8,7 +26,7 @@ Sun Feb 12 01:30:01 UTC 2023 - Tejas Guruswamy <tejas.guruswamy@opensuse.org>
 -------------------------------------------------------------------
 Wed Nov  9 19:36:14 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com>
 
-- Update to version 2.1.0 
+- Update to version 2.1.0
   * Drop support for Python 3.6
   * Support Python 3.11
   * Use tomllib on Python 3.11
@@ -16,7 +34,7 @@ Wed Nov  9 19:36:14 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com>
 -------------------------------------------------------------------
 Tue Oct 11 16:52:39 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com>
 
-- Update to version 2.0.1 
+- Update to version 2.0.1
   * Don't run the onbuild step under setuptools' upcoming PEP 660 editable mode (contributed by @abravalheri)
 
 -------------------------------------------------------------------
diff --git a/python-versioningit.spec b/python-versioningit.spec
index 1f6549c..b2aab93 100644
--- a/python-versioningit.spec
+++ b/python-versioningit.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-versioningit
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,6 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-
 %if 0%{?suse_version} > 1500
 %bcond_without libalternatives
 %else
@@ -25,24 +23,24 @@
 %endif
 
 Name:           python-versioningit
-Version:        2.2.0
+Version:        3.1.0
 Release:        0
 Summary:        Versioning It with your Version In Git
 License:        MIT
 URL:            https://github.com/jwodder/versioningit
 Source:         https://files.pythonhosted.org/packages/source/v/versioningit/versioningit-%{version}.tar.gz
+BuildRequires:  %{python_module base >= 3.7}
+BuildRequires:  %{python_module hatchling}
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module setuptools}
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3 >= 3.7
 # SECTION test requirements
-BuildRequires:  %{python_module packaging}
 BuildRequires:  %{python_module build}
+BuildRequires:  %{python_module importlib-metadata if %python-base < 3.10}
+BuildRequires:  %{python_module packaging}
 BuildRequires:  %{python_module pydantic}
 BuildRequires:  %{python_module pytest-cov}
 BuildRequires:  %{python_module pytest-mock}
 BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module tomli >= 1.2}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  git
@@ -50,16 +48,17 @@ BuildRequires:  mercurial
 # /SECTION
 BuildRequires:  fdupes
 Requires:       python-packaging
-Requires:       python-setuptools
 Requires:       python-tomli >= 1.2
-Suggests:       python-importlib-metadata >= 3.6
+%if %{?python_version_nodots} < 310
+Requires:       python-importlib-metadata >= 3.6
+%endif
 Suggests:       python-dataclasses
 %if %{with libalternatives}
 Requires:       alts
 BuildRequires:  alts
 %else
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 %endif
 BuildArch:      noarch
 %python_subpackages
@@ -82,7 +81,7 @@ separate functions used for version extraction & calculation.
 %python_clone -a %{buildroot}%{_bindir}/versioningit
 
 %check
-%pytest test -k 'not test_editable_mode'
+%pytest test -k 'not test_editable_mode or not test_end2end'
 
 %pre
 %python_libalternatives_reset_alternative versioningit
@@ -97,6 +96,7 @@ separate functions used for version extraction & calculation.
 %doc CHANGELOG.md README.rst
 %license LICENSE
 %python_alternative %{_bindir}/versioningit
-%{python_sitelib}/*
+%{python_sitelib}/versioningit
+%{python_sitelib}/versioningit-%{version}*-info
 
 %changelog
diff --git a/versioningit-2.2.0.tar.gz b/versioningit-2.2.0.tar.gz
deleted file mode 100644
index 072b643..0000000
--- a/versioningit-2.2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb18e7ba7268a880bf1ccfe92e534e96ab34e0397f28dcbcb3fc0da4f6a5b6bd
-size 742936
diff --git a/versioningit-3.1.0.tar.gz b/versioningit-3.1.0.tar.gz
new file mode 100644
index 0000000..49022ff
--- /dev/null
+++ b/versioningit-3.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aac713c31a53eb367a6bbc2e8b3de8cc2b86d10d45c5101afd651446cb10fd7
+size 215117