Merge pull request #2060 from pllim/rm-pytest-ini

keflavich · web-flow · commit f7940f90a956 · 2021-05-05T15:54:57.000-04:00
MNT: Remove pytest.ini
diff --git a/astroquery/conftest.py b/astroquery/conftest.py
@@ -32,7 +32,7 @@ def pytest_configure(config):
 
 # ignoring pyvo can be removed once we require >0.9.3
 enable_deprecations_as_exceptions(include_astropy_deprecations=False,
-                                  warnings_to_ignore_entire_module=['pyregion', 'html5lib'],)
+                                  warnings_to_ignore_entire_module=['regions', 'pyregion', 'html5lib'],)
 
 # add '_testrun' to the version name so that the user-agent indicates that
 # it's being run in a test
diff --git a/astroquery/nasa_exoplanet_archive/core.py b/astroquery/nasa_exoplanet_archive/core.py
@@ -61,7 +61,7 @@
     "seconds": u.s,
     "solarradius": u.R_sun,
 }
-CONVERTERS = dict(koi_quarters=[ascii.convert_numpy(np.str)])
+CONVERTERS = dict(koi_quarters=[ascii.convert_numpy(str)])
 OBJECT_TABLES = {"exoplanets": "pl_", "compositepars": "fpl_", "exomultpars": "mpl_"}
 
 
diff --git a/pytest.ini b/pytest.ini
diff --git a/setup.cfg b/setup.cfg
@@ -13,7 +13,7 @@ upload-dir = docs/_build/html
 show-response = 1
 
 [tool:pytest]
-minversion = 3.0
+minversion = 6.0
 norecursedirs = build docs/_build docs/gallery-examples
 doctest_plus = enabled
 text_file_format = rst

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`"seconds": u.s,`
`62`	`62`	`"solarradius": u.R_sun,`
`63`	`63`	`}`
`64`		`-CONVERTERS = dict(koi_quarters=[ascii.convert_numpy(np.str)])`
	`64`	`+CONVERTERS = dict(koi_quarters=[ascii.convert_numpy(str)])`
`65`	`65`	`OBJECT_TABLES = {"exoplanets": "pl_", "compositepars": "fpl_", "exomultpars": "mpl_"}`
`66`	`66`
`67`	`67`