Skip to content

Commit 7275b13

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 3c7dadd + cb26bb9 commit 7275b13

File tree

6 files changed

+40
-13
lines changed

6 files changed

+40
-13
lines changed

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
# Changelog
22

3+
## [1.4.0](https://github.com/Steinbeck-Lab/RanDepict/compare/v1.3.1...v1.4.0) (2024-10-28)
4+
5+
6+
### Features
7+
8+
* add Release-please for automated releases ([cb8a74f](https://github.com/Steinbeck-Lab/RanDepict/commit/cb8a74f7f1d651808c9805a4db02167ded3bafec))
9+
* automated_pypi_releases ([deeaa91](https://github.com/Steinbeck-Lab/RanDepict/commit/deeaa9142a95d4a11b00e2284364822c1d774dd2))
10+
* orderly enumeration of R group indices ([0481aaa](https://github.com/Steinbeck-Lab/RanDepict/commit/0481aaa126d850ded383350c19890efcf0ec4c19))
11+
* update version path for release-please ([94a4ff5](https://github.com/Steinbeck-Lab/RanDepict/commit/94a4ff5574c0f3fb7039820d4ecdf33241fc556a))
12+
13+
14+
### Bug Fixes
15+
16+
* add Copyright info and modify theme options ([779dac0](https://github.com/Steinbeck-Lab/RanDepict/commit/779dac0c9a14e9bbba674236c654aaa9580b5c09))
17+
* Failing documentation theme issues ([987db2c](https://github.com/Steinbeck-Lab/RanDepict/commit/987db2c83b1c06edc6c82525feabc28e8a9dff2c))
18+
* file path ci_pytest.yml ([4dac10f](https://github.com/Steinbeck-Lab/RanDepict/commit/4dac10f6aaa0f94d3d1163b85e85eafd56ccd56b))
19+
* file path issue ([bd97abc](https://github.com/Steinbeck-Lab/RanDepict/commit/bd97abc79bab83f25260fbb4df67eeae6b84e7a8))
20+
* indentation ci_pytest.yml ([fb19534](https://github.com/Steinbeck-Lab/RanDepict/commit/fb19534327a945f4d0d90f266521a5a840e90276))
21+
* only remove PIKAChU if it is there initially (caused crash) ([3b5d3e0](https://github.com/Steinbeck-Lab/RanDepict/commit/3b5d3e012916d445bbe4ffc2bf888c6d0f728c30))
22+
* tests ([febbb19](https://github.com/Steinbeck-Lab/RanDepict/commit/febbb19b574f66cc027be87ac7794f7f3bc9a8a2))
23+
* version bump 1.3.0 ([adf25e5](https://github.com/Steinbeck-Lab/RanDepict/commit/adf25e5d8c29ed64c79b7d37e24834052b6b6b67))
24+
25+
26+
### Documentation
27+
28+
* version bump: 1.1.8-->1.1.9 ([9c54d7c](https://github.com/Steinbeck-Lab/RanDepict/commit/9c54d7c269b9b53baedef02e4af67fe218960d3c))
29+
330
## [1.3.1](https://github.com/OBrink/RanDepict/compare/v1.3.0...v1.3.1) (2023-09-22)
431

532

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![License](https://img.shields.io/badge/License-MIT%202.0-blue.svg)](https://opensource.org/licenses/MIt)
22
[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-blue.svg)](https://github.com/OBrink/RanDepict/graphs/commit-activity)
3-
![Workflow](https://github.com/OBrink/RanDepict/actions/workflows/ci_pytest.yml/badge.svg)
3+
![Workflow](https://github.com/Steinbeck-Lab/RanDepict/actions/workflows/ci_pytest.yml/badge.svg)
44
[![GitHub issues](https://img.shields.io/github/issues/OBrink/RanDepict.svg)](https://GitHub.com/OBrink/RanDepict/issues/)
55
[![GitHub contributors](https://img.shields.io/github/contributors/OBrink/RanDepict.svg)](https://GitHub.com/OBrink/RanDepict/graphs/contributors/)
66
[![GitHub release](https://img.shields.io/github/release/OBrink/RanDepict.svg)](https://GitHub.com/OBrink/RanDepict/releases/)
-3.36 KB
Binary file not shown.

RanDepict/randepict.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -311,24 +311,24 @@ def get_depiction_functions(self, smiles: str) -> List[Callable]:
311311
for k in self._config.styles]
312312

313313
# Remove PIKAChU if there is an isotope
314-
if re.search("(\[\d\d\d?[A-Z])|(\[2H\])|(\[3H\])|(D)|(T)", smiles):
314+
if re.search(r"(\[\d\d\d?[A-Z])|(\[2H\])|(\[3H\])|(D)|(T)", smiles):
315315
if self.pikachu_depict in depiction_functions:
316316
depiction_functions.remove(self.pikachu_depict)
317317
if self.has_r_group(smiles):
318318
# PIKAChU only accepts \[[RXZ]\d*\]
319-
squared_bracket_content = re.findall("\[.+?\]", smiles)
319+
squared_bracket_content = re.findall(r"\[.+?\]", smiles)
320320
for r_group in squared_bracket_content:
321-
if not re.search("\[[RXZ]\d*\]", r_group):
321+
if not re.search(r"\[[RXZ]\d*\]", r_group):
322322
if self.pikachu_depict in depiction_functions:
323323
depiction_functions.remove(self.pikachu_depict)
324324
# "R", "X", "Z" are not depicted by RDKit
325325
# The same is valid for X,Y,Z and a number
326326
if self.rdkit_depict in depiction_functions:
327-
if re.search("\[[RXZ]\]|\[[XYZ]\d+", smiles):
327+
if re.search(r"\[[RXZ]\]|\[[XYZ]\d+", smiles):
328328
depiction_functions.remove(self.rdkit_depict)
329329
# "X", "R0", [RXYZ]\d+[a-f] and indices above 32 are not depicted by Indigo
330330
if self.indigo_depict in depiction_functions:
331-
if re.search("\[R0\]|\[X\]|[4-9][0-9]+|3[3-9]|[XYZR]\d+[a-f]", smiles):
331+
if re.search(r"\[R0\]|\[X\]|[4-9][0-9]+|3[3-9]|[XYZR]\d+[a-f]", smiles):
332332
depiction_functions.remove(self.indigo_depict)
333333
# Workaround because PIKAChU fails to depict large structures
334334
# TODO: Delete workaround when problem is fixed in PIKAChU
@@ -739,7 +739,7 @@ def has_r_group(self, smiles: str) -> bool:
739739
Returns:
740740
bool
741741
"""
742-
if re.search("\[.*[RXYZ].*\]", smiles):
742+
if re.search(r"\[.*[RXYZ].*\]", smiles):
743743
return True
744744

745745
def _smiles_to_mol_block(
@@ -776,7 +776,7 @@ def _smiles_to_mol_block(
776776
molecule = self._cdk_rotate_coordinates(molecule)
777777
return self._cdk_iatomcontainer_to_mol_block(molecule)
778778
elif generate_2d == "rdkit":
779-
if re.search("\[[RXZ]\]|\[[XYZ]\d+", smiles):
779+
if re.search(r"\[[RXZ]\]|\[[XYZ]\d+", smiles):
780780
return self._smiles_to_mol_block(smiles, generate_2d="cdk")
781781
mol_block = self._smiles_to_mol_block(smiles)
782782
molecule = Chem.MolFromMolBlock(mol_block, sanitize=False)
@@ -789,7 +789,7 @@ def _smiles_to_mol_block(
789789
else:
790790
raise ValueError(f"RDKit could not read molecule: {smiles}")
791791
elif generate_2d == "indigo":
792-
if re.search("\[R0\]|\[X\]|[4-9][0-9]+|3[3-9]|[XYZR]\d+[a-f]", smiles):
792+
if re.search(r"\[R0\]|\[X\]|[4-9][0-9]+|3[3-9]|[XYZR]\d+[a-f]", smiles):
793793
return self._smiles_to_mol_block(smiles, generate_2d="cdk")
794794
indigo = Indigo()
795795
mol_block = self._smiles_to_mol_block(smiles)

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
setuptools.setup(
99
name="RanDepict",
10-
version="1.3.1",
10+
version="1.4.0",
1111
author="Otto Brinkhaus",
1212
author_email="otto.brinkhaus@uni-jena.de, kohulan.rajan@uni-jena.de",
1313
maintainer="Otto Brinkhaus, Kohulan Rajan",
@@ -19,10 +19,10 @@
1919
packages=setuptools.find_packages(),
2020
license="MIT",
2121
install_requires=[
22-
"numpy>=1.19",
22+
"numpy==1.23.5",
2323
"imgaug",
2424
"scikit-image",
25-
"epam.indigo",
25+
"epam.indigo==1.11.0",
2626
"jpype1",
2727
"ipyplot",
2828
"rdkit",

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py37, py38, py39, py310, lint
2+
envlist = py310, lint
33
requires = tox-conda
44

55
[testenv]

0 commit comments

Comments
 (0)