diff --git a/.SRCINFO b/.SRCINFO
index e8e7ed2aa68b..e9aa5c2de978 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,29 @@
 pkgbase = python-specutils
 	pkgdesc = Astropy Affiliated package for 1D spectral operations
-	pkgver = 1.6.0
+	pkgver = 1.7.0
 	pkgrel = 1
 	url = http://specutils.readthedocs.io
 	arch = any
 	license = BSD
+	checkdepends = python-pytest-remotedata
 	checkdepends = python-pytest-astropy-header
 	makedepends = python-setuptools-scm
+	makedepends = python-wheel
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-sphinx-astropy
 	makedepends = python-gwcs
 	makedepends = python-ndcube>=2.0
 	makedepends = python-mpl-animators
 	makedepends = graphviz
-	source = https://files.pythonhosted.org/packages/source/s/specutils/specutils-1.6.0.tar.gz
+	source = https://files.pythonhosted.org/packages/source/s/specutils/specutils-1.7.0.tar.gz
 	source = https://stsci.box.com/shared/static/28a88k1qfipo4yxc4p4d40v4axtlal8y.fits
+	source = https://data.sdss.org/sas/dr16/sdss/spectro/redux/26/spectra/1323/spec-1323-52797-0012.fits
 	source = use_local_doc_fits_offline.patch
-	md5sums = 73f44f3e67923dd8a7aa7abbf71f6b4a
+	md5sums = 63817ee43fa13d5339ef4198d95d54b0
 	md5sums = 6de4c8ee5659e87a302e3de595074ba5
-	md5sums = 81ee414974a5b6fc22f61e6fc7b36273
+	md5sums = 3586c5d0810108a182ba9146908dc180
+	md5sums = b527ca1f834de432631d530c937d6cd1
 
 pkgname = python-specutils
 	depends = python>=3.7
diff --git a/PKGBUILD b/PKGBUILD
index d7600cea40ca..16687dfdb8c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,23 @@
 pkgbase=python-specutils
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-pkgver=1.6.0
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="Astropy Affiliated package for 1D spectral operations"
 arch=('any')
 url="http://specutils.readthedocs.io"
 license=('BSD')
-makedepends=('python-setuptools-scm' 'python-sphinx-astropy' 'python-gwcs' 'python-ndcube>=2.0' 'python-mpl-animators' 'graphviz')
-checkdepends=('python-pytest-astropy-header')
+makedepends=('python-setuptools-scm' 'python-wheel' 'python-build' 'python-installer' 'python-sphinx-astropy' 'python-gwcs' 'python-ndcube>=2.0' 'python-mpl-animators' 'graphviz')
+checkdepends=('python-pytest-remotedata' 'python-pytest-astropy-header')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
         "https://stsci.box.com/shared/static/28a88k1qfipo4yxc4p4d40v4axtlal8y.fits"
+        "https://data.sdss.org/sas/dr16/sdss/spectro/redux/26/spectra/1323/spec-1323-52797-0012.fits"
         'use_local_doc_fits_offline.patch')
 #https://dr15.sdss.org/sas/dr15/manga/spectro/redux/v2_4_3/8485/stack/manga-8485-1901-LOGRSS.fits.gz
