Skip to content

Commit

Permalink
Merge main back into develop (#41)
Browse files Browse the repository at this point in the history
* added ecp functionality

* add macos folders to gitignore

* more options for setting basis

* ecp tests and updates

* fix linting

* add raises regex match

* update flake8

* fix pre-commit and linting

* more linting

* fix fmt parameter to comply with pymatgen new convention

* Updated version and documentation for 1.3.1 release.

* Update version of isort in .pre-commit-config

This is to solve an issue with poetry config that is used in isort.

* Update pyproject.toml

Changed requirement on pymatgen version.

* Update pyproject.toml

Updated monty's dependency

* Fixed comparison in test_files.

* Fixed comparison utility function for tests.

* Linting.

* Fixed import error of plotting function from pymatgen for py3.9+.

* Updated docs html.

---------

Co-authored-by: Will Laderer <[email protected]>
Co-authored-by: Guido Petretto <[email protected]>
  • Loading branch information
3 people authored Feb 21, 2024
1 parent 958eff4 commit ce5848c
Show file tree
Hide file tree
Showing 112 changed files with 6,226 additions and 28,329 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ repos:
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
rev: 5.6.4
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/pycqa/pydocstyle
Expand Down
1,838 changes: 0 additions & 1,838 deletions docs/_modules/cerberus/validator.html

This file was deleted.

155 changes: 34 additions & 121 deletions docs/_modules/index.html
Original file line number Diff line number Diff line change
@@ -1,89 +1,49 @@


<!DOCTYPE html>
<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
<html class="writer-html5" lang="en">
<head>
<meta charset="utf-8">

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Overview: module code &mdash; turbomoleio 1.3.0 documentation</title>






<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Overview: module code &mdash; turbomoleio 1.3.1 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=fa44fd50" />
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css?v=19f00094" />


<script type="text/javascript" src="../_static/js/modernizr.min.js"></script>


<script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
<script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js"></script>
<script src="../_static/jquery.js"></script>
<script src="../_static/underscore.js"></script>
<script src="../_static/doctools.js"></script>

<script type="text/javascript" src="../_static/js/theme.js"></script>



<!--[if lt IE 9]>
<script src="../_static/js/html5shiv.min.js"></script>
<![endif]-->

<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<script src="../_static/jquery.js?v=5d32c60e"></script>
<script src="../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js?v=992bbb82"></script>
<script src="../_static/doctools.js?v=888ff710"></script>
<script src="../_static/sphinx_highlight.js?v=4825356b"></script>
<script src="../_static/js/theme.js"></script>
<link rel="index" title="Index" href="../genindex.html" />
<link rel="search" title="Search" href="../search.html" />
</head>

<body class="wy-body-for-nav">


<body class="wy-body-for-nav">
<div class="wy-grid-for-nav">

<nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-scroll">
<div class="wy-side-nav-search" >



<a href="../index.html" class="icon icon-home"> turbomoleio



<a href="../index.html" class="icon icon-home">
turbomoleio
</a>




<div class="version">
1.3.0
1.3.1
</div>




<div role="search">
<form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
<input type="text" name="q" placeholder="Search docs" />
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
</div>


</div>

<div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">






</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
<p class="caption" role="heading"><span class="caption-text">User guide</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../datagroups.html">The data group files</a></li>
Expand All @@ -108,64 +68,29 @@
<li class="toctree-l1"><a class="reference internal" href="../bugs.html">Reporting bugs</a></li>
</ul>



</div>
</div>
</nav>

<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">


<nav class="wy-nav-top" aria-label="top navigation">

<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" >
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="../index.html">turbomoleio</a>

</nav>


<div class="wy-nav-content">

<div class="rst-content">

















<div role="navigation" aria-label="breadcrumbs navigation">

<div role="navigation" aria-label="Page navigation">
<ul class="wy-breadcrumbs">

<li><a href="../index.html">Docs</a> &raquo;</li>

<li>Overview: module code</li>


<li><a href="../index.html" class="icon icon-home" aria-label="Home"></a></li>
<li class="breadcrumb-item active">Overview: module code</li>
<li class="wy-breadcrumbs-aside">

</li>

</ul>


<hr/>
</div>
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">

<h1>All modules for which code is available</h1>
<ul><li><a href="turbomoleio/core/base.html">turbomoleio.core.base</a></li>
<li><a href="turbomoleio/core/control.html">turbomoleio.core.control</a></li>
Expand Down Expand Up @@ -194,42 +119,30 @@ <h1>All modules for which code is available</h1>
</ul>

</div>

</div>
<footer>


<hr/>

<div role="contentinfo">
<p>
&copy; Copyright 2018-2022 BASF SE, Matgenix SRL

</p>
<p>&#169; Copyright 2018-2022 BASF SE, Matgenix SRL.</p>
</div>
Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/rtfd/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.

</footer>
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
<a href="https://github.com/readthedocs/sphinx_rtd_theme">theme</a>
provided by <a href="https://readthedocs.org">Read the Docs</a>.


</footer>
</div>
</div>

</section>

</div>



<script type="text/javascript">
<script>
jQuery(function () {
SphinxRtdTheme.Navigation.enable(true);
});
</script>





</script>

</body>
</html>
Loading

0 comments on commit ce5848c

Please sign in to comment.