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.

Sign up for GitHub

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

Jump to bottom

Use https://provider.optimade.org/providers.json #187

Merged
merged 2 commits into from
Feb 19, 2020
Merged

Use https://provider.optimade.org/providers.json #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8662940
Use https://provider.optimade.org/providers.json
CasperWA Feb 19, 2020
dd7f25c
Add explicit idna dependency
CasperWA Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ mongomock==3.19.0
django==2.2.10
elasticsearch-dsl==6.4.0
Jinja2==2.11.1
idna==2.8
1 change: 1 addition & 0 deletions .github/workflows/requirements_eager.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ mongomock
django
elasticsearch_dsl
Jinja2
idna
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
The aim of OPTiMaDe is to develop a common API, compliant with the [JSON API 1.0](http://jsonapi.org/format/1.0/) specification.
This is to enable interoperability among databases that contain calculated properties of existing and hypothetical materials.

This repository contains a library of tools for implementing and consuming [OPTiMaDe](http://www.optimade.org) APIs using Python.
This repository contains a library of tools for implementing and consuming [OPTiMaDe](https://www.optimade.org) APIs using Python.

## Status

Expand Down
2 changes: 1 addition & 1 deletion optimade/server/index_links.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "test_server",
"type": "child",
"name": "OPTiMaDe API",
"description": "The [Open Databases Integration for Materials Design (OPTiMaDe) consortium](http://http://www.optimade.org/) aims to make materials databases interoperational by developing a common REST API.",
"description": "The [Open Databases Integration for Materials Design (OPTiMaDe) consortium](https://www.optimade.org/) aims to make materials databases interoperational by developing a common REST API.",
"base_url": "http://localhost:5000/optimade",
"homepage": "https://example.com"
}
Expand Down
4 changes: 2 additions & 2 deletions optimade/server/routers/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,11 @@ def mongo_id_for_database(database_id: str, database_type: str) -> str:


def get_providers():
"""Retrieve Materials-Consortia providers (from https://www.optimade.org/providers/links)"""
"""Retrieve Materials-Consortia providers (from https://providers.optimade.org/providers.json)"""
import requests

mat_consortia_providers = requests.get(
"https://www.optimade.org/providers/links"
"https://providers.optimade.org/providers.json"
).json()

providers_list = []
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"pydantic~=1.4",
"email_validator",
"requests",
"idna<2.9", # Set to avoid problems with requests
],
extras_require={
"all": all_deps,
Expand Down