Skip to content

Commit

Permalink
trim trailing whitespaces (#1190)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tinatn29
tinatn29 authored Nov 9, 2024
1 parent 8aed27a commit ff1c095
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 52 deletions.
18 changes: 9 additions & 9 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ v0.8.0

**Added:**

* the option to specify a different database for the expense and presentation
* the option to specify a different database for the expense and presentation
items when running a_presentation.
* scripts (profile_regolith and profile_helper_gui) that run regolith and helper_gui with the python cProfiler. Used for debugging and code development.
* universally unique IDs added to all tasks, and now listed by todo lister
* milestone lister now prints the uuids of the milestones
* additional tests for c+p, annual-activity and grant-report builders
* repo_info_complete in tools to check the existence of remote repositories before operating on them
* token_info_complete in tools to check for the existence of the user's private API authentication token
* repo_info_complete in tools to check the existence of remote repositories before operating on them
* token_info_complete in tools to check for the existence of the user's private API authentication token
* create_repo in tools to create a repository in a given remote repository
* functionality to presentation helper that creates a repo by calling on create_repo function in tools when no_talk_repo box is not checked
* functionality to presentation helper that creates a repo by calling on create_repo function in tools when no_talk_repo box is not checked
* no_repo box/option added to presentation helper gui
* no_in_cv option for employment entries that they don't appear in cv's and resumes
* get_appointments() function
Expand Down Expand Up @@ -106,11 +106,11 @@ v0.8.0
using the tags field for each paper
* tests of tex and html files now compare outputs line by line
and ignore variables paths that have proven to be unstable
* Standardized CLI option names by replacing the underscore with a hyphen in the
following: --end_date, --begin_-date, --submitted_date, --no_cal, --due_date,
--group_members, --other_agencies, --months_academic, --months_summer,
--assigned_to, --assigned_by, --loc_inst, --kv_filter, --return_fields,
--helper_help, --school_aka, --school_name, --school-id, --dept_aka, --dept_name,
* Standardized CLI option names by replacing the underscore with a hyphen in the
following: --end_date, --begin_-date, --submitted_date, --no_cal, --due_date,
--group_members, --other_agencies, --months_academic, --months_summer,
--assigned_to, --assigned_by, --loc_inst, --kv_filter, --return_fields,
--helper_help, --school_aka, --school_name, --school-id, --dept_aka, --dept_name,
--dept_id, --estimated_duration.
* Reformatted printing of todos to make the order clearer
* "--projectum_id" has been changed from a required arg to an optional arg
Expand Down
4 changes: 2 additions & 2 deletions doc/source/collections/expenses.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The following lists key names mapped to its type and meaning for each entry.
:end_month: ['string', 'integer'], The month when the travel/business end, optional
:end_year: integer, The year when the travel/business end, optional

Allowed values:
Allowed values:
* travel
* business
:grant_percentages: list, the percentage of the reimbursement amount to put on each grant. This list must be the same length asthe grants list and the percentages placed in the order that the grants appear in that list, optional
Expand Down Expand Up @@ -55,7 +55,7 @@ The following lists key names mapped to its type and meaning for each entry.
:where: string, where the reimbursement has been sent, optional
:status: string, The status of the expense, optional

Allowed values:
Allowed values:
* unsubmitted
* submitted
* reimbursed
Expand Down
4 changes: 2 additions & 2 deletions doc/source/collections/grants.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The following lists key names mapped to its type and meaning for each entry.
:scope: string, The scope of the grant, answers the prompt: Describe Research Including Synergies and Delineation with Respect to this Proposal/Award:, optional
:status: string, status of the grant, optional

Allowed values:
Allowed values:
* pending
* declined
* accepted
Expand All @@ -73,7 +73,7 @@ The following lists key names mapped to its type and meaning for each entry.
:name: string, optional
:position: string, optional

Allowed values:
Allowed values:
* pi
* copi
:subaward_amount: ['integer', 'float'], optional
Expand Down
18 changes: 9 additions & 9 deletions doc/source/collections/people.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The following lists key names mapped to its type and meaning for each entry.
:day: integer, the day the activity took place, optional
:type: string, the type of the activity, optional

Allowed values:
Allowed values:
* teaching
* research
:month: ['integer', 'string'], the month the activity took place, optional
Expand All @@ -40,14 +40,14 @@ The following lists key names mapped to its type and meaning for each entry.
:unit: string, name of department or school etc., optional
:type: string, type of committee, department, school, university, external, optional

Allowed values:
Allowed values:
* phdoral
* phddefense
* phdproposal
* promotion
:level: string, department or school or university, or external, optional

Allowed values:
Allowed values:
* department
* school
* university
Expand Down Expand Up @@ -94,7 +94,7 @@ The following lists key names mapped to its type and meaning for each entry.
:permanent: boolean, true if the position is open ended and has no fixed end-date, optional
:position: string, optional

Allowed values:
Allowed values:
* ``''``
* editor
* unknown
Expand Down Expand Up @@ -142,7 +142,7 @@ The following lists key names mapped to its type and meaning for each entry.
:position_full: string, The full on title of the position. This will be typeset if it is here, or if not Position will be used. Position will be used for sorting and must come from a fixed list of positions, optional
:status: string, optional

Allowed values:
Allowed values:
* pi
* adjunct
* high-school
Expand All @@ -161,7 +161,7 @@ The following lists key names mapped to its type and meaning for each entry.
:end_day: integer, the day facility started, optional
:type: string, the type of the facility. Columbia asksfor wished-for facilities, so there are teaching-wish and research-wish fields., optional

Allowed values:
Allowed values:
* teaching
* research
* shared
Expand Down Expand Up @@ -236,7 +236,7 @@ The following lists key names mapped to its type and meaning for each entry.
:orcid_id: string, The ORCID ID of the person, optional
:position: string, such as professor, graduate student, or scientist, optional

Allowed values:
Allowed values:
* ``''``
* editor
* unknown
Expand Down Expand Up @@ -288,7 +288,7 @@ The following lists key names mapped to its type and meaning for each entry.

:type: string, optional

Allowed values:
Allowed values:
* online
* article
:topic: string, The short sentence of what the publicity was about, optional
Expand Down Expand Up @@ -332,7 +332,7 @@ The following lists key names mapped to its type and meaning for each entry.
:other: ['string', 'list'], optional
:type: string, profession, department, school, university, optional

Allowed values:
Allowed values:
* profession
* university
* school
Expand Down
4 changes: 2 additions & 2 deletions doc/source/collections/presentations.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The following lists key names mapped to its type and meaning for each entry.
:project: ['string', 'list'], project or list of projects that this presentation is associated with. Should be discoverable in projects collection, optional
:status: string, Is the application in prep or submitted, was the invitation accepted or declined, was the trip cancelled?, required

Allowed values:
Allowed values:
* in-prep
* submitted
* accepted
Expand All @@ -36,7 +36,7 @@ The following lists key names mapped to its type and meaning for each entry.
:title: string, title of the presentation, required
:type: string, type of presentation, required

Allowed values:
Allowed values:
* award
* colloquium
* contributed_oral
Expand Down
12 changes: 6 additions & 6 deletions doc/source/collections/projecta.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The following lists key names mapped to its type and meaning for each entry.
:notes: list, any notes about the deliverable that we want to keep track of, optional
:status: string, status of the deliverable. Allowed values are {', '.join(PROJECTUM_STATI)}, optional

Allowed values:
Allowed values:
* proposed
* converged
* started
Expand All @@ -45,7 +45,7 @@ The following lists key names mapped to its type and meaning for each entry.
:notes: list, any notes about the kickoff, optional
:status: string, status of the kickoff. Allowed values are {', '.join(PROJECTUM_STATI)}, optional

Allowed values:
Allowed values:
* proposed
* converged
* started
Expand All @@ -56,7 +56,7 @@ The following lists key names mapped to its type and meaning for each entry.
* all
:type: string, type of kickoff deliverable. In general will be 'meeting'Allowed values are {', '.join(MILESTONE_TYPES)}, optional

Allowed values:
Allowed values:
* mergedpr
* meeting
* other
Expand Down Expand Up @@ -92,7 +92,7 @@ The following lists key names mapped to its type and meaning for each entry.
:audience: list, list of people attending the meeting.Normally this list is group_members, collaborators, and pi, or some subset of these. if people are invited who are not alreadyin these groups their names or id's can be added explicitly to the list, optional
:status: string, status of the milestone. Allowed values are {', '.join(PROJECTUM_STATI)}, optional

Allowed values:
Allowed values:
* proposed
* converged
* started
Expand All @@ -103,7 +103,7 @@ The following lists key names mapped to its type and meaning for each entry.
* all
:type: string, type of milestone deliverable. Allowed values are {', '.join(MILESTONE_TYPES)}, optional

Allowed values:
Allowed values:
* mergedpr
* meeting
* other
Expand All @@ -128,7 +128,7 @@ The following lists key names mapped to its type and meaning for each entry.
:product_url: string, url for manuscript or code repository, optional
:status: string, status of the projectum. Allowed values are {', '.join(PROJECTUM_STATI)}, required

Allowed values:
Allowed values:
* proposed
* converged
* started
Expand Down
2 changes: 1 addition & 1 deletion doc/source/collections/projects.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The following lists key names mapped to its type and meaning for each entry.
:position: string, optional
:type: ['string'], The type of project, optional

Allowed values:
Allowed values:
* ossoftware
* funded
* outreach
Expand Down
4 changes: 2 additions & 2 deletions doc/source/collections/proposalReviews.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The following lists key names mapped to its type and meaning for each entry.
:adequacy_of_resources: list, Are the resources of the PI adequate, required
:agency: string, currently nsf, doe or other, optional

Allowed values:
Allowed values:
* nsf
* doe
* other
Expand All @@ -36,7 +36,7 @@ The following lists key names mapped to its type and meaning for each entry.
:reviewer: string, short name of the reviewer. Will be used in the filename of the resulting text file, required
:status: string, the status of the review, optional

Allowed values:
Allowed values:
* invited
* accepted
* declined
Expand Down
2 changes: 1 addition & 1 deletion doc/source/collections/proposals.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The following lists key names mapped to its type and meaning for each entry.
:pre: dict, Information about the pre-proposal, optional
:status: string, e.g. 'pending', 'accepted', 'declined', required

Allowed values:
Allowed values:
* pending
* declined
* accepted
Expand Down
4 changes: 2 additions & 2 deletions doc/source/collections/refereeReports.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ The following lists key names mapped to its type and meaning for each entry.
:month: ['integer', 'string'], The month the review was requested, optional
:recommendation: string, Your publication recommendation, required

Allowed values:
Allowed values:
* reject
* asis
* smalledits
Expand All @@ -41,7 +41,7 @@ The following lists key names mapped to its type and meaning for each entry.
:reviewer: string, name of person reviewing the paper, required
:status: string, Where you are with the review, required

Allowed values:
Allowed values:
* invited
* accepted
* declined
Expand Down
2 changes: 1 addition & 1 deletion doc/source/collections/todos.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The following lists key names mapped to its type and meaning for each entry.
:importance: integer, the importance, from 0 to 3, optional
:status: string, the status: started/finished/cancelled, optional

Allowed values:
Allowed values:
* started
* finished
* cancelled
Expand Down
2 changes: 1 addition & 1 deletion doc/source/commands/build.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ build
build_targets [build_targets ...]
positional arguments:
build_targets targets to build. Currently valid targets are:
build_targets targets to build. Currently valid targets are:
['annual-activity', 'beamplan', 'current-pending', 'cv', 'figure', 'formalletter', 'grade', 'grades', 'grant-report', 'html', 'internalhtml', 'postdocad', 'preslist', 'publist', 'reading-lists', 'reimb', 'recent-collabs', 'resume', 'review-man', 'review-prop']
options:
Expand Down
16 changes: 8 additions & 8 deletions doc/source/rc.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ The temporary location to build whatever it is needs building.
``mongodbpath``
================
The value to pass into the ``--dbpath`` option to ``mongod``. Defaults to ``'${builddir}/_dbpath'``
if unspecified.
if unspecified.


``databases``
===============
This represents the public or private databases that are used to store unstructured data about the group
This represents the public or private databases that are used to store unstructured data about the group
and its activities.

.. code-block:: python
Expand All @@ -39,7 +39,7 @@ and its activities.
``stores``
===============
This is used to represent connection information to document stores, think PDFs, images, etc.
This is used to represent connection information to document stores, think PDFs, images, etc.

.. code-block:: python
Expand All @@ -60,7 +60,7 @@ This is a string of the research group name.

``cname``
============
This is a string of the CNAME value. This will be put into a file called CNAME in the root
This is a string of the CNAME value. This will be put into a file called CNAME in the root
HTML build dir, if it is present.


Expand All @@ -83,7 +83,7 @@ This is a list of deployment targets to send information to from the build direc
``deploydir``
======================
The temporary location to for all deployment directories. If not present, this
The temporary location to for all deployment directories. If not present, this
will default to a ``deploy`` dir inside of the ``builddir``

.. code-block:: python
Expand All @@ -93,12 +93,12 @@ will default to a ``deploy`` dir inside of the ``builddir``
---------------------------------
Keys Usually Set by CLI
---------------------------------
The following keys are normally set by the command line interface. However, you
The following keys are normally set by the command line interface. However, you
can set them in the run control file should you choose to.

``cmd``
=========
The command to run.
The command to run.

.. code-block:: python
Expand All @@ -115,7 +115,7 @@ The database to use. This should coorespond to the name field of one of the ``d

``coll``
=========
The collection name inside of a database to use.
The collection name inside of a database to use.

``documents``
================
Expand Down
8 changes: 4 additions & 4 deletions src/regolith/tests/outputs/grant-report/SymPy-1.1_report_2017-04-01_2018-03-31.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ beamlines.
------------------------------------------------------------------------------
sb_firstprojectum| First Projectum| ascopatz
My first projectum

lead presents background reading and initial project plan
meeting | proposed
meeting | proposed

develop a detailed plan with dates
mergedpr | proposed
mergedpr | proposed
- Specific Objectives:
PDF in the cloud (PDFitc): Development of a web-based service for determining
structures from measured PDFs given known structures in structural databases
Expand Down
4 changes: 2 additions & 2 deletions src/regolith/tests/outputs/review-prop/1906nsfExample_sbillinge.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Intellectual Merit:
- save lives
- lift people from poverty


Creativity and Originality:
- transformative because lives will be transformed



Appropriateness of the plan:
Expand Down

0 comments on commit ff1c095

Please sign in to comment.