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

Pyproject.toml #500

Merged
merged 20 commits into from
Apr 11, 2023
Merged

Pyproject.toml #500

merged 20 commits into from
Apr 11, 2023

Conversation

dkfellows
Copy link
Member

@dkfellows dkfellows commented Mar 21, 2023

Converts to the newer way of doing setup.
SpiNNakerManchester/SpiNNUtils#222
SpiNNakerManchester/SpiNNMachine#196
SpiNNakerManchester/SpiNNMan#317
SpiNNakerManchester/DataSpecification#137
SpiNNakerManchester/TestBase#31
SpiNNakerManchester/SpiNNFrontEndCommon#1038
SpiNNakerManchester/sPyNNaker#1317
SpiNNakerManchester/SpiNNakerGraphFrontEnd#242
SpiNNakerManchester/SpiNNGym#72
SpiNNakerManchester/IntroLab#45
SpiNNakerManchester/MarkovChainMonteCarlo#46
SpiNNakerManchester/microcircuit_model#30
SpiNNakerManchester/PyNNExamples#102
SpiNNakerManchester/sPyNNakerNewModelTemplate#100
SpiNNakerManchester/SpiNNaker_PDP2#72
SpiNNakerManchester/Visualiser#23
SpiNNakerManchester/sPyNNakerVisualisers#32
SpiNNakerManchester/spalloc#79
SpiNNakerManchester/spalloc_server#83
SpiNNakerManchester/spinn_common#59
SpiNNakerManchester/SpiNNakerManchester.github.io#45

tested by which must also be merged in
SpiNNakerManchester/IntegrationTests#189

Docs checked by:
https://github.com/SpiNNakerManchester/sphinx8/branches

Note: This is not yet a PR as
https://github.com/SpiNNakerManchester/sphinx8/blob/pyproject.toml/doc/doc_requirements.txt
needs the branch name changed back to master before
Note the -e have been removed

Support scripts changes already in master as impossible to test from a branch.
however:
https://github.com/SpiNNakerManchester/SupportScripts/tree/master/actions/checkout-spinn-deps
https://github.com/SpiNNakerManchester/SupportScripts/tree/master/actions/run-setup
could now be removed as they are the old way

If we need to add in pacman_test_objects, then the best way is probably to alter the [options.packages.find] include directive to:

[options.packages.find]
include =
        pacman
        pacman_test_objects

We don't want the tests themselves to be part of the installed package.

@Christian-B
Copy link
Member

\the include = tip from above appears to be working as now Jenkins passes

@Christian-B
Copy link
Member

Will be worth comparing this to https://packaging.python.org/en/latest/tutorials/packaging-projects/

@Christian-B
Copy link
Member

Suggest doing
[options.packages.find]
include =
xyz

in all repositories to hide unittests

@Christian-B
Copy link
Member

Due to pypa/setuptools#1871 it is better to delete build and egg-info dirs.

This only affects when building for a second time

@Christian-B
Copy link
Member

[options.packages.find]
include =
pacman
pacman_test_objects

needs to be:
[options.packages.find]
include =
pacman
pacman.*
pacman_test_objects
pacman_test_objects.*

The pacman picks up that directory but not children
pacman.* picks up the children but not the main directory
pacman_test_objects.* is currently optional as it has no children

@Christian-B
Copy link
Member

spalloc still has a tox.ini. Left for later pr
SpiNNakerManchester/spalloc#78

@Christian-B
Copy link
Member

spalloc.egg-info/SOURCES.txt includes some but not all test files.
Only the ones with the tests/test_ pattern.

Removing the tox.ini did not change this.

@Christian-B
Copy link
Member

I have decided to only include spynnaker code and not spynnaker8 code as that is deprecated and due to be removed shortly.

@Christian-B
Copy link
Member

Christian-B commented Apr 3, 2023

need to include the cfg and other support files like:
[options.package_data]

  • =
    spinn_utilities.cfg
    progress_bar.txt

also json schema and DDL sql files

Copy link
Member Author

@dkfellows dkfellows left a comment

Choose a reason for hiding this comment

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

Looks OK to me

@Christian-B Christian-B merged commit c78ed4b into master Apr 11, 2023
@Christian-B Christian-B deleted the pyproject.toml branch April 11, 2023 10:21
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.

2 participants