From 6fccebd7a42b6ccfa419d0ea88a37353b1d807ed Mon Sep 17 00:00:00 2001 From: Anno Knierim Date: Wed, 31 Jul 2024 10:10:04 +0200 Subject: [PATCH 1/5] Fix package name and url in pyproject.toml --- pyproject.toml | 124 ++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 63 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8b0211f..caf48a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,88 +7,86 @@ name = "pyvisgen" version = "0.2.0" description = "Simulate radio interferometer observations and visibility generation with the RIME formalism." readme = "README.md" -authors = [ - {name = "Kevin Schmidt, Felix Geyer, Stefan Fröse"}, -] +authors = [{ name = "Kevin Schmidt, Felix Geyer, Stefan Fröse" }] maintainers = [ - {name = "Kevin Schmidt", email = "kevin3.schmidt@tu-dortmund.de"}, - {name = "Felix Geyer", email = "felix.geyer@tu-dortmund.de"}, + { name = "Kevin Schmidt", email = "kevin3.schmidt@tu-dortmund.de" }, + { name = "Felix Geyer", email = "felix.geyer@tu-dortmund.de" }, ] -license = {text = "MIT"} +license = { text = "MIT" } classifiers = [ - "Intended Audience :: Science/Research", - "License :: OSI Approved :: MIT License", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Topic :: Scientific/Engineering :: Astronomy", - "Topic :: Scientific/Engineering :: Physics", - "Topic :: Scientific/Engineering :: Information Analysis", - "Development Status :: 4 - Beta", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Topic :: Scientific/Engineering :: Astronomy", + "Topic :: Scientific/Engineering :: Physics", + "Topic :: Scientific/Engineering :: Information Analysis", + "Development Status :: 4 - Beta", ] requires-python = ">=3.10" dependencies = [ - "numpy", - "astropy<=6.1.0", - "torch", - "matplotlib", - "ipython", - "scipy", - "pandas", - "toml", - "pytest", - "pytest-cov", - "jupyter", - "astroplan", - "torch", - "tqdm", - "numexpr", - "click", - "h5py", - "natsort", - "pre-commit", + "numpy", + "astropy<=6.1.0", + "torch", + "matplotlib", + "ipython", + "scipy", + "pandas", + "toml", + "pytest", + "pytest-cov", + "jupyter", + "astroplan", + "torch", + "tqdm", + "numexpr", + "click", + "h5py", + "natsort", + "pre-commit", ] [project.scripts] - pyvisgen_create_dataset = "pyvisgen.simulation.scripts.create_dataset:main" +pyvisgen_create_dataset = "pyvisgen.simulation.scripts.create_dataset:main" [tool.setuptools.packages.find] - where = ["pyvisgen"] +where = ["pyvisgen"] [tool.towncrier] - package = "ctapipe" - directory = "docs/changes" - filename = "CHANGES.rst" - template = "docs/changes/template.rst" - # let towncrier create proper links to the merged PR - issue_format = "`#{issue} `__" +package = "pyvisgen" +directory = "docs/changes" +filename = "CHANGES.rst" +template = "docs/changes/template.rst" +# let towncrier create proper links to the merged PR +issue_format = "`#{issue} `__" - [tool.towncrier.fragment.feature] - name = "New Features" - showcontent = true +[tool.towncrier.fragment.feature] +name = "New Features" +showcontent = true - [tool.towncrier.fragment.bugfix] - name = "Bug Fixes" - showcontent = true +[tool.towncrier.fragment.bugfix] +name = "Bug Fixes" +showcontent = true - [tool.towncrier.fragment.api] - name = "API Changes" - showcontent = true +[tool.towncrier.fragment.api] +name = "API Changes" +showcontent = true - [tool.towncrier.fragment.datamodel] - name = "Data Model Changes" - showcontent = true +[tool.towncrier.fragment.datamodel] +name = "Data Model Changes" +showcontent = true - [tool.towncrier.fragment.optimization] - name = "Refactoring and Optimization" - showcontent = true +[tool.towncrier.fragment.optimization] +name = "Refactoring and Optimization" +showcontent = true - [tool.towncrier.fragment.maintenance] - name = "Maintenance" - showcontent = true +[tool.towncrier.fragment.maintenance] +name = "Maintenance" +showcontent = true - [[tool.towncrier.section]] - name = "" - path = "" +[[tool.towncrier.section]] +name = "" +path = "" From dab88d2fe4f2a4899f3f0077c39965456bc68d11 Mon Sep 17 00:00:00 2001 From: Anno Knierim Date: Wed, 31 Jul 2024 10:12:29 +0200 Subject: [PATCH 2/5] Add changelog --- docs/changes/36.maintenance.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/changes/36.maintenance.rst diff --git a/docs/changes/36.maintenance.rst b/docs/changes/36.maintenance.rst new file mode 100644 index 0000000..15d82c2 --- /dev/null +++ b/docs/changes/36.maintenance.rst @@ -0,0 +1 @@ +- fix package name and url in pyproject.toml From 5c9e15a0cb657941cf5c33508151105a254d49f7 Mon Sep 17 00:00:00 2001 From: Anno Knierim Date: Wed, 31 Jul 2024 10:42:43 +0200 Subject: [PATCH 3/5] Remove obsolete setup.py --- setup.py | 56 -------------------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 setup.py diff --git a/setup.py b/setup.py deleted file mode 100644 index 4337638..0000000 --- a/setup.py +++ /dev/null @@ -1,56 +0,0 @@ -from setuptools import find_packages, setup - -setup( - name="pyvisgen", - version="0.2.0", - description="Simulate radio interferometer observations \ - and visibility generation with the RIME formalism.", - url="https://github.com/radionets-project/pyvisgen", - author="Kevin Schmidt, Felix Geyer, Stefan Fröse", - author_email="kevin3.schmidt@tu-dortmund.de", - license="MIT", - include_package_data=True, - packages=find_packages(), - install_requires=[ - "numpy", - "matplotlib", - "ipython", - "scipy", - "pandas", - "toml", - "pytest", - "pytest-cov", - "jupyter", - "astroplan", - "torch", - "tqdm", - "numexpr", - "click", - "h5py", - "natsort", - "pre-commit", - ], - setup_requires=["pytest-runner"], - tests_require=["pytest"], - zip_safe=False, - entry_points={ - "console_scripts": [ - "pyvisgen_create_dataset = pyvisgen.simulation.scripts.create_dataset:main", - ], - }, - classifiers=[ - "Development Status :: 4 - Beta", - "Intended Audience :: Science/Research", - "License :: OSI Approved :: MIT License", - "Natural Language :: English", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3 :: Only", - "Topic :: Scientific/Engineering :: Astronomy", - "Topic :: Scientific/Engineering :: Physics", - "Topic :: Scientific/Engineering :: Information Analysis", - ], -) From 361666ca5afaa74d318a8291c0099f22b5d849e4 Mon Sep 17 00:00:00 2001 From: Anno Knierim Date: Wed, 31 Jul 2024 10:44:55 +0200 Subject: [PATCH 4/5] Fix setuptools package find path --- docs/changes/36.maintenance.rst | 1 + pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changes/36.maintenance.rst b/docs/changes/36.maintenance.rst index 15d82c2..4c847ac 100644 --- a/docs/changes/36.maintenance.rst +++ b/docs/changes/36.maintenance.rst @@ -1 +1,2 @@ - fix package name and url in pyproject.toml +- remove obsolete setup.py diff --git a/pyproject.toml b/pyproject.toml index caf48a9..a95bae4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ dependencies = [ pyvisgen_create_dataset = "pyvisgen.simulation.scripts.create_dataset:main" [tool.setuptools.packages.find] -where = ["pyvisgen"] +where = ["."] [tool.towncrier] package = "pyvisgen" From 498c62a9ea073d355a416d5bb6b4924f741c6f70 Mon Sep 17 00:00:00 2001 From: Anno Knierim Date: Wed, 31 Jul 2024 10:46:40 +0200 Subject: [PATCH 5/5] Update changelog --- docs/changes/36.maintenance.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changes/36.maintenance.rst b/docs/changes/36.maintenance.rst index 4c847ac..e20ac51 100644 --- a/docs/changes/36.maintenance.rst +++ b/docs/changes/36.maintenance.rst @@ -1,2 +1,4 @@ - fix package name and url in pyproject.toml - remove obsolete setup.py +- fix setuptools find packages path in pyproject.toml +- fix formatting of pyproject.toml