Skip to content

Commit

Permalink
merge va/update-bm into develop and fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentadam87 committed Apr 22, 2024
2 parents 70347df + c3f80fb commit bf19f8b
Show file tree
Hide file tree
Showing 30 changed files with 2,444 additions and 1,055 deletions.
67 changes: 30 additions & 37 deletions .github/workflows/quality-check.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 The Markovflow Contributors.
# Copyright 2021 The banded_matrices Contributors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -20,60 +20,53 @@ on:
types:
- created


jobs:
check-and-test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [3.7]
poetry-version: [1.1.6]
python-version: ["3.7", "3.8.12", "3.9.12", "3.10.4"]
poetry-version: [1.1.12]
name: Python-${{ matrix.python-version }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
# ------------ Install poetry

- name: Setup pip/poetry
run: |
pip install -U pip poetry twine
poetry config virtualenvs.create false
# ------------ install tools
- name: Install building tools
run: |
sudo apt-get install build-essential
sudo apt-get install cmake g++-7
# ------------ build and install package
- name: Install package
- name: Install Python dependencies
run: poetry install
# ------------ run tests
- name: Run tests
run: poetry run task test
pypi:
needs: check-and-test
if: ${{ github.event.release }}
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
poetry-version: [1.1.6]
name: Release PyPi package
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
# ------------ Install poetry
- name: Setup pip/poetry

- name: Configure environment variables for CMake
run: |
pip install -U pip poetry twine
poetry config virtualenvs.create false
# ------------ install tools
echo "PYTHON_BIN=$(which python)" >> $GITHUB_ENV
- name: Install building tools
run: |
sudo apt-get install build-essential
sudo apt-get install cmake g++-7
# ------------ build and install package
sudo apt-get update
sudo apt-get install -y build-essential cmake g++-14
- name: Configure and Build C++ Library
run: |
mkdir -p banded_matrices/build
cd banded_matrices/build
cmake .. -DCMAKE_BUILD_TYPE=Release
make
- name: Install package
run: poetry install

- name: Set environment variables for tests
run: |
echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/banded_matrices/build/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
- name: Run tests
run: poetry run task test

132 changes: 132 additions & 0 deletions .github/workflows/upload-pypi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# Copyright 2021 The banded_matrices Contributors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Upload-PyPI



on:
push:
tags:
- "v*.*.*"

jobs:
check-and-test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ["3.7", "3.8.12", "3.9.12", "3.10.4"]
poetry-version: [1.1.12]
name: Python-${{ matrix.python-version }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Setup pip/poetry
run: |
pip install -U pip poetry twine
poetry config virtualenvs.create false
- name: Install Python dependencies
run: poetry install

- name: Configure environment variables for CMake
run: |
echo "PYTHON_BIN=$(which python)" >> $GITHUB_ENV
- name: Install building tools
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake g++-14
- name: Configure and Build C++ Library
run: |
mkdir -p banded_matrices/build
cd banded_matrices/build
cmake .. -DCMAKE_BUILD_TYPE=Release
make
- name: Install package
run: poetry install

- name: Set environment variables for tests
run: |
echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/banded_matrices/build/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
- name: Run tests
run: poetry run task test

pypi:
# needs: check-and-test
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8.12", "3.9.12", "3.10.4"]
poetry-version: [1.1.12]
name: Release PyPi package
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
# ------------ check version matches tag
- name: Verify git tag vs. VERSION
run: |
VERSION="v$(cat VERSION | tr -d '\t\r\n ')"
TAG="${GITHUB_REF/refs\/tags\//}"
if [ "$VERSION" != "$TAG" ]; then
echo "The package version ($VERSION) and the latest tag version ($TAG) are different"
exit 1
fi
- name: Setup pip/poetry
run: |
pip install -U pip poetry twine
poetry config virtualenvs.create false
- name: Install Python dependencies
run: poetry install

- name: Configure environment variables for CMake
run: |
echo "PYTHON_BIN=$(which python)" >> $GITHUB_ENV
- name: Install building tools
run: |
sudo apt-get update
sudo apt-get install -y build-essential cmake g++-14
- name: Configure and Build C++ Library
run: |
mkdir -p banded_matrices/build
cd banded_matrices/build
cmake .. -DCMAKE_BUILD_TYPE=Release
make
- name: Install package
run: |
poetry install
poetry build
- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.7.4
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"qr": "cpp"
}
}
129 changes: 129 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@

# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement (the [project maintainers](CONTRIBUTING.md#who-are-we?)) by private message on the [Slack workspace](https://secondmind-labs.slack.com).
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.

Loading

0 comments on commit bf19f8b

Please sign in to comment.