-md5sums=('73f44f3e67923dd8a7aa7abbf71f6b4a'
+md5sums=('63817ee43fa13d5339ef4198d95d54b0'
          '6de4c8ee5659e87a302e3de595074ba5'
-         '81ee414974a5b6fc22f61e6fc7b36273')
+         '3586c5d0810108a182ba9146908dc180'
+         'b527ca1f834de432631d530c937d6cd1')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
@@ -27,7 +29,7 @@ prepare() {
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build
+    python -m build --wheel --no-isolation
 
     msg "Building Docs"
     cd ${srcdir}/${_pyname}-${pkgver}/docs
@@ -38,7 +40,7 @@ check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
     # skip some tests that need lots of online data or cost lots of time
-    PYTHONPATH="build/lib" pytest "build/lib" \
+    pytest "build/lib" \
         --ignore=build/lib/specutils/io/asdf/tags/tests/test_spectra.py \
         --ignore=build/lib/specutils/io/default_loaders/tests/test_apogee.py \
         --deselect=build/lib/specutils/tests/test_loaders.py::test_ctypye_not_compliant[remote_data_path0] \
@@ -64,7 +66,8 @@ check() {
         --deselect=build/lib/specutils/tests/test_loaders.py::test_iraf_multispec_chebyshev \
         --deselect=build/lib/specutils/tests/test_loaders.py::test_iraf_multispec_legendre \
         --deselect=build/lib/specutils/tests/test_loaders.py::test_muscles_loader \
-        --deselect=build/lib/specutils/tests/test_loaders.py::test_subaru_pfs_loader || warning "Tests failed"
+        --deselect=build/lib/specutils/tests/test_loaders.py::test_subaru_pfs_loader \
+        --deselect=build/lib/specutils/tests/test_spectral_axis.py::test_create_spectral_axis || warning "Tests failed"
 }
 
 package_python-specutils() {
@@ -74,7 +77,7 @@ package_python-specutils() {
 
     install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" licenses/*
     install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+    python -m installer --destdir="${pkgdir}" dist/*.whl
 }
 
 package_python-specutils-doc() {
diff --git a/use_local_doc_fits_offline.patch b/use_local_doc_fits_offline.patch
index 5c8763e9eee5..337dc227d18c 100644
--- a/use_local_doc_fits_offline.patch
+++ b/use_local_doc_fits_offline.patch
@@ -1,5 +1,29 @@
+--- a/docs/index.rst	2022-02-18 05:36:06.000000000 +0800
++++ b/docs/index.rst	2022-05-03 22:13:14.761866848 +0800
+@@ -51,7 +51,8 @@
+ 
+     Now we load the dataset from its canonical source:
+ 
+-    >>> f = fits.open('https://data.sdss.org/sas/dr16/sdss/spectro/redux/26/spectra/1323/spec-1323-52797-0012.fits')  # doctest: +IGNORE_OUTPUT +REMOTE_DATA
++    >>> try: f = fits.open('https://data.sdss.org/sas/dr16/sdss/spectro/redux/26/spectra/1323/spec-1323-52797-0012.fits')  # doctest: +IGNORE_OUTPUT +REMOTE_DATA
++    >>> except Exception: f = fits.open('spec-1323-52797-0012.fits')  # Use local fits if no network when doc building
+     >>> # The spectrum is in the second HDU of this file.
+     >>> specdata = f[1].data # doctest: +REMOTE_DATA
+     >>> f.close() # doctest: +REMOTE_DATA
+--- a/docs/manipulation.rst	2022-01-28 00:59:43.000000000 +0800
++++ b/docs/manipulation.rst	2022-05-03 22:13:31.251116458 +0800
+@@ -150,7 +150,8 @@
+     >>> from astropy.visualization import quantity_support
+     >>> quantity_support()  # for getting units on the axes below  # doctest: +IGNORE_OUTPUT
+ 
+-    >>> f = fits.open('https://data.sdss.org/sas/dr16/sdss/spectro/redux/26/spectra/1323/spec-1323-52797-0012.fits')  # doctest: +IGNORE_OUTPUT +REMOTE_DATA
++    >>> try: f = fits.open('https://data.sdss.org/sas/dr16/sdss/spectro/redux/26/spectra/1323/spec-1323-52797-0012.fits')  # doctest: +IGNORE_OUTPUT +REMOTE_DATA
++    >>> except Exception: f = fits.open('spec-1323-52797-0012.fits')  # Use local fits if no network when doc building
+     >>> # The spectrum is in the second HDU of this file.
+     >>> specdata = f[1].data[1020:1250] # doctest: +REMOTE_DATA
+     >>> f.close() # doctest: +REMOTE_DATA
 --- a/docs/spectral_cube.rst	2022-01-28 00:59:43.000000000 +0800
-+++ b/docs/spectral_cube.rst	2022-01-31 01:57:10.941416370 +0800
++++ b/docs/spectral_cube.rst	2022-05-03 21:46:26.169193983 +0800
 @@ -173,7 +173,8 @@
      from specutils.manipulation import spectral_slab