Skip to content

Commit 29afbe3

Browse files
bdiceb-butler
andauthored
Release 0.11.0 (#357)
* Merge changelog from 0.10.1. * Update changelog number and date for 0.11.0. * Update Zenodo. * ngpu without nranks no longer uses MPI in version 0.11.0. * Remove --cmd argument. * Minor formatting changes. * Bump up to version 0.11.0. * Remove unused import. * Update pre-commit config to skip setup.cfg. * Update zenodo script. * Remove deprecated code path ``project.py script --cmd`` * Fix ...Fixed. 🤔 Co-authored-by: Brandon Butler <[email protected]>
1 parent 9d9f38f commit 29afbe3

11 files changed

+86
-130
lines changed

.pre-commit-config.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ repos:
33
rev: ''
44
hooks:
55
- id: end-of-file-fixer
6+
exclude: 'setup.cfg'
67
- id: trailing-whitespace
8+
exclude: 'setup.cfg'
79
- id: debug-statements
810
- repo: local
911
hooks:

.sync-zenodo-metadata.py

+3-7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
[2] https://citation-file-format.github.io/1.0.3/specifications/#/person-objects
1414
"""
1515
from dataclasses import dataclass
16+
from typing import Optional
1617

1718
import click
1819
import json
@@ -24,7 +25,7 @@ class Contributor:
2425
last_names: str
2526
first_names: str
2627
affiliation: str
27-
orcid: str = None
28+
orcid: Optional[str] = None
2829

2930
@classmethod
3031
def from_citation_author(cls, **citation):
@@ -41,11 +42,6 @@ def as_zenodo_creator(self):
4142
ret['orcid'] = self.orcid.lstrip('https://orcid.org/')
4243
return ret
4344

44-
def as_zenodo_contributor(self):
45-
ret = self.as_zenodo_creator()
46-
ret['type'] = 'Other'
47-
return ret
48-
4945

5046
@click.command()
5147
@click.pass_context
@@ -70,7 +66,7 @@ def sync(ctx, in_place=False, check=True):
7066
zenodo = json.loads(file.read())
7167
zenodo_updated = zenodo.copy()
7268
zenodo_updated['creators'] = [a.as_zenodo_creator() for a in authors]
73-
zenodo_updated['contributors'] = [c.as_zenodo_contributor()
69+
zenodo_updated['contributors'] = [c.as_zenodo_creator()
7470
for c in contributors if c not in authors]
7571
for key in ('version', 'keywords'):
7672
zenodo_updated[key] = citation[key]

.zenodo.json

+25-39
Original file line numberDiff line numberDiff line change
@@ -3,110 +3,96 @@
33
{
44
"affiliation": "University of Michigan",
55
"name": "Benjamin Swerdlow",
6-
"orcid": "0000-0001-6240-1430",
7-
"type": "Other"
6+
"orcid": "0000-0001-6240-1430"
87
},
98
{
109
"affiliation": "University of Michigan",
11-
"name": "Joshua A. Anderson",
12-
"type": "Other"
10+
"name": "Joshua A. Anderson"
1311
},
1412
{
1513
"affiliation": "University of Michigan",
1614
"name": "Jens Glaser",
17-
"orcid": "0000-0003-1852-3849",
18-
"type": "Other"
15+
"orcid": "0000-0003-1852-3849"
1916
},
2017
{
2118
"affiliation": "University of Michigan",
2219
"name": "Timothy C. Moore",
23-
"orcid": "0000-0002-5709-7259",
24-
"type": "Other"
20+
"orcid": "0000-0002-5709-7259"
2521
},
2622
{
2723
"affiliation": "University of Michigan",
2824
"name": "Rose Cersonsky",
29-
"orcid": "0000-0003-4515-3441",
30-
"type": "Other"
25+
"orcid": "0000-0003-4515-3441"
3126
},
3227
{
3328
"affiliation": "University of Michigan",
3429
"name": "Yuan Zhou",
35-
"orcid": "0000-0002-6727-0836",
36-
"type": "Other"
30+
"orcid": "0000-0002-6727-0836"
3731
},
3832
{
3933
"affiliation": "Vanderbilt University",
4034
"name": "Matthew W. Thompson",
41-
"orcid": "0000-0002-1460-3983",
42-
"type": "Other"
35+
"orcid": "0000-0002-1460-3983"
4336
},
4437
{
4538
"affiliation": "University of Michigan",
4639
"name": "Shannon Moran",
47-
"orcid": "0000-0002-3579-3149",
48-
"type": "Other"
40+
"orcid": "0000-0002-3579-3149"
4941
},
5042
{
5143
"affiliation": "University of Michigan",
52-
"name": "Yannah Melle",
53-
"type": "Other"
44+
"name": "Yannah Melle"
5445
},
5546
{
5647
"affiliation": "University of Michigan",
5748
"name": "Pengji Zhou",
58-
"orcid": "0000-0002-1409-9633",
59-
"type": "Other"
49+
"orcid": "0000-0002-1409-9633"
6050
},
6151
{
6252
"affiliation": "Vanderbilt University",
6353
"name": "Justin Gilmer",
64-
"orcid": "0000-0002-6915-5591",
65-
"type": "Other"
54+
"orcid": "0000-0002-6915-5591"
6655
},
6756
{
6857
"affiliation": "University of Michigan",
6958
"name": "Alyssa Travitz",
70-
"orcid": "0000-0001-5953-8807",
71-
"type": "Other"
59+
"orcid": "0000-0001-5953-8807"
7260
},
7361
{
7462
"affiliation": "University of Michigan",
7563
"name": "Corwin Kerr",
76-
"orcid": "0000-0003-0776-2596",
77-
"type": "Other"
64+
"orcid": "0000-0003-0776-2596"
7865
},
7966
{
8067
"affiliation": "University of Michigan",
8168
"name": "Tobias Dwyer",
82-
"orcid": "0000-0001-6443-7744",
83-
"type": "Other"
69+
"orcid": "0000-0001-6443-7744"
8470
},
8571
{
8672
"affiliation": "National Institute of Technology, Hamirpur",
87-
"name": "Vishav Sharma",
88-
"type": "Other"
73+
"name": "Vishav Sharma"
8974
},
9075
{
9176
"affiliation": "Indian Institute of Technology Roorkee",
92-
"name": "Hardik Ojha",
93-
"type": "Other"
77+
"name": "Hardik Ojha"
9478
},
9579
{
9680
"affiliation": "Birla Institute of Technology and Science, Pilani - Goa Campus",
97-
"name": "Yash Bhardwaj",
98-
"type": "Other"
81+
"name": "Yash Bhardwaj"
9982
},
10083
{
10184
"affiliation": "",
10285
"name": "Jacob Dice",
103-
"orcid": "0000-0002-9479-1661",
104-
"type": "Other"
86+
"orcid": "0000-0002-9479-1661"
10587
},
10688
{
10789
"affiliation": "Indian Institute of Technology, Gandhinagar",
108-
"name": "Abhavya Chandra",
109-
"type": "Other"
90+
"name": "Abhavya Chandra"
91+
},
92+
{
93+
"affiliation": "University of Minnesota",
94+
"name": "Ramanish Singh",
95+
"orcid": "0000-0002-7908-060X"
11096
}
11197
],
11298
"creators": [
@@ -161,5 +147,5 @@
161147
},
162148
"title": "signac-flow",
163149
"upload_type": "software",
164-
"version": "0.10.0"
150+
"version": "0.11.0"
165151
}

CITATION.cff

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33
cff-version: "1.0.3"
44
title: signac-flow
5-
version: 0.10.0
5+
version: 0.11.0
66
abstract: |
77
The signac-flow tool provides the basic components to set up simple to complex workflows for projects as part of the signac framework. That includes the definition of data pipelines, execution of data space operations and the submission of operations to high-performance super computers.
88
authors:

changelog.txt

+20-9
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ Changelog
55
The **signac-flow** package follows `semantic versioning <https://semver.org/>`_.
66
The numbers in brackets denote the related GitHub issue and/or pull request.
77

8-
next
9-
====
8+
Version 0.11
9+
============
1010

11-
next
12-
----
11+
[0.11.0] -- 2020-10-09
12+
----------------------
1313

1414
Added
1515
+++++
16+
1617
- Added classes ``_Directives`` and ``_Directive`` that serve as a smart mapping for directives specified by the environment or user (#265, #283).
1718
- Added support for `pre-commit hooks <https://pre-commit.com/>`__ (#333).
1819
- Add environment profile for University of Minnesota, Minnesota Supercomputing Institute, Mangi supercomputer (#353).
@@ -26,6 +27,7 @@ Changed
2627

2728
Fixed
2829
+++++
30+
2931
- Serial execution on Summit correctly counts total node requirements (#342).
3032
- Fixed performance regression in job submission in large workspaces (#354).
3133

@@ -38,6 +40,14 @@ Removed
3840
Version 0.10
3941
============
4042

43+
[0.10.1] -- 2020-08-20
44+
----------------------
45+
46+
Fixed
47+
+++++
48+
49+
- Fix issue with the submission of bundled operations on cluster environments that do not allow slashes ('/') in cluster scheduler job names (#343).
50+
4151
[0.10.0] -- 2020-06-27
4252
----------------------
4353

@@ -69,6 +79,7 @@ Changed
6979

7080
Fixed
7181
+++++
82+
7283
- Ensure that label names are used when displaying status (#263).
7384
- Fix node counting for large resource sets on Summit (#294).
7485

@@ -128,7 +139,7 @@ Added
128139
- Enable option to always show the full traceback with ``show_traceback = on`` within the ``[flow]`` section of the signac configuration (#61, #144).
129140
- Add full launcher support for job submission on XSEDE Stampede2 for large parallel single processor jobs (#85, #91).
130141

131-
Fixes
142+
Fixed
132143
+++++
133144

134145
- Both the ``nranks`` and ``omp_num_threads`` directives properly support callables (#118).
@@ -170,12 +181,12 @@ Added
170181
- Add function to automatically print all varying state point parameters in the detailed status view triggered by providing option `-p/--parameters` without arguments (#19, #87).
171182
- Add clear environment notification when submitting job scripts (#43, #88).
172183

173-
Fixes
184+
Fixed
174185
+++++
175186

176187
- Fix issue where the scheduler status of job-operations would not be properly updated for *ineligible* operations (#96).
177188

178-
Fixes (compute environments)
189+
Fixed (compute environments)
179190
++++++++++++++++++++++++++++
180191

181192
- Fix issue with the TORQUE scheduler that occured when there was no job scheduled at all on the system (for any user) (#92, #93).
@@ -195,7 +206,7 @@ Added
195206
- Add legend explaining the scheduler-related symbols to the detailed status view (#68).
196207
- Allow the specification of the number of tasks per resource set and additional jsrun arguments for Summit scripts.
197208

198-
Fixes (general)
209+
Fixed (general)
199210
+++++++++++++++
200211

201212
- Fixes issue where callable cmd-directives were not evaluated (#47).
@@ -205,7 +216,7 @@ Fixes (general)
205216
- Fixes issue where using the buffered mode would lead to confusing error messages when condition-functions would raise an AttributeError exception.
206217
- Fixes issue with erroneous unused-directive-keys-warning.
207218

208-
Fixes (compute environments)
219+
Fixed (compute environments)
209220
++++++++++++++++++++++++++++
210221

211222
- Fixes issues with the Summit environment resource set calculation for parallel operations under specific conditions (#63).

doc/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ def __getattr__(cls, name):
7373
# built documents.
7474
#
7575
# The short X.Y version.
76-
version = '0.10.0'
76+
version = '0.11.0'
7777
# The full version, including alpha/beta/rc tags.
78-
release = '0.10.0'
78+
release = '0.11.0'
7979

8080
# The language for content autogenerated by Sphinx. Refer to documentation
8181
# for a list of supported languages.

flow/environment.py

-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import importlib
1717
from collections import OrderedDict
1818
import importlib.machinery
19-
import warnings
2019

2120
from signac.common import config
2221

@@ -227,10 +226,6 @@ def _get_mpi_prefix(cls, operation, parallel):
227226
"""
228227
if operation.directives.get('nranks'):
229228
return '{} -n {} '.format(cls.mpi_cmd, operation.directives['nranks'])
230-
elif operation.directives.get('ngpu', 0) > 1:
231-
warnings.warn("Setting ngpu directive without nranks will no longer use MPI "
232-
"in version 0.11.", DeprecationWarning)
233-
return '{} -n {}'.format(cls.mpi_cmd, operation.directives['ngpu'])
234229
else:
235230
return ''
236231

0 commit comments

Comments
 (0)