Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move static configurations from setup.py to pyproject.toml #2144

Merged
merged 3 commits into from
Apr 9, 2024

Conversation

chillenb
Copy link
Contributor

@chillenb chillenb commented Mar 26, 2024

Changes in this pull request:

  • Simple package metadata is moved from setup.py to pyproject.toml where possible
  • The number of parallel jobs for cmake --build is not hardcoded anymore in setup.py and can be set with the environment variable CMAKE_BUILD_PARALLEL_LEVEL, or MAKEFLAGS when using the makefiles generator, if a parallel build is desired. Before, changing this required editing setup.py. The conda build script is also set to -j4 so that it does not take longer.
    • Github Action runners have 16 GB RAM, and no libxc functional currently uses more than 1.6 GB RAM to compile, so there is little risk of OOM errors.
  • Because python setup.py sdist is not supported anymore, and in fact sometimes gives inconsistent results, it is replaced with python -m build as recommended by the setuptools maintainers.

Incorporates suggestions from #2132

Copy link

@Shibu778 Shibu778 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes from setup.py to pyproject.toml looks good. Changes can be merged.

@sunqm sunqm merged commit fdd4e48 into pyscf:master Apr 9, 2024
6 checks passed
wxj6000 pushed a commit to wxj6000/pyscf that referenced this pull request Apr 19, 2024
* move testing options to pytest.ini

* move static configurations from setup.py to pyproject.toml

* Update CI release jobs

---------

Co-authored-by: Qiming Sun <osirpt.sun@gmail.com>
sunqm added a commit that referenced this pull request May 15, 2024
* local build dftd3/dftd4

* flake8

* fixed issues apis

* add compilation tool for mac

* fixed bugs in unittest

* fixed an issue in unit test

* add fortran compiler

* fortran compiler

* Move dftd3 and dftd4 builder to a separated repo (pyscf-dispersion)

* enable dftd3 & dftd4 for python3.12

* Adjust tests

* add PCM and SMD, gradient and Hessian

* added __init__ files

* debug for ci

* flake8

* add more unit tests && refactor code

* Fix if mf.istype('UHF') for to_uhf() conversion

* Solve conflicts between @Property and __getattr__

* move static configurations from setup.py to pyproject.toml (#2144)

* move testing options to pytest.ini

* move static configurations from setup.py to pyproject.toml

* Update CI release jobs

---------

Co-authored-by: Qiming Sun <osirpt.sun@gmail.com>

* fix pbc df with KPoints input

* Fix pip builder

* reset enuc in _build_supcell_ (#2164)

* reset enuc in _build_supcell_

* add test for enuc reset

---------

Co-authored-by: hongzhouye <>

* Bug fix for single k-point JK-build in PBC DF (#2165)

* bug fix for j-build in get_jk

* bug fix for k-build in get_jk

---------

Co-authored-by: hongzhouye <>

* add missing init file

* Kpoint dft to_hf error (fix issue #2157)

* ancient GCC compatibility

* fix

* local build dftd3/dftd4

* rebase

* fixed bugs in unittest

* add fortran compiler

* rebase

* delete dftd3 and dftd4 files

* legacy SMD

* fortran compiler for mac

* gcc

* which gcc

* found fortran compiler

* fortran compiler

* reinstall gcc

* update unit test for pcm

* relax unit test in agf2

* resolved some comments

* add statement for smd source code

* refactor smd

* fixed bugs

* bugfix

* Skip compiling SMD by default

* Add fortran compiler in Macos build;
Fix conda build.

* empty line at EOF

* Fix SMD configuration in linux wheel

* add an example for SMD

* SkipTest -> skipTest

* excited states for PCM

* revert the changes in dispersion

* EOF

* added warnings in solvent modules when finite difference is used

---------

Co-authored-by: Qiming Sun <osirpt.sun@gmail.com>
Co-authored-by: Michal Krompiec <michal.krompiec@gmail.com>
Co-authored-by: chillenb <chillenbrand15@gmail.com>
Co-authored-by: fishjojo <zhangxing.nju@gmail.com>
Co-authored-by: Hong-Zhou Ye <hzyechem@gmail.com>
Co-authored-by: Maximilian Scheurer <max.scheurer@me.com>
Co-authored-by: Matthew Hennefarth <matthew.hennefarth@gmail.com>
sokolov-group pushed a commit to sokolov-group/pyscf that referenced this pull request Jul 29, 2024
* move testing options to pytest.ini

* move static configurations from setup.py to pyproject.toml

* Update CI release jobs

---------

Co-authored-by: Qiming Sun <osirpt.sun@gmail.com>
sokolov-group pushed a commit to sokolov-group/pyscf that referenced this pull request Jul 29, 2024
* local build dftd3/dftd4

* flake8

* fixed issues apis

* add compilation tool for mac

* fixed bugs in unittest

* fixed an issue in unit test

* add fortran compiler

* fortran compiler

* Move dftd3 and dftd4 builder to a separated repo (pyscf-dispersion)

* enable dftd3 & dftd4 for python3.12

* Adjust tests

* add PCM and SMD, gradient and Hessian

* added __init__ files

* debug for ci

* flake8

* add more unit tests && refactor code

* Fix if mf.istype('UHF') for to_uhf() conversion

* Solve conflicts between @Property and __getattr__

* move static configurations from setup.py to pyproject.toml (pyscf#2144)

* move testing options to pytest.ini

* move static configurations from setup.py to pyproject.toml

* Update CI release jobs

---------

Co-authored-by: Qiming Sun <osirpt.sun@gmail.com>

* fix pbc df with KPoints input

* Fix pip builder

* reset enuc in _build_supcell_ (pyscf#2164)

* reset enuc in _build_supcell_

* add test for enuc reset

---------

Co-authored-by: hongzhouye <>

* Bug fix for single k-point JK-build in PBC DF (pyscf#2165)

* bug fix for j-build in get_jk

* bug fix for k-build in get_jk

---------

Co-authored-by: hongzhouye <>

* add missing init file

* Kpoint dft to_hf error (fix issue pyscf#2157)

* ancient GCC compatibility

* fix

* local build dftd3/dftd4

* rebase

* fixed bugs in unittest

* add fortran compiler

* rebase

* delete dftd3 and dftd4 files

* legacy SMD

* fortran compiler for mac

* gcc

* which gcc

* found fortran compiler

* fortran compiler

* reinstall gcc

* update unit test for pcm

* relax unit test in agf2

* resolved some comments

* add statement for smd source code

* refactor smd

* fixed bugs

* bugfix

* Skip compiling SMD by default

* Add fortran compiler in Macos build;
Fix conda build.

* empty line at EOF

* Fix SMD configuration in linux wheel

* add an example for SMD

* SkipTest -> skipTest

* excited states for PCM

* revert the changes in dispersion

* EOF

* added warnings in solvent modules when finite difference is used

---------

Co-authored-by: Qiming Sun <osirpt.sun@gmail.com>
Co-authored-by: Michal Krompiec <michal.krompiec@gmail.com>
Co-authored-by: chillenb <chillenbrand15@gmail.com>
Co-authored-by: fishjojo <zhangxing.nju@gmail.com>
Co-authored-by: Hong-Zhou Ye <hzyechem@gmail.com>
Co-authored-by: Maximilian Scheurer <max.scheurer@me.com>
Co-authored-by: Matthew Hennefarth <matthew.hennefarth@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants