Skip to content

Commit

Permalink
Fixed environment and updated README
Browse files Browse the repository at this point in the history
1. Removed local dependency of pyqtgraph.
2. Muted FutureWarning from pandas.
3. Updated README file and ACT_python3.yml.
  • Loading branch information
zengjiexia committed Jul 16, 2023
1 parent 40ed980 commit 5467fff
Show file tree
Hide file tree
Showing 838 changed files with 27 additions and 69,738 deletions.
1 change: 1 addition & 0 deletions ACT_python3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ dependencies:
- pyerfa=2.0.0.3=py38hbaf524b_0
- pyimagej=1.0.2=py38haa244fe_1
- pyparsing=3.0.9=pyhd8ed1ab_0
- pyqtgraph=0.13.3=pyhd8ed1ab_0
- pyside6=6.5.1=py38hac9af9c_0
- pysocks=1.7.1=pyh0701188_6
- python=3.8.16=h4de0772_1_cpython
Expand Down
36 changes: 17 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,28 @@ Requirements

Full list please see ACT_python3.yml.

- Python 3 (tested with Python 3.6-3.9)
- os
- sys
- re
- datatime
- [opencv - 4.7.0.72](https://pypi.org/project/opencv-contrib-python/)
- [tqdm - 4.65.0](https://anaconda.org/conda-forge/tqdm)
- Python 3 (configured with Python 3.8.16)
- [astropy - 5.2.2](https://www.astropy.org/)
- [Pillow - 9.5.0](https://anaconda.org/conda-forge/pillow)
- [scipy - 1.10.1](https://www.scipy.org/)
- [numpy](https://numpy.org/)
- [math](https://docs.python.org/3/library/math.html)
- [tifffile](https://anaconda.org/conda-forge/tifffile)
- [pandas - 1.4.1](https://pandas.pydata.org/)
- [scikit-image - 0.19.3](https://scikit-image.org/)
- [scikit-learn - 1.2.2](https://scikit-learn.org/)
- [PySide 6 - 6.5.1](https://anaconda.org/conda-forge/pyside6)
- [pyqtgraph](https://github.com/pyqtgraph/pyqtgraph)(Included locally)
- [imageio - 2.31.1](https://anaconda.org/conda-forge/imageio)
- [imglyb - 2.1.0](https://anaconda.org/conda-forge/imglyb)
- [maven - 3.6.3](https://anaconda.org/conda-forge/maven)
- [numpy - 1.24.3](https://numpy.org/)
- [opencv-contrib-python - 4.7.0.72](https://pypi.org/project/opencv-contrib-python/)
- [openjdk - 8.0.332](https://anaconda.org/conda-forge/openjdk)
- [pandas - 1.4.1](https://pandas.pydata.org/)
- [pathos](https://anaconda.org/conda-forge/pathos)
- [pillow - 9.5.0](https://anaconda.org/conda-forge/pillow)
- [psutil](https://anaconda.org/conda-forge/psutil)
- [pyimagej - 1.0.2](https://github.com/imagej/pyimagej) (must install with conda-forge)
- [pyqtgraph - 0.13.3](https://github.com/pyqtgraph/pyqtgraph)
- [PySide 6 - 6.5.1](https://anaconda.org/conda-forge/pyside6)
- [scikit-image - 0.19.3](https://scikit-image.org/)
- [scikit-learn - 1.2.2](https://scikit-learn.org/)
- [scipy - 1.10.1](https://www.scipy.org/)
- [scyjava - 1.9.0](https://anaconda.org/conda-forge/scyjava)
- [skan - 0.11.0](https://github.com/jni/skan)
- [maven - 3.6.3](https://anaconda.org/conda-forge/maven)
- Openjdk - 8
- [tifffile - 2023.4.12](https://anaconda.org/conda-forge/tifffile)
- [tqdm - 4.65.0](https://anaconda.org/conda-forge/tqdm)

- [Fiji(is just imagej)](https://imagej.net/Fiji)
- [ComDet](https://github.com/ekatrukha/ComDet)
Expand Down
2 changes: 1 addition & 1 deletion UI_form/ACT.pyproject.user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.14.1, 2023-06-25T12:22:00. -->
<!-- Written by QtCreator 4.14.1, 2023-07-16T08:34:35. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
Expand Down
8 changes: 5 additions & 3 deletions logics.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
"""
Beta release for Revision of SR length measurement
v2.1.1-beta
update date: 20230613
Beta-2 release for Revision of SR length measurement
v2.1.1-beta-2
update date: 20230716
"""
import os
import re
import sys
import traceback
from datetime import datetime
import cv2
import warnings
warnings.simplefilter(action='ignore', category=FutureWarning)
import pandas as pd
from tqdm import tqdm
import numpy as np
Expand Down
6 changes: 3 additions & 3 deletions main.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
Beta release for Revision of SR length measurement
v2.1.1-beta
update date: 20230613
Beta-2 release for Revision of SR length measurement
v2.1.1-beta-2
update date: 20230716
"""
import sys
import os
Expand Down
Loading

0 comments on commit 5467fff

Please sign in to comment.