Merge pull request #20 from OBrink/dev-Kohulan

Install pikachu via pypi, setup and tox updated for python 3.10
OBrink · Sep 26, 2022 · 28f7e95 · 28f7e95
2 parents 40a952e + 60606b3
commit 28f7e95
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ci_pytest.yml b/.github/workflows/ci_pytest.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: ['3.10']
 
     steps:
       - uses: actions/checkout@v2

diff --git a/CITATION.cff b/CITATION.cff
@@ -8,7 +8,7 @@ authors:
   given-names: "Kohulan"
   orcid: "https://orcid.org/0000-0003-1066-7792"
 title: "RanDepict"
-version: 1.0.8
+version: 1.0.9
 doi: 10.5281/zenodo.5205528
 date-released: 2021-08-17
 url: "https://github.com/OBrink/RanDepict"

diff --git a/Python_requirements.txt b/Python_requirements.txt
@@ -4,3 +4,4 @@ scikit-image
 epam.indigo
 jpype1
 ipyplot
+pikachu-chem>=1.0.7
diff --git a/RanDepict/__init__.py b/RanDepict/__init__.py
@@ -21,7 +21,7 @@
 
 """
 
-__version__ = "1.0.8"
+__version__ = "1.0.9"
 
 __all__ = [
     "RanDepict",

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="RanDepict",
-    version="1.0.8",
+    version="1.0.9",
     author="Otto Brinkhaus",
     author_email="[email protected], [email protected]",
     maintainer="Otto Brinkhaus, Kohulan Rajan",
@@ -28,7 +28,7 @@
         "rdkit-pypi",
         "imagecorruptions",
         "pillow>=8.2.0",
-        "pikachu-chem @ git+https://github.com/OBrink/pikachu@accept-markush-structures#egg=pikachu-chem",
+        "pikachu-chem>=1.0.7",
     ],
     package_data={"RanDepict": ["assets/*.*", "assets/*/*.*", "assets/*/*/*.*"]},
     classifiers=[
@@ -37,6 +37,8 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3 :: Only",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,lint
+envlist = py38,py39,py310,lint
 requires = tox-conda
 
 [testenv]
@@ -45,5 +45,3 @@ exclude =
     RanDepict/__init__.py,
     Tests/test_functions.py,
 
-
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ scikit-image @@
     epam.indigo
     jpype1
     ipyplot
+    pikachu-chem>=1.0.7