Skip to content

Commit 79fbf70

Browse files
authored
Merge pull request #33 from AlexandrovLab/py3_12
Py3 12
2 parents f7c1f03 + 68a6845 commit 79fbf70

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
dist: xenial
1+
dist: focal
22
language: python
33

44
python:
5-
- '3.8'
5+
- '3.9'
6+
- '3.12'
67

78
install:
8-
- pip install --force-reinstall "setuptools<60.0"
99
- pip install .
1010

1111
script: python3 test.py

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
## [1.2.0] - 2024-02-24
10+
11+
### Changed
12+
- Updated dependencies: Now requires **Pandas >= 2.0.0**, **NumPy >= 2.0.0**, and **Python >= 3.9**.
13+
- Dropped support for **Python 3.8**
14+
915
## [1.1.3] - 2024-10-31
1016

1117
### Added

SigProfilerClusters/hotspot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,14 +479,14 @@ def first_run(
479479
bin_std_dev_cum.append(cumulativeBackground[l][i])
480480

481481
bin_std_dev.sort()
482-
std_dev.append(stdev(bin_std_dev))
482+
std_dev.append(stdev([int(x) for x in bin_std_dev]))
483483
mean_counts.append(mean(bin_std_dev))
484484
avg_bin_counts.append(int(round(median(bin_std_dev), 0)))
485485
upper_CI.append(bin_std_dev[CI - 1])
486486
lower_CI.append(bin_std_dev[-CI])
487487

488488
bin_std_dev_cum.sort()
489-
std_dev_cum.append(stdev(bin_std_dev_cum))
489+
std_dev_cum.append(stdev([int(x) for x in bin_std_dev_cum]))
490490
mean_counts_cum.append(median(bin_std_dev_cum))
491491

492492
y2, binEdges2 = np.histogram(distances_orig, bins=bin1)

SigProfilerClusters/version.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
# THIS FILE IS GENERATED FROM SIGPROFILECLUSTERS SETUP.PY
3-
short_version = '1.1.3'
4-
version = '1.1.3'
3+
short_version = '1.2.0'
4+
version = '1.2.0'
5+
Update = 'v1.2.0: Require Pandas and Numpy >= 2.0.0 and Python >= 3.9'
56

67

setup.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def readme():
1717
# return(f.read())
1818

1919

20-
VERSION = "1.1.3"
20+
VERSION = "1.2.0"
2121

2222

2323
def write_version_py(filename="SigProfilerClusters/version.py"):
@@ -26,6 +26,7 @@ def write_version_py(filename="SigProfilerClusters/version.py"):
2626
# THIS FILE IS GENERATED FROM SIGPROFILECLUSTERS SETUP.PY
2727
short_version = '%(version)s'
2828
version = '%(version)s'
29+
Update = 'v1.2.0: Require Pandas and Numpy >= 2.0.0 and Python >= 3.9'
2930
3031
"""
3132
fh = open(filename, "w")
@@ -51,17 +52,17 @@ def write_version_py(filename="SigProfilerClusters/version.py"):
5152
author_email="ebergstr@eng.ucsd.edu",
5253
license="UCSD",
5354
packages=find_packages(), # ['SigProfilerMatrixGenerator'],
54-
python_requires=">=3.8",
55+
python_requires=">=3.9",
5556
install_requires=[
5657
"matplotlib>=3.5",
57-
"sigProfilerPlotting>=1.3.18",
58-
"SigProfilerMatrixGenerator>=1.2.19",
59-
"SigProfilerSimulator>=1.1.5",
58+
"sigProfilerPlotting>=1.4.0",
59+
"SigProfilerMatrixGenerator>=1.3.0",
60+
"SigProfilerSimulator>=1.2.0",
6061
"statsmodels>=0.9.0",
6162
"scipy>=1.1.0",
62-
"pandas>=0.23.4",
63-
"numpy>= 1.17.3",
64-
"SigProfilerExtractor>=1.0.17",
63+
"pandas>=2.0.0",
64+
"numpy>=2.0.0",
65+
"SigProfilerExtractor>=1.2.0",
6566
"seaborn>=0.13.0",
6667
],
6768
include_package_data=True,

0 commit comments

Comments
 (0)