Skip to content

Commit

Permalink
Merge branch 'develop' into dragon_launcher
Browse files Browse the repository at this point in the history
  • Loading branch information
ankona committed May 7, 2024
2 parents 9fd7fe6 + 674b421 commit 9312176
Show file tree
Hide file tree
Showing 110 changed files with 2,339 additions and 1,526 deletions.
56 changes: 56 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#
# BSD 2-Clause License
#
# Copyright (c) 2021-2024, Hewlett Packard Enterprise
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

changelog:
exclude:
labels:
- ignore-for-release
categories:
- title: Features
labels:
- 'type: feature'
exclude:
labels:
- non-user-facing
- title: Bug Fixes
labels:
- 'bug: critical'
- 'bug: major'
- 'bug: minor'
exclude:
labels:
- non-user-facing
- title: API Breaks
labels:
- 'API break'
exclude:
labels:
- non-user-facing
- title: Miscellaneous Improvements
labels:
- "*"
10 changes: 5 additions & 5 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Changelog Enforcer
uses: dangoslen/changelog-enforcer@v3.6.0
with:
changeLogPath: "./doc/changelog.rst"
missingUpdateErrorMessage: "changelog.rst has not been updated"
- name: Changelog Enforcer
uses: dangoslen/changelog-enforcer@v3.6.0
with:
changeLogPath: './doc/changelog.md'
missingUpdateErrorMessage: 'changelog.md has not been updated'
17 changes: 15 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-12]
os: [ubuntu-22.04, macos-12]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.8'
python-version: '3.9'

- name: Build sdist
run: |
Expand All @@ -124,3 +124,16 @@ jobs:
user: __token__
password: ${{ secrets.PYPI }}
#repository_url: https://test.pypi.org/legacy/


createPullRequest:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Create pull request
run: |
gh pr create -B develop -H master --title 'Merge master into develop' --body 'This PR brings develop up to date with master for release.'
env:
GH_TOKEN: ${{ github.token }}
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
fail-fast: false
matrix:
subset: [backends, slow_tests, group_a, group_b]
os: [macos-12, macos-14, ubuntu-20.04] # Operating systems
os: [macos-12, macos-14, ubuntu-22.04] # Operating systems
compiler: [8] # GNU compiler version
rai: [1.2.7] # Redis AI versions
py_v: ["3.9", "3.10", "3.11"] # Python versions
Expand Down
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,5 @@ smartsim/_core/bin/*-cli
# created upon install
smartsim/_core/lib

**/manifest/
**/*.err
**/*.out
**/.smartsim/*

# optional dev tools
.pre-commit-config.yaml
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ valid-metaclass-classmethod-first-arg=mcs
max-args=9

# Maximum number of locals for function / method body
max-locals=20
max-locals=25

# Maximum number of return / yield for function / method body
max-returns=11
Expand Down
3 changes: 0 additions & 3 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -702,11 +702,8 @@ def make_test_file(
"""Create a dummy file in the test output directory.
:param file_name: name of file to create, e.g. "file.txt"
:type file_name: str
:param file_dir: path
:type file_dir: str
:return: String path to test output file
:rtype: str
"""
file_path = os.path.join(file_dir, file_name)
os.makedirs(file_dir)
Expand Down
2 changes: 2 additions & 0 deletions doc/api/smartsim_api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Experiment
Experiment.get_status
Experiment.reconnect_orchestrator
Experiment.summary
Experiment.telemetry

.. autoclass:: Experiment
:show-inheritance:
Expand Down Expand Up @@ -407,6 +408,7 @@ Orchestrator
Orchestrator.set_max_clients
Orchestrator.set_max_message_size
Orchestrator.set_db_conf
Orchestrator.telemetry

Orchestrator
------------
Expand Down
Loading

0 comments on commit 9312176

Please # to comment.