From c1d02d47948c80f4a2547885bd7409cca9552592 Mon Sep 17 00:00:00 2001 From: alan-stokes Date: Fri, 7 Sep 2018 14:45:25 +0100 Subject: [PATCH 01/11] adds citation and manafest files --- CITATION.cff | 43 +++++++++++++++++++++++++++++++++++++++++++ MANIFEST.in | 1 + 2 files changed, 44 insertions(+) create mode 100644 CITATION.cff create mode 100644 MANIFEST.in diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 000000000..b37b1c9c2 --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,43 @@ +cff-version: 1.0.3 +message: If you use this software, please cite it as below. +authors: +- family-names: Stokes + given-names: Alan + orcid: https://orcid.org/0000-0002-6110-1484 + affiliation: "University Of Manchester" + email: alan.stokes-2@manchester.ac.uk + website: http://www.cs.man.ac.uk/~stokesa6/ +- family-names: Rowley + given-names: Andrew + orcid: https://orcid.org/0000-0002-2646-8520 + affiliation: "University Of Manchester" + email: Andrew.Rowley@manchester.ac.uk + website: https://www.researchgate.net/profile/Andrew_Rowley2 +- family-names: Brenninkmeijer + given-names: Christian Y. + orcid: https://orcid.org/0000-0002-2937-7819 + affiliation: "University Of Manchester" + email: christian.brenninkmeijer@manchester.ac.uk + website: https://www.researchgate.net/profile/Christian_Brenninkmeijer +- family-names: Fellows + given-names: Donal + orcid: https://orcid.org/0000-0002-9091-5938 + affiliation: "University Of Manchester" + email: donal.k.fellows@manchester.ac.uk + website: http://www.cs.manchester.ac.uk/about-us/staff/profile/?ea=donal.k.fellows +- family-names: Heathcote + given-names: Jonathan + affiliation: "University Of Manchester" + email: jheathcote@cs.man.ac.uk + website: http://apt.cs.manchester.ac.uk/people/jheathcote/ + +title: The client side of the SpiNNaker machine allocation software +version: +date-released: 2017-09-17 +url: http://spinnakermanchester.github.io/ +repository: https://github.com/SpiNNakerManchester/spalloc +contact: +- name: SpiNNaker Software team +address: IT 302, It building, Oxford road, University of Manchester, Manchester, M13 9PL +email: spinnakerusers@googlegroups.com + diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..2ec0b1c26 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include CITATION.cff LICENSE.md README.md \ No newline at end of file From 338f4827d6213d1663b773bde7d3be546e447b39 Mon Sep 17 00:00:00 2001 From: alan-stokes Date: Fri, 7 Sep 2018 15:44:26 +0100 Subject: [PATCH 02/11] added either _version.py or added __version_day__ to the _version file --- spalloc/_version.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spalloc/_version.py b/spalloc/_version.py index 5c4105cd3..1a605dcf1 100644 --- a/spalloc/_version.py +++ b/spalloc/_version.py @@ -1 +1,5 @@ __version__ = "1.0.1" +__version_month__ = "September" +__version_year__ = "2017" +__version_day__ = "25" +__version_name__ = "Riptalon" \ No newline at end of file From 58d3be6a467b181cfaccdf4b3e215049db72cdba Mon Sep 17 00:00:00 2001 From: alan-stokes Date: Fri, 7 Sep 2018 16:26:08 +0100 Subject: [PATCH 03/11] fixing from donals feedback --- CITATION.cff | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index b37b1c9c2..a98cf01f3 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -37,7 +37,10 @@ date-released: 2017-09-17 url: http://spinnakermanchester.github.io/ repository: https://github.com/SpiNNakerManchester/spalloc contact: -- name: SpiNNaker Software team -address: IT 302, It building, Oxford road, University of Manchester, Manchester, M13 9PL +- name: SpiNNaker Software Team + address: University of Manchester, Oxford Road + city: Manchester + post-code: M13 9PL + country: GB email: spinnakerusers@googlegroups.com From 0c253616410e1693c06ec1bbd48cbaf31810962e Mon Sep 17 00:00:00 2001 From: Donal Fellows Date: Mon, 10 Sep 2018 10:43:06 +0100 Subject: [PATCH 04/11] Fix flake8 and ordered authors correctly. Alan, you are NOT the main author of spalloc! --- CITATION.cff | 31 +++++++++++++++---------------- spalloc/_version.py | 2 +- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index a98cf01f3..d89b753fd 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,18 +1,11 @@ cff-version: 1.0.3 message: If you use this software, please cite it as below. authors: -- family-names: Stokes - given-names: Alan - orcid: https://orcid.org/0000-0002-6110-1484 - affiliation: "University Of Manchester" - email: alan.stokes-2@manchester.ac.uk - website: http://www.cs.man.ac.uk/~stokesa6/ -- family-names: Rowley - given-names: Andrew - orcid: https://orcid.org/0000-0002-2646-8520 +- family-names: Heathcote + given-names: Jonathan affiliation: "University Of Manchester" - email: Andrew.Rowley@manchester.ac.uk - website: https://www.researchgate.net/profile/Andrew_Rowley2 + email: jheathcote@cs.man.ac.uk + website: http://apt.cs.manchester.ac.uk/people/jheathcote/ - family-names: Brenninkmeijer given-names: Christian Y. orcid: https://orcid.org/0000-0002-2937-7819 @@ -25,11 +18,18 @@ authors: affiliation: "University Of Manchester" email: donal.k.fellows@manchester.ac.uk website: http://www.cs.manchester.ac.uk/about-us/staff/profile/?ea=donal.k.fellows -- family-names: Heathcote - given-names: Jonathan +- family-names: Rowley + given-names: Andrew + orcid: https://orcid.org/0000-0002-2646-8520 affiliation: "University Of Manchester" - email: jheathcote@cs.man.ac.uk - website: http://apt.cs.manchester.ac.uk/people/jheathcote/ + email: Andrew.Rowley@manchester.ac.uk + website: https://www.researchgate.net/profile/Andrew_Rowley2 +- family-names: Stokes + given-names: Alan + orcid: https://orcid.org/0000-0002-6110-1484 + affiliation: "University Of Manchester" + email: alan.stokes-2@manchester.ac.uk + website: http://www.cs.man.ac.uk/~stokesa6/ title: The client side of the SpiNNaker machine allocation software version: @@ -43,4 +43,3 @@ contact: post-code: M13 9PL country: GB email: spinnakerusers@googlegroups.com - diff --git a/spalloc/_version.py b/spalloc/_version.py index 1a605dcf1..55d4b0808 100644 --- a/spalloc/_version.py +++ b/spalloc/_version.py @@ -2,4 +2,4 @@ __version_month__ = "September" __version_year__ = "2017" __version_day__ = "25" -__version_name__ = "Riptalon" \ No newline at end of file +__version_name__ = "Riptalon" From 4645501e7ad25c439e5320f8202904d7ff45c2ae Mon Sep 17 00:00:00 2001 From: alan-stokes Date: Mon, 10 Sep 2018 15:10:26 +0100 Subject: [PATCH 05/11] added setup.py --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8de44b524..cc9fc68ca 100644 --- a/setup.py +++ b/setup.py @@ -51,5 +51,7 @@ "spalloc-machine = spalloc.scripts.machine:main", "spalloc-where-is = spalloc.scripts.where_is:main", ], - } + }, + maintainer="SpiNNakerTeam", + maintainer_email="spinnakerusers@googlegroups.com" ) From 213d5c61843dace29f1e4ac2de9062e2f23ee824 Mon Sep 17 00:00:00 2001 From: alan-stokes Date: Thu, 13 Sep 2018 11:25:38 +0100 Subject: [PATCH 06/11] added pypitoimport map --- pypi_to_import | 6 ++++++ requirements.txt | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 pypi_to_import diff --git a/pypi_to_import b/pypi_to_import new file mode 100644 index 000000000..f19fe5ee1 --- /dev/null +++ b/pypi_to_import @@ -0,0 +1,6 @@ +six:six +appdirs:appdirs +enum-compat:enum +pytz:pytz +tzlocal:tzlocal +future:future diff --git a/requirements.txt b/requirements.txt index 80841444c..8cdf8f2f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -# requirements six>=1.8.0 appdirs enum-compat From ebda64da086ab8524fc0f15f84f06946bd7ae4f3 Mon Sep 17 00:00:00 2001 From: alan-stokes Date: Thu, 13 Sep 2018 13:40:35 +0100 Subject: [PATCH 07/11] removed data-released (as generated by other script) and added aggregator script for python dependancies --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index a98cf01f3..35b5aea99 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -33,7 +33,7 @@ authors: title: The client side of the SpiNNaker machine allocation software version: -date-released: 2017-09-17 +date-released: url: http://spinnakermanchester.github.io/ repository: https://github.com/SpiNNakerManchester/spalloc contact: From ead75eedfe5630246dc3234ddf97ebe398dbb00a Mon Sep 17 00:00:00 2001 From: alan-stokes Date: Tue, 2 Oct 2018 15:51:48 +0100 Subject: [PATCH 08/11] adds the flag for identifier for the dois and added the intergration into FEC --- CITATION.cff | 1 + 1 file changed, 1 insertion(+) diff --git a/CITATION.cff b/CITATION.cff index 5e07f2bdb..c96a92084 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -43,3 +43,4 @@ contact: post-code: M13 9PL country: GB email: spinnakerusers@googlegroups.com +identifier: \ No newline at end of file From ade601db4167e4177c44181396f21d22e9591840 Mon Sep 17 00:00:00 2001 From: alan-stokes Date: Thu, 4 Oct 2018 17:12:27 +0100 Subject: [PATCH 09/11] little fixes. posting the formatted from yalm dump for citation file,s as they likely more better. releaser has some mods to make it easiewr to debug, and a ton of little fixes moved file compression to before any requests. on hope the delay was causing crash. alas not. but not worth reverting --- CITATION.cff | 53 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index c96a92084..fee4b6c42 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,46 +1,45 @@ -cff-version: 1.0.3 -message: If you use this software, please cite it as below. authors: -- family-names: Heathcote - given-names: Jonathan - affiliation: "University Of Manchester" +- affiliation: University Of Manchester email: jheathcote@cs.man.ac.uk + family-names: Heathcote + given-names: Jonathan website: http://apt.cs.manchester.ac.uk/people/jheathcote/ -- family-names: Brenninkmeijer +- affiliation: University Of Manchester + email: christian.brenninkmeijer@manchester.ac.uk + family-names: Brenninkmeijer given-names: Christian Y. orcid: https://orcid.org/0000-0002-2937-7819 - affiliation: "University Of Manchester" - email: christian.brenninkmeijer@manchester.ac.uk website: https://www.researchgate.net/profile/Christian_Brenninkmeijer -- family-names: Fellows +- affiliation: University Of Manchester + email: donal.k.fellows@manchester.ac.uk + family-names: Fellows given-names: Donal orcid: https://orcid.org/0000-0002-9091-5938 - affiliation: "University Of Manchester" - email: donal.k.fellows@manchester.ac.uk website: http://www.cs.manchester.ac.uk/about-us/staff/profile/?ea=donal.k.fellows -- family-names: Rowley +- affiliation: University Of Manchester + email: Andrew.Rowley@manchester.ac.uk + family-names: Rowley given-names: Andrew orcid: https://orcid.org/0000-0002-2646-8520 - affiliation: "University Of Manchester" - email: Andrew.Rowley@manchester.ac.uk website: https://www.researchgate.net/profile/Andrew_Rowley2 -- family-names: Stokes +- affiliation: University Of Manchester + email: alan.stokes-2@manchester.ac.uk + family-names: Stokes given-names: Alan orcid: https://orcid.org/0000-0002-6110-1484 - affiliation: "University Of Manchester" - email: alan.stokes-2@manchester.ac.uk website: http://www.cs.man.ac.uk/~stokesa6/ - -title: The client side of the SpiNNaker machine allocation software -version: -date-released: -url: http://spinnakermanchester.github.io/ -repository: https://github.com/SpiNNakerManchester/spalloc +cff-version: 1.0.3 contact: -- name: SpiNNaker Software Team - address: University of Manchester, Oxford Road +- address: University of Manchester, Oxford Road city: Manchester - post-code: M13 9PL country: GB + name: SpiNNaker Software Team + post-code: M13 9PL +date-released: email: spinnakerusers@googlegroups.com -identifier: \ No newline at end of file +identifier: +message: If you use this software, please cite it as below. +repository: https://github.com/SpiNNakerManchester/spalloc +title: The client side of the SpiNNaker machine allocation software +url: http://spinnakermanchester.github.io/ +version: From 43a15a24ba539db3f2d1d7d9950bdf85ffcf0ccb Mon Sep 17 00:00:00 2001 From: alan-stokes Date: Thu, 4 Oct 2018 17:29:43 +0100 Subject: [PATCH 10/11] removed pypi requirements which have same name. as requested by donal --- pypi_to_import | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pypi_to_import b/pypi_to_import index f19fe5ee1..f0c1443f5 100644 --- a/pypi_to_import +++ b/pypi_to_import @@ -1,6 +1,2 @@ -six:six -appdirs:appdirs enum-compat:enum -pytz:pytz -tzlocal:tzlocal -future:future + From ddacb03540be2407f325b2c89ead86078470cc0b Mon Sep 17 00:00:00 2001 From: alan-stokes Date: Fri, 5 Oct 2018 11:35:03 +0100 Subject: [PATCH 11/11] fixes issue with manifest and adds the extras needed for the aggreator to work --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 2ec0b1c26..860619287 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -include CITATION.cff LICENSE.md README.md \ No newline at end of file +include CITATION.cff LICENSE.md requirements.txt pypi_to_import \ No newline at end of file