Skip to content

Commit

Permalink
Update version to 1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tornede authored Feb 20, 2024
2 parents a7ef40b + 4cf205b commit eec100b
Show file tree
Hide file tree
Showing 80 changed files with 10,165 additions and 5,640 deletions.
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,18 @@ dmypy.json

# todo
todo.md
config/database_credentials.cfg
config/example*.cfg

# Configs
config/database_credentials.yml
config/example_conditional_grid.yml
config/example_general_usage.yml
config/example_logtables.yml
config/example_pause_and_continue.yml
output/

# codecarbon
.codecarbon.config
emissions.csv

# development folder
development/
12 changes: 9 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"autoDocstring.docstringFormat": "sphinx",
"editor.codeActionsOnSave": {
"source.organizeImports": true,
"formatting": true
"source.organizeImports": "explicit",
"formatting": "explicit"
},
"editor.formatOnSave": true,
"python.formatting.autopep8Args": [
Expand Down Expand Up @@ -58,5 +58,11 @@
"**/.git/subtree-cache/**": true,
"**/node_modules/*/**": true
},
"esbonio.sphinx.confDir": "${workspaceFolder}\\docs"
"esbonio.sphinx.confDir": "${workspaceFolder}\\docs",
"grammarly.selectors": [
{
"language": "restructuredtext",
"scheme": "file"
}
]
}
16 changes: 16 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
Changelog
=========

v1.4.0 (20.02.2024)
===================

Feature
-------
- Add functionality to pause and later continue experiments.
- Change the supported database configuration file type to YAML.
- Change the supported credentials file type to YAML.
- Add support for ssh jump hosts in the database connection.

Fix
---
- Fix a problem when executing fill_table that caused some entries to occur twice.
- Temporary CodeCarbon files are automatically removed at termination.


v1.3.2 (23.01.2024)
===================
Expand All @@ -10,6 +25,7 @@ Feature
-------

- Add `random_order` parameter to `PyExperimenter.execute()` to allow for random order of experiments.
- Add pause functionality to `PyExperimenter` to allow for pausing the execution of experiments, which can be continued later on.

Fix
---
Expand Down
4 changes: 4 additions & 0 deletions config/database_credentials.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[CREDENTIALS]
host=apollo.ai.uni-hannover.de
user=testuser_pyexperimenter
password=c2ncKK3siSBkCuGE
4 changes: 0 additions & 4 deletions config/example_database_credentials.cfg

This file was deleted.

16 changes: 16 additions & 0 deletions config/example_database_credentials.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CREDENTIALS:
Database:
user: example_user
password: example_password
Connection:
Standard:
server: example.mysqlserver.com
Ssh:
server: example.sshmysqlserver.com (address from ssh server)
address: example.sslserver.com
port: optional_ssh_port
remote_address: optional_mysql_server_address
remote_port: optional_mysql_server_port
local_address: optional_local_address
local_port: optional_local_port
passphrase: optional_ssh_passphrase
52 changes: 20 additions & 32 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,67 +17,55 @@
from recommonmark.parser import CommonMarkParser

# -- Project information -----------------------------------------------------
project = 'PyExperimenter'
copyright = '2022, Tanja Tornede, Alexander Tornede, Lukas Fehring, Lukas Gehring, Helena Graf, Jonas Hanselle, Felix Mohr, Marcel Wever'
author = 'Tanja Tornede, Alexander Tornede, Lukas Fehring, Lukas Gehring, Helena Graf, Jonas Hanselle, Felix Mohr, Marcel Wever'
project = "PyExperimenter"
copyright = "2022, Tanja Tornede, Alexander Tornede, Lukas Fehring, Lukas Gehring, Helena Graf, Jonas Hanselle, Felix Mohr, Marcel Wever"
author = "Tanja Tornede, Alexander Tornede, Lukas Fehring, Lukas Gehring, Helena Graf, Jonas Hanselle, Felix Mohr, Marcel Wever"

# The full version, including alpha/beta/rc tags
release = '1.0'
release = "1.0"


# -- General configuration ---------------------------------------------------

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'autoapi.extension',
'recommonmark',
'nbsphinx',
'sphinx_gallery.load_style'
]
extensions = ["sphinx.ext.autodoc", "autoapi.extension", "recommonmark", "nbsphinx", "sphinx_gallery.load_style"]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = [
'_build',
'Thumbs.db',
'.DS_Store'
]
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]

source_suffix = ['.rst', '.md']
source_suffix = [".rst", ".md"]

# -- Options for HTML output -------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'sphinx_rtd_theme'
html_theme = "sphinx_rtd_theme"

html_theme_options = {
'logo_only': False,
'display_version': True,
'prev_next_buttons_location': 'bottom',
'style_external_links': True,
"logo_only": False,
"display_version": True,
"prev_next_buttons_location": "bottom",
"style_external_links": True,
# Toc options
'collapse_navigation': True,
'sticky_navigation': True,
'navigation_depth': 4,
'includehidden': True,
'titles_only': False
"collapse_navigation": True,
"sticky_navigation": True,
"navigation_depth": 4,
"includehidden": True,
"titles_only": False,
}

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = [
'_static'
]
html_static_path = ["_static"]

# -- Options for API ---------------------------------------------------------
autoapi_dirs = ['../../py_experimenter']
autoapi_dirs = ["../../py_experimenter"]
Loading

0 comments on commit eec100b

Please sign in to comment.