Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
4f55ff5
doc(CHANGELOG): update
breakthewall Nov 4, 2025
6a97ebf
Merge branch 'rr2026'
breakthewall Feb 16, 2026
11801b2
Merge branch 'rr2026'
breakthewall Feb 16, 2026
0760835
fix: add chem_xref
breakthewall Feb 18, 2026
5f0e579
doc(CHANGELOG): update
breakthewall Feb 26, 2026
fe5fe22
fix!: don't use .gz for mnx sources
breakthewall Mar 11, 2026
257df29
fix!: add missing sources
breakthewall Mar 11, 2026
b27b71f
chore: update config files
breakthewall Mar 11, 2026
4a7173a
build: update github workflows
breakthewall Mar 11, 2026
1749ec9
style: clean up
breakthewall Mar 11, 2026
61ba139
chore: update config files
breakthewall Mar 11, 2026
ce5f710
style(setup.py): clean up
breakthewall Mar 11, 2026
e9ea7a2
trigger
breakthewall Mar 11, 2026
c7c8c1d
build: add master branch to trigger
breakthewall Mar 11, 2026
2c8add6
chore(Args.py)!: change default chemical space
breakthewall Mar 12, 2026
d6699e3
tests: refactor tests
breakthewall Mar 12, 2026
aa7dd95
build(environment-dev.yaml): add dev env file
breakthewall Mar 12, 2026
3fca4c0
build(lint.yml): install dep with environment-dev.yaml file
breakthewall Mar 12, 2026
04e6f4c
build(lint.yml): fix
breakthewall Mar 12, 2026
473bdf8
clean up
breakthewall Mar 12, 2026
ebb97b2
style: fit 'black'
breakthewall Mar 12, 2026
728e777
chore: load all available sources to build the cache
breakthewall Mar 23, 2026
0985c42
style: clean up
breakthewall Mar 23, 2026
815ebbc
feat: add --databases selection at build stage
breakthewall Mar 23, 2026
932f1c1
chore: rm fingerprints checks at load stage
breakthewall Mar 23, 2026
5da25a9
style(__main__.py): clean up
breakthewall Mar 25, 2026
1fa218d
fix(environment-dev.yaml): update env name
breakthewall Apr 8, 2026
4804934
chore(rr_cache/__init__.py): change import path
breakthewall Apr 8, 2026
0eb2f6e
chore: change arg parser handling
breakthewall Apr 8, 2026
3769d29
style: clean up
breakthewall Apr 8, 2026
a70b893
build(environment.yaml): update min dep version
breakthewall Apr 10, 2026
2082775
build(environment.yaml): fix min dep ver
breakthewall Apr 10, 2026
2ac5750
fix(rr_cache/rr_cache.py): add path to input filename
breakthewall May 21, 2026
fe15861
feat: add missing reactions in rules from mnx
breakthewall May 21, 2026
ca6744b
chore: insert reac_prop into config file
breakthewall May 22, 2026
9a8bd26
Merge pull request #5 from brsynth/update
breakthewall May 22, 2026
5b17ec3
build(environment.yaml): add dep
breakthewall May 22, 2026
a187289
update v3.5.1: add rr2026-v3. functions
Sep 22, 2026
ae33d1d
fix test
Sep 23, 2026
a8770cf
fix test name and adapt to rr2026-v3.0
Sep 23, 2026
1589b4a
fix lint
Sep 24, 2026
f6a3580
fix format
Sep 24, 2026
e4475a3
fix format 'black'
Sep 24, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions .github/workflows/check.yml

This file was deleted.

41 changes: 41 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Lint

on:
pull_request:
push:
branches:
- main
- master
- stable
- dev
paths:
- '**.py'

jobs:
lint:
if: github.head_ref != 'stable'
# if: github.actor != 'github-actions[bot]'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: ci-env
environment-file: environment.yaml
auto-activate-base: false
use-mamba: true
mamba-version: "*"

- name: Add dev dependencies
shell: bash -l {0}
run: conda env update -n ci-env -f environment-dev.yaml

- name: Run ruff
shell: bash -l {0}
run: ruff check .
- name: Run black
shell: bash -l {0}
run: black --check .
104 changes: 104 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: Publish

on:
pull_request:
branches:
- stable
types:
- closed

jobs:
Tag:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest

outputs:
new_tag: ${{ steps.tag_version.outputs.new_tag }}

