diff --git a/.gitignore b/.gitignore index cd23647..1bb1a71 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ venv/ # Python packaging build/ dist/ -src/diepvries.egg-info/ +*.egg-info/ # Python tools .tox/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fa3bd00..e2d4510 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,14 +60,14 @@ source ../diepvries-venv/bin/activate Once your virtual environment is active, run: ```shell -python3 setup.py develop +python3 -m pip install -e . ``` to install this library as a development package. In this environment, you can now run any script using this framework. - The easiest way to run the test suite and the linters is to install **tox**: +The easiest way to run the test suite and the linters is to install **tox**: ```shell pip install -U tox diff --git a/doc/installation.rst b/doc/installation.rst index a574bdd..0d3f3b9 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -47,4 +47,4 @@ not for regular use. cd diepvries python3 -m venv venv source ./venv/bin/activate - python3 setup.py develop + python3 -m pip install -e . diff --git a/pyproject.toml b/pyproject.toml index d95da04..d149a19 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,33 @@ [build-system] -requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]~=6.0"] +requires = ["setuptools>=64", "wheel", "setuptools_scm[toml]>=8"] build-backend = "setuptools.build_meta" +[project] +name = "diepvries" +dynamic = ["version"] +description = "diepvries - Picnic Data Vault framework" +readme = {file = "README.md", content-type = "text/markdown"} +keywords = ["data vault"] +license = {file = "LICENSE"} +authors = [{name = "Picnic Technologies"}] +classifiers = [ + "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3", + "Intended Audience :: Developers", + "Operating System :: OS Independent", +] +dependencies = ["snowflake-connector-python[secure-local-storage]~=3.0"] +requires-python = ">= 3.8" + +[project.optional-dependencies] +test = ["pytest~=6.2"] +dev = ["pytest~=6.2", "tox", "pre-commit"] + +[project.urls] +Documentation = "https://diepvries.picnic.tech/" +"Source Code" = "https://github.com/PicnicSupermarket/diepvries" +"Issue Tracker" = "https://github.com/PicnicSupermarket/diepvries/issues" + [tool.setuptools_scm] tag_regex = "^diepvries/(?P[0-9\\.]+)$" # backslash needs to be escaped in TOML local_scheme = "no-local-version" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 58d4058..0000000 --- a/setup.cfg +++ /dev/null @@ -1,30 +0,0 @@ -[metadata] -name = diepvries -url = https://github.com/PicnicSupermarket/diepvries -project_urls = - Documentation = https://diepvries.picnic.tech/ - Source Code = https://github.com/PicnicSupermarket/diepvries - Issue Tracker = https://github.com/PicnicSupermarket/diepvries/issues -description = diepvries - Picnic Data Vault framework -long_description = file: README.md -long_description_content_type = text/markdown -keywords = data vault -license = MIT -author = Picnic Technologies -classifiers = - License :: OSI Approved :: MIT License - Programming Language :: Python :: 3 - Intended Audience :: Developers - Operating System :: OS Independent - -[options] -packages = find: -include_package_data = true -package_dir = = src -install_requires = - snowflake-connector-python[secure-local-storage]~=3.0 -test_requires = - pytest~=6.2 - -[options.packages.find] -where = src diff --git a/setup.py b/setup.py deleted file mode 100644 index c769cb1..0000000 --- a/setup.py +++ /dev/null @@ -1,9 +0,0 @@ -"""This is provided here for the sole purpose of editable installations. - -See https://twitter.com/pganssle/status/1241161328137515008 -""" - -import setuptools - -if __name__ == "__main__": - setuptools.setup()