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

Small code corrections #1562

Merged

Conversation

JPBergsma
Copy link
Contributor

Several small changes I came across over the past months.
The most important one is to increase the sleep time for the elastic search container, as it takes more than 10 seconds to start on my laptop.

# Conflicts:
#	openapi/openapi.json
#	optimade/models/__init__.py
#	optimade/models/jsonapi.py
#	optimade/models/structures.py
#	optimade/server/mappers/__init__.py
#	optimade/server/middleware.py
#	optimade/server/routers/info.py
#	optimade/server/routers/utils.py
#	optimade/server/schemas.py
#	optimade/server/warnings.py
#	optimade/validator/config.py
#	requirements.txt
#	setup.py
#	tests/server/conftest.py
#	tests/server/test_mappers.py
-query_parameters flag and removed config_file field from default config example.
@JPBergsma JPBergsma marked this pull request as draft March 15, 2023 14:29
# Conflicts:
#	openapi/openapi.json
#	optimade/server/entry_collections/entry_collections.py
#	optimade/server/routers/utils.py
#	providers
#	requirements.txt
@JPBergsma JPBergsma force-pushed the JPBergsma/small_code_corrections branch from 7e359be to 250d0fd Compare March 15, 2023 14:53
@codecov
Copy link

codecov bot commented Mar 15, 2023

Codecov Report

Merging #1562 (60343db) into master (d779725) will increase coverage by 0.02%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #1562      +/-   ##
==========================================
+ Coverage   91.09%   91.12%   +0.02%     
==========================================
  Files          74       74              
  Lines        4538     4541       +3     
==========================================
+ Hits         4134     4138       +4     
+ Misses        404      403       -1     
Flag Coverage Δ
project 91.12% <100.00%> (+0.02%) ⬆️
validator 91.01% <100.00%> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
optimade/server/middleware.py 95.33% <ø> (+0.63%) ⬆️
optimade/__init__.py 100.00% <100.00%> (ø)
...made/server/entry_collections/entry_collections.py 97.91% <100.00%> (+0.07%) ⬆️
optimade/server/routers/utils.py 95.93% <100.00%> (-0.04%) ⬇️
optimade/validator/utils.py 94.59% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@JPBergsma JPBergsma marked this pull request as ready for review March 15, 2023 15:14
@JPBergsma JPBergsma changed the title Jp bergsma/small code corrections Small code corrections Mar 15, 2023
ml-evs
ml-evs previously approved these changes Mar 16, 2023
Copy link
Member

@ml-evs ml-evs left a comment

Choose a reason for hiding this comment

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

Thanks @JPBergsma, couple of minor comments but I'll approve and you can do as you wish

docs/static/default_config.json Outdated Show resolved Hide resolved
@@ -3645,8 +3645,8 @@
"description": "Cartesian positions of each site in the structure.\nA site is usually used to describe positions of atoms; what atoms can be encountered at a given site is conveyed by the `species_at_sites` property, and the species themselves are described in the `species` property.\n\n- **Type**: list of list of floats\n\n- **Requirements/Conventions**:\n - **Support**: SHOULD be supported by all implementations, i.e., SHOULD NOT be `null`.\n - **Query**: Support for queries on this property is OPTIONAL.\n If supported, filters MAY support only a subset of comparison operators.\n - It MUST be a list of length equal to the number of sites in the structure, where every element is a list of the three Cartesian coordinates of a site expressed as float values in the unit angstrom (\u00c5).\n - An entry MAY have multiple sites at the same Cartesian position (for a relevant use of this, see e.g., the property `assemblies`).\n\n- **Examples**:\n - `[[0,0,0],[0,0,2]]` indicates a structure with two sites, one sitting at the origin and one along the (positive) *z*-axis, 2 \u00c5 away from the origin.",
"nullable": true,
"x-optimade-queryable": "optional",
"x-optimade-support": "should",
"x-optimade-unit": "\u00c5"
"x-optimade-unit": "\u00c5",
Copy link
Member

Choose a reason for hiding this comment

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

I'm really confused about what order this thing keeps changing it to (see #1429)... all the other changes are fine as they are alphabetical but this one seems to be the opposite.

Copy link
Member

Choose a reason for hiding this comment

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

Okay I think the issue is actually with the release workflow, which keeps changing it back: 01101a4

Co-authored-by: Matthew Evans <7916000+ml-evs@users.noreply.github.com>
@JPBergsma JPBergsma merged commit 88166c7 into Materials-Consortia:master Mar 16, 2023
12 checks passed
@JPBergsma JPBergsma deleted the JPBergsma/small_code_corrections branch March 16, 2023 15:38
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.

None yet

2 participants