Migrate to pyproject.toml

Author: dwapstra

Makefile

@@ -27,7 +27,7 @@ PYTHON        = python3
 TESTCMD       = $(PYTHON) -m unittest discover tests
 DISTDIR       = $(BUILDDIR)/dist
 
-DEPENDENCIES  = f5-icontrol-rest requests_mock requests dict2xml ciscoisesdk
+DEPENDENCIES = f5-icontrol-rest requests_mock requests dict2xml ciscoisesdk
 
 .PHONY: clean package distribute distribute_staging distribute_staging_external\
         develop undevelop populate_dist_dir help docs pubdocs tests
@@ -75,8 +75,7 @@ package:
 
     # NOTE : Only specify --universal if the package works for both py2 and py3
     # https://packaging.python.org/en/latest/distributing.html#universal-wheels
-	@$(PYTHON) setup.py bdist_wheel --dist-dir=$(DISTDIR)
-	@$(PYTHON) setup.py sdist --dist-dir=$(DISTDIR)
+	@$(PYTHON) -m build --wheel --outdir=$(DISTDIR)
 
 	@echo ""
 	@echo "Completed building: $@"
@@ -91,8 +90,8 @@ develop:
 	@echo ""
 
 	@pip uninstall -y rest.connector || true
-	@pip install $(DEPENDENCIES)
-	@$(PYTHON) setup.py develop --no-deps -q
+	@pip install $(DEPENDENCIES) build
+	@$(PYTHON) -m pip install -e . --no-deps
 
 	@echo ""
 	@echo "Completed building and installing: $@"
@@ -106,7 +105,7 @@ undevelop:
 	@echo "Uninstalling $(PKG_NAME) development distributable: $@"
 	@echo ""
 
-	@./setup.py develop --no-deps -q --uninstall
+	@$(PYTHON) -m pip uninstall -y $(PKG_NAME)
 
 	@echo ""
 	@echo "Completed uninstalling: $@"
@@ -121,7 +120,9 @@ clean:
 	@rm -rf $(BUILDDIR)
 	@echo ""
 	@echo "Removing build artifacts ..."
-	@./setup.py clean
+	@find . -type f -name "*.pyc" -delete
+	@find . -type d -name "__pycache__" -prune -exec rm -rf {} +
+	@find . -type d -name "build" -prune -exec rm -rf {} +
 	@echo ""
 	@echo "Done."
 	@echo ""

meson.build

@@ -0,0 +1,83 @@
+# Generated for direct meson-python packaging
+project(
+  'rest.connector',
+  meson_version: '>=1.10.0',
+)
+
+fs = import('fs')
+pymod = import('python')
+package_folder = 'src'
+py = pymod.find_installation(pure: true)
+package_root = meson.project_source_root() / package_folder
+package_root_prefix = package_root + '/'
+git_prog = find_program('git')
+
+# File extensions to include from tracked files under src/.
+# Expected values are bare extensions without a leading dot, for example: 'py', 'yaml', 'json'.
+include_extensions = ['py', 'yaml', 'txt']
+# Exact filenames to include when they do not rely on an extension match.
+# Expected values are basename matches, for example: 'ssh_host_key', 'runAll'.
+include_files = []
+# Substring markers for tracked paths that should still be ignored if they ever appear.
+# Expected values are path fragments, for example: '/generated/', '/vendor/', '.egg-info/'.
+ignored_path_markers = []
+
+all_tracked_files = run_command(
+  git_prog,
+  'ls-files',
+  package_folder,
+  check: true,
+).stdout().strip().split('\n')
+
+foreach relpath : all_tracked_files
+  if relpath == ''
+    continue
+  endif
+
+  skip_path = false
+  foreach marker : ignored_path_markers
+    if relpath.contains(marker)
+      skip_path = true
+      break
+    endif
+  endforeach
+  if skip_path
+    continue
+  endif
+
+  path_has_included_ext = false
+  foreach extension : include_extensions
+    if relpath.endswith('.' + extension)
+      path_has_included_ext = true
+      break
+    endif
+  endforeach
+
+  if not path_has_included_ext
+    filename = fs.name(relpath)
+    foreach include_name : include_files
+      if filename == include_name
+        path_has_included_ext = true
+        break
+      endif
+    endforeach
+  endif
+
+  if not path_has_included_ext
+    continue
+  endif
+
+  path = meson.project_source_root() / relpath
+  relative_path = path.replace(package_root_prefix, '')
+  install_target_dir = py.get_install_dir()
+  relative_parent = fs.parent(relative_path)
+
+  if relative_parent != '.'
+    install_target_dir = install_target_dir / relative_parent
+  endif
+
+  install_data(
+    path,
+    install_dir: install_target_dir,
+  )
+endforeach

pyproject.toml

@@ -0,0 +1,61 @@
+[build-system]
+requires = [
+    "meson-python",
+    "meson>=1.10.0",
+    "ninja",
+]
+build-backend = "mesonpy"
+
+[project]
+name = "rest.connector"
+version = "26.3"
+description = "pyATS REST connection package"
+readme = "DESCRIPTION.rst"
+requires-python = ">=3.9"
+authors = [
+    { name = "Cisco Systems Inc.", email = "pyats-support-ext@cisco.com" },
+]
+keywords = [
+    "pyats",
+    "rest",
+    "connector",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Telecommunications Industry",
+    "Operating System :: MacOS",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Topic :: Software Development :: Testing",
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+dependencies = [
+    "requests >= 1.15.1",
+    "dict2xml",
+    "f5-icontrol-rest",
+    "ciscoisesdk",
+]
+
+[project.optional-dependencies]
+dev = [
+    "coverage",
+    "restview",
+    "Sphinx",
+    "sphinx-rtd-theme",
+    "requests-mock",
+]
+
+[project.urls]
+Homepage = "https://developer.cisco.com/pyats"
+
+[tool.meson-python.wheel]
+include = [
+    "*.py",
+    "*.yaml",
+]