From 0623676233ce632d45231a79ad92aa945b013d95 Mon Sep 17 00:00:00 2001 From: Sam Foreman Date: Tue, 9 Aug 2022 16:50:12 -0500 Subject: [PATCH] Updates `pyproject.toml` --- pyproject.toml | 187 +++++++++++++++++++++++---------------- setup.py | 235 ------------------------------------------------- 2 files changed, 113 insertions(+), 309 deletions(-) delete mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml index f9f45489..5a4699f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,85 +1,124 @@ -[tool.poetry] +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[project] name = "l2hmc" -version = "0.8.0" -description = "L2HMC algorithm for sampling in Lattice QCD" -authors = ["Sam Foreman "] +description = 'Framework for training MCMC samplers for Lattice QCD' readme = "README.md" -repository = "https://github.com/saforem2/l2hmc-qcd" -homepage = "https://github.com/saforem2/l2hmc-qcd" -keywords = ["machine-learning", "lattice", "mcmc", "latticeqcd", "qcd"] -packages = [{include = "l2hmc", from = "src"}] -exclude = [ +requires-python = ">=3.8" +license = "MIT" +keywords = [] +authors = [ + { name = "Sam Foreman", email = "saforem2@gmail.com" }, +] +classifiers = [ + "Development Status :: 4 - Beta", + "Programming Language :: Python", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", +] +dependencies = [ + "bokeh", + "mpi4py", + "nodejs", + "h5py", + "seaborn", + "xarray", + "joblib", + "celerite", + "pynvim", + "neovim", + "pyright", + "ipython", + "rich", + "hydra-core", "wandb", - "outputs", - "old", - "src/l2hmc/outputs/", - "src/l2hmc/wandb/", - "**/old/**/*", - "**/wandb/**/*", - "**/outputs/**/*", - "**/.ipynb_checkpoints/**", - "**/__pycache__/**/*", - "**/.DS_Store/**/*" + "arviz", + "hydra-colorlog", + "matplotx", + "accelerate", + "tqdm", + "ptipython", + "tensorflow", + "torch", + "horovod[pytorch,tensorflow]" ] +dynamic = ["version"] -[tool.poetry.dependencies] -python = "^3.10,<3.11" -torch = "^1.11.0" -tensorflow = "^2.8.0" -bokeh = "^2.4.2" -mpi4py = "^3.1.3" -nodejs = "^0.1.1" -h5py = "^3.6.0" -numpy = "^1.22.3" -matplotlib = "^3.5.1" -seaborn = "^0.11.2" -xarray = "^2022.3.0" -joblib = "^1.1.0" -celerite = "^0.4.2" -horovod = "^0.24.2" -pynvim = {version = "^0.4.3", optional = true} -neovim = {version = "^0.3.1", optional = true} -pyright = {version = "^1.1.235", optional = true} -ipython = "^8.2.0" -rich = "^12.1.0" -hydra-core = "^1.1.1" -wandb = "^0.12.11" -arviz = "^0.12.0" -hydra-colorlog = "^1.1.0" -matplotx = "^0.3.6" -accelerate = "^0.6.2" - -[tool.poetry.dev-dependencies] -euporie = "^1.4.3" -ipykernel = "^6.12.1" -notebook = "^6.4.10" -ipython = {version = "^8.2.0", optional = true} -ptipython = {version = "^1.0.1", optional = true} +[project.urls] +Documentation = "https://github.com/saforem2/l2hmc-qcd" +Issues = "https://github.com/saforem2/l2hmc-qcd/issues" +Source = "https://github.com/saforem2/l2hmc-qcd" -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" +[tool.hatch.version] +path = "src/l2hmc/__about__.py" -[tool.pyright] -include = ["src"] +[tool.hatch.build] exclude = [ - "wandb", - "outputs", - "old", "src/l2hmc/outputs/", - "src/l2hmc/wandb/", - "**/old/**/*", - "**/wandb/**/*", - "**/outputs/**/*", - "**/__pycache__/**/*", - "**/.DS_Store/**/*" + "**old**", +] + +[tool.hatch.build.targets.sdist] + +[tool.hatch.build.targets.wheel] +packages = ["src/l2hmc"] + +[tool.hatch.envs.l2hmc] +python = "3.10" +dependencies = [ + "bokeh", + "mpi4py", + "nodejs", + "h5py", + "seaborn", + "xarray", + "joblib", + "celerite", + "pynvim", + "neovim", + "pyright", + "ipython", + "rich", + "hydra-core", + "wandb", + "arviz", + "hydra-colorlog", + "matplotx", + "accelerate", + "tqdm", + "ptipython", + "tensorflow", + "pytorch", + "horovod" +] + +[tool.hatch.envs.default] +dependencies = [ + "pytest", + "pytest-cov", ] -ignore = [ - "src/l2hmc/old", +[tool.hatch.envs.default.scripts] +cov = "pytest --cov-report=term-missing --cov-config=pyproject.toml --cov=src/l2hmc --cov=tests" +no-cov = "cov --no-cov" + +[[tool.hatch.envs.test.matrix]] +python = ["38", "39", "310"] + +[tool.coverage.run] +branch = true +parallel = true +omit = [ + "l2hmc/__about__.py", +] + +[tool.coverage.report] +exclude_lines = [ + "no cov", + "if __name__ == .__main__.:", + "if TYPE_CHECKING:", ] -venvPath = "./.venv" -reportMissingImports = true -reportMissingTypeStubs = false -useLibraryCodeForTypes = true -pythonVersion = "3.10" -pythonPlatform = "All" diff --git a/setup.py b/setup.py deleted file mode 100644 index 164cba5a..00000000 --- a/setup.py +++ /dev/null @@ -1,235 +0,0 @@ -#!/usr/bin/env python -# -*- encoding: utf-8 -*- -""" -A setuptools based setup module. - -See: -https://packaging.python.org/guides/distributing-packages-using-setuptools/ -https://github.com/pypa/sampleproject -""" - -# Always prefer setuptools over distutils -import setuptools -import pathlib -import io -import re -import os -from glob import glob - -from setuptools import find_packages -# from setuptools import setup - -here = pathlib.Path(__file__).parent.resolve() - -# Get the long description from the README file -long_description = (here / 'README.md').read_text(encoding='utf-8') - - -def read(*names, **kwargs): - with io.open( - os.path.join(os.path.dirname(__file__), *names), - encoding=kwargs.get('encoding', 'utf8') - ) as fh: - return fh.read() - - -# Arguments marked as "Required" below must be included for upload to PyPI. -# Fields marked as "Optional" may be commented out. - -# package_dir={'': 'l2hmc'}, -setuptools.setup( - # This is the name of your project. The first time you publish this - # package, this name will be registered for you. It will determine how - # users can install this project, e.g.: - # - # $ pip install sampleproject - # - # And where it will live on PyPI: https://pypi.org/project/sampleproject/ - # - # There are some restrictions on what makes a valid project name - # specification here: - # https://packaging.python.org/specifications/core-metadata/#name - name='l2hmc', # Required - - # Versions should comply with PEP 440: - # https://www.python.org/dev/peps/pep-0440/ - # - # For a discussion on single-sourcing the version across setup.py and the - # project code, see - # https://packaging.python.org/guides/single-sourcing-package-version/ - version='0.7.0', # Required - - # This is a one-line description or tagline of what your project does. This - # corresponds to the "Summary" metadata field: - # https://packaging.python.org/specifications/core-metadata/#summary - description='Application of the L2HMC algorithm to Lattice QCD', - - # This is an optional longer description of your project that represents - # the body of text which users will see when they visit PyPI. - # - # Often, this is the same as your README, so you can just read it in from - # that file directly (as we have already done above) - # - # This field corresponds to the "Description" metadata field: - # https://packaging.python.org/specifications/core-metadata/#description-optional - - # Denotes that our long_description is in Markdown; valid values are - # text/plain, text/x-rst, and text/markdown - # - # Optional if long_description is written in reStructuredText (rst) but - # required for plain-text or Markdown; if unspecified, "applications should - # attempt to render [the long_description] as text/x-rst; charset=UTF-8 and - # fall back to text/plain if it is not valid rst" (see link below) - # - long_description=long_description, # Optional - # This field corresponds to the "Description-Content-Type" metadata field: - # https://packaging.python.org/specifications/core-metadata/#description-content-type-optional - long_description_content_type='text/markdown', # Optional (see note above) - - # This should be a valid link to your project's main homepage. - # - # This field corresponds to the "Home-Page" metadata field: - # https://packaging.python.org/specifications/core-metadata/#home-page-optional - url='https://github.com/saforem2/l2hmc-qcd', # Optional - - # This should be your name or the name of the organization which owns the - # project. - author='Sam Foreman', # Optional - - # This should be a valid email address corresponding to the author listed - # above. - author_email='saforem2@gmail.com', # Optional - - # Classifiers help users find your project by categorizing it. - # - # For a list of valid classifiers, see https://pypi.org/classifiers/ - classifiers=[ # Optional - # How mature is this project? Common values are - # 3 - Alpha - # 4 - Beta - # 5 - Production/Stable - 'Development Status :: 4 - Beta', - - # Indicate who your project is intended for - 'Intended Audience :: Developers', - # 'Topic :: Software Development :: Build Tools', - - # Pick your license as you wish - 'License :: OSI Approved :: Apache-2.0', - - # Specify the Python versions you support here. In particular, ensure - # that you indicate you support Python 3. These classifiers are *not* - # checked by 'pip install'. See instead 'python_requires' below. - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.8', - "Programming Language :: Python :: 3.10", - # 'Programming Language :: Python :: 3 :: Only', - ], - - # This field adds keywords for your project which will appear on the - # project page. What does your project relate to? - # - # Note that this is a list of additional keywords, separated - # by commas, to be used to assist searching for the distribution in a - # larger catalog. - keywords='mcmc, lattice, lgt, ml', # Optional - - # When your source code is in a subdirectory under the project root, e.g. - # `src/`, it is necessary to specify the `package_dir` argument. - package_dir={'': 'src'}, # Optional - - # You can just specify package directories manually here if your project is - # simple. Or you can use find_packages(). - # - # Alternatively, if you just want to distribute a single Python file, use - # the `py_modules` argument instead as follows, which will expect a file - # called `my_module.py` to exist: - # - # py_modules=["my_module"], - # - packages=find_packages('src'), # Required - - py_modules=[ - os.path.splitext(os.path.basename(path))[0] - for path in glob('src/*.py') - ], - - include_package_data=True, - zip_safe=False, - - # Specify which Python versions you support. In contrast to the - # 'Programming Language' classifiers above, 'pip install' will check this - # and refuse to install the project if the version does not match. See - # https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires - python_requires='>=3.8, <4', - - # This field lists other packages that your project depends on to run. - # Any package you put here will be installed by pip when your project is - # installed, so they must be valid existing projects. - # - # For an analysis of "install_requires" vs pip's requirements files see: - # https://packaging.python.org/discussions/install-requires-vs-requirements/ - install_requires=[], # Optional - - # List additional groups of dependencies here (e.g. development - # dependencies). Users will be able to install these using the "extras" - # syntax, for example: - # - # $ pip install sampleproject[dev] - # - # Similar to `install_requires` above, these must be valid existing - # projects. - # extras_require={ # Optional - # 'dev': ['check-manifest'], - # 'test': ['coverage'], - # }, - - # If there are data files included in your packages that need to be - # installed, specify them here. - # package_data={ # Optional - # 'sample': ['package_data.dat'], - # }, - - # Although 'package_data' is the preferred approach, in some case you may - # need to place data files outside of your packages. See: - # http://docs.python.org/distutils/setupscript.html#installing-additional-files - # - # In this case, 'data_file' will be installed into '/my_data' - # data_files=[('my_data', ['data/data_file'])], # Optional - - # To provide executable scripts, use entry points in preference to the - # "scripts" keyword. Entry points provide cross-platform support and allow - # `pip` to create the appropriate form of executable for the target - # platform. - # - # For example, the following would provide a command called `sample` which - # executes the function `main` from this package when invoked: - entry_points={ # Optional - 'console_scripts': [ - 'train=train:main', - ], - }, - - # List additional URLs that are relevant to your project as a dict. - # - # This field corresponds to the "Project-URL" metadata fields: - # https://packaging.python.org/specifications/core-metadata/#project-url-multiple-use - # - # Examples listed include a pattern for specifying where the package tracks - # issues, where the source is hosted, where to say thanks to the package - # maintainers, and where to support the project financially. The key is - # what's used to render the link text on PyPI. - # project_urls={ # Optional - # 'Bug Reports': 'https://github.com/pypa/sampleproject/issues', - # 'Funding': 'https://donate.pypi.org', - # 'Say Thanks!': 'http://saythanks.io/to/example', - # 'Source': 'https://github.com/pypa/sampleproject/', - # },python-nameless - project_urls={ - 'Changelog': ( - 'https://github.com/saforem2/l2hmc-qcd/blob/master/CHANGELOG.rst' - ), - 'Issue Tracker': 'https://github.com/saforem2/l2hmc-qcd/issues', - }, -)