Skip to content

Commit

Permalink
Merge pull request #47 from IBM/v0.5.4.3b
Browse files Browse the repository at this point in the history
V0.5.4.3
  • Loading branch information
victorterpstra authored Apr 22, 2022
2 parents 96d3eea + 2751561 commit 8eadb3f
Show file tree
Hide file tree
Showing 26 changed files with 712 additions and 256 deletions.
18 changes: 17 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,24 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]## [0.5.4.3b]
## [0.5.4.3] - 2022-04-21
### Changed
- Fixed indentation bug in domodeldeployer
- Update of CONTRIBUTING.md
- Format thousands for num rows in db-insert progress print message
### Added
- DOModelDeployer support for gz/zip package files
- ScenarioManager.load_data_from_parquet and .write_data_to_parquet
- ScenarioDbManager.__init__ added parameter `enable_debug_print` to print connection string

## [Unreleased]## [0.5.4.3b0]
### Changed
- Fixed bug in ScenarioDbManager._check_schema_name if schema is None (e.g. when using SQLite)
- ScenarioDbTable.insert_table_in_db_bulk selects columns present in both the df and the schema. Avoids error when column is defined in DB but not in df.
### Added
- Added 'group' as reserved table name
- Added `local_relative_data_path` in ScenarioManager.__init__() to allow more flexibility in defining local paths
- ScenarioDbManager.__init__ added parameter `enable_astype: bool = True`: If True, force data-type of DataFrame to match schema before (bulk) insert.

## [0.5.4.2] - 2022-02-24
### Changed
Expand Down
19 changes: 7 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
VT 20190107: UNDER CONSTRUCTION. Copied from IBM repo-template (https://github.com/IBM/repo-template)
Needs to be updated for this project.

## Contributing In General
Our project welcomes external contributions. If you have an itch, please feel
free to scratch it.

To contribute code or documentation, please submit a **FIXME** [pull request](https://github.com/ibm/repo-template/pulls).
To contribute code or documentation, please submit a [pull request](https://github.com/IBM/dse-decision-optimization-utilities/pulls).

A good way to familiarize yourself with the codebase and contribution process is
to look for and tackle low-hanging fruit in the **FIXME** [issue tracker](https://github.com/ibm/repo-template/issues).
to look for and tackle low-hanging fruit in the [issue tracker](https://github.com/IBM/dse-decision-optimization-utilities/issues).
Before embarking on a more ambitious contribution, please quickly [get in touch](#communication) with us.

**Note: We appreciate your effort, and want to avoid a situation where a contribution
Expand All @@ -17,14 +14,14 @@ cannot be accepted at all!**

### Proposing new features

If you would like to implement a new feature, please **FIXME** [raise an issue](https://github.com/ibm/repo-template/issues)
If you would like to implement a new feature, please [raise an issue](https://github.com/IBM/dse-decision-optimization-utilities/issues)
before sending a pull request so the feature can be discussed. This is to avoid
you wasting your valuable time working on a feature that the project developers
are not interested in accepting into the code base.

### Fixing bugs

If you would like to fix a bug, please **FIXME** [raise an issue](https://github.ibm.com/chrisfer/social-coding/issues) before sending a
If you would like to fix a bug, please [raise an issue](https://github.com/IBM/dse-decision-optimization-utilities/issues) before sending a
pull request so it can be tracked.

### Merge approval
Expand Down Expand Up @@ -72,16 +69,14 @@ git commit -s
```

## Communication
**FIXME** Please feel free to connect with us on our [Slack channel](link).
Please feel free to connect with us on [email](https://github.com/IBM/dse-decision-optimization-utilities/blob/master/MAINTAINERS.md).

## Setup
**FIXME** Please add any special setup instructions for your project to help the developer
become productive quickly.
Include dse_do_utilities in the yaml of a CPD custom environment

## Testing
**FIXME** Please provide information that helps the developer test any changes they make
before submitting.

## Coding style guidelines
**FIXME** Optional, but recommended: please share any specific style guidelines you might
have for your project.
Using Google code and documentation style guidelines.
Binary file modified docs/doc_build/doctrees/dse_do_utils.doctree
Binary file not shown.
Binary file modified docs/doc_build/doctrees/environment.pickle
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/doc_build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: e282d28f7964e170cdc546362c13f720
config: a2fef2d4d97989a7a252359bf54f6f01
tags: 645f666f9bcd5a90fca523b33c5a78b7
168 changes: 102 additions & 66 deletions docs/doc_build/html/_modules/dse_do_utils/domodeldeployer.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/doc_build/html/_modules/dse_do_utils/mapmanager.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>dse_do_utils.mapmanager &#8212; DSE DO Utils 0.5.4.2 documentation</title>
<title>dse_do_utils.mapmanager &#8212; DSE DO Utils 0.5.4.3 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../_static/bizstyle.css" />

Expand All @@ -31,7 +31,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li class="nav-item nav-item-0"><a href="../../index.html">DSE DO Utils 0.5.4.2 documentation</a> &#187;</li>
<li class="nav-item nav-item-0"><a href="../../index.html">DSE DO Utils 0.5.4.3 documentation</a> &#187;</li>
<li class="nav-item nav-item-1"><a href="../index.html" >Module code</a> &#187;</li>
<li class="nav-item nav-item-2"><a href="../dse_do_utils.html" accesskey="U">dse_do_utils</a> &#187;</li>
<li class="nav-item nav-item-this"><a href="">dse_do_utils.mapmanager</a></li>
Expand Down Expand Up @@ -353,7 +353,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li class="nav-item nav-item-0"><a href="../../index.html">DSE DO Utils 0.5.4.2 documentation</a> &#187;</li>
<li class="nav-item nav-item-0"><a href="../../index.html">DSE DO Utils 0.5.4.3 documentation</a> &#187;</li>
<li class="nav-item nav-item-1"><a href="../index.html" >Module code</a> &#187;</li>
<li class="nav-item nav-item-2"><a href="../dse_do_utils.html" >dse_do_utils</a> &#187;</li>
<li class="nav-item nav-item-this"><a href="">dse_do_utils.mapmanager</a></li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>dse_do_utils.optimizationengine &#8212; DSE DO Utils 0.5.4.2 documentation</title>
<title>dse_do_utils.optimizationengine &#8212; DSE DO Utils 0.5.4.3 documentation</title>
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../_static/bizstyle.css" />

Expand All @@ -31,7 +31,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li class="nav-item nav-item-0"><a href="../../index.html">DSE DO Utils 0.5.4.2 documentation</a> &#187;</li>
<li class="nav-item nav-item-0"><a href="../../index.html">DSE DO Utils 0.5.4.3 documentation</a> &#187;</li>
<li class="nav-item nav-item-1"><a href="../index.html" >Module code</a> &#187;</li>
<li class="nav-item nav-item-2"><a href="../dse_do_utils.html" accesskey="U">dse_do_utils</a> &#187;</li>
<li class="nav-item nav-item-this"><a href="">dse_do_utils.optimizationengine</a></li>
Expand Down Expand Up @@ -350,7 +350,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li class="nav-item nav-item-0"><a href="../../index.html">DSE DO Utils 0.5.4.2 documentation</a> &#187;</li>
<li class="nav-item nav-item-0"><a href="../../index.html">DSE DO Utils 0.5.4.3 documentation</a> &#187;</li>
<li class="nav-item nav-item-1"><a href="../index.html" >Module code</a> &#187;</li>
<li class="nav-item nav-item-2"><a href="../dse_do_utils.html" >dse_do_utils</a> &#187;</li>
<li class="nav-item nav-item-this"><a href="">dse_do_utils.optimizationengine</a></li>
Expand Down
Loading

0 comments on commit 8eadb3f

Please sign in to comment.