steps:
############################################################
# Checkout stable branch
############################################################
- name: Checkout stable
uses: actions/checkout@v3
with:
ref: stable
fetch-depth: 0

############################################################
# Create tag
############################################################
- name: Bump version and push tag
id: tag_version
uses: mathieudutour/github-tag-action@v5.6
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
release_branches: stable
tag_prefix: ""

############################################################
# Create GitHub Release
############################################################
- name: Create Release
uses: actions/create-release@v1
with:
tag_name: ${{ steps.tag_version.outputs.new_tag }}
release_name: Release ${{ steps.tag_version.outputs.new_tag }}
body: ${{ steps.tag_version.outputs.changelog }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

############################################################
# Generate CHANGELOG
############################################################
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3
bundler-cache: true

- name: Generate CHANGELOG
env:
CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gem install github_changelog_generator
AUTH=$(echo $GITHUB_REPOSITORY | sed -e 's/\// /g' | awk '{print "--user " $1 " --project " $2}')
github_changelog_generator $AUTH --no-unreleased

############################################################
# Update _version.py
############################################################
- name: Update _version.py
env:
TAG: ${{ steps.tag_version.outputs.new_tag }}
run: |
folder=$(dirname $(find . -name _version.py))
echo "__version__ = \"$TAG\"" > $folder/_version.py

############################################################
# Commit updated files
############################################################
- name: Commit files
run: |
git config --local user.email "joan.herisson@univ-evry.fr"
git config --local user.name "breakthewall"
git add -A
git commit -m "chore(release): update changelog and version" || echo "No changes to commit"

############################################################
# Push back to stable
############################################################
- name: Push changes to stable
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: stable

############################################################
# Update main branch
############################################################
- name: Update main branch
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: main
81 changes: 0 additions & 81 deletions .github/workflows/tag.yml

This file was deleted.

52 changes: 28 additions & 24 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,43 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Tests

on:

pull_request:
push:
branches: [ main, master, dev ]
branches:
- main
- master
- stable
paths:
- '**.py'
pull_request:
branches: [ main, master ]

jobs:
test:
if: github.head_ref != 'stable'
# if: github.actor != 'github-actions[bot]'
name: Test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}

Test:

runs-on: ${{ matrix.os }}-latest
strategy:
fail-fast: false
matrix:
os: ["ubuntu", "macos", "windows"]
defaults:
run:
shell: bash -l {0}
os: [ubuntu-latest, macos-latest, windows-latest]

steps:
- name: Checkout package repository
uses: actions/checkout@v2
- name: Deploying miniconda
uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
activate-environment: ci-env
environment-file: environment.yaml
activate-environment: test
- name: Building & Testing conda package
run: |
conda install -y python pytest pytest-mock
python -m pytest
auto-activate-base: false
use-mamba: true
mamba-version: "*"

- name: Add dev dependencies
shell: bash -l {0}
run: conda env update -n ci-env -f environment-dev.yaml

- name: Run tests
shell: bash -l {0}
run: python -m pytest
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [3.5.0](https://github.com/brsynth/rr_cache/tree/3.5.0) (2026-02-18)

[Full Changelog](https://github.com/brsynth/rr_cache/compare/3.4.1...3.5.0)

## [3.4.1](https://github.com/brsynth/rr_cache/tree/3.4.1) (2025-11-04)

[Full Changelog](https://github.com/brsynth/rr_cache/compare/3.4.0...3.4.1)

## [3.4.0](https://github.com/brsynth/rr_cache/tree/3.4.0) (2025-10-22)

[Full Changelog](https://github.com/brsynth/rr_cache/compare/3.3.2...3.4.0)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ For less loading time and memory footprint, a part of the cache can be loaded:
```python
from rr_cache import rrCache

cache = rrCache(['cid_strc'])
cache.get_compound('MNXM2')
cache = rrCache(["cid_strc"])
cache.get_compound("MNXM2")
```
***From CLI***
```sh
Expand Down
12 changes: 12 additions & 0 deletions environment-dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: rr_cache
channels:
- conda-forge
- nodefaults
dependencies:
- pytest
- pytest-cov
- pytest-mock
- pytest-monitor
- black
- ruff
- mypy
3 changes: 2 additions & 1 deletion environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ channels:
- conda-forge
dependencies:
- python
- brs_utils>=1.22.1
- brs_utils>=1.26.0
- requests
- rdkit
- colored
- pandas
Loading
Loading