Skip to content

Commit

Permalink
Updated the toffy environment file (#434)
Browse files Browse the repository at this point in the history
* added a dev-environment, updated environment.yml

* updated python version to 3.11 for the environment.yml files

* added release and prerelese environments

* updated mibi-bin-tools and alpineer

* updated lock file

* added pywavelets

* mibi-bin-tools 0.2.12

* pymzq is not compatible with python 3.12

* set CI to python 3.11

* set latest python version, trying CI with python 3.12 again

* 3.x python

* updated pyproject.toml

* I see why I set it back to Python 3.11 now

* removed python 3.12 classifier
  • Loading branch information
srivarra authored Oct 24, 2023
1 parent 9264f13 commit 36da9e4
Show file tree
Hide file tree
Showing 7 changed files with 576 additions and 552 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
# Ensure that a wheel builder finishes even if another fails
fail-fast: false
matrix:
python-version: [3.x]
python-version: [3.11]
poetry-version: [latest]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
# Ensure that a wheel builder finishes even if another fails
fail-fast: false
matrix:
python-version: [3.x] # latest stable release
python-version: [3.11] # latest stable release
poetry-version: [latest]

steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,4 @@ scripts/
coverage.lcov

data/combined/*.csv
.idea/
1,093 changes: 549 additions & 544 deletions poetry.lock

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions prerelease-environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: toffy_prerelease_env
channels:
- conda-forge
dependencies:
- python=3.11
- pip
- numpy
- seaborn
- scikit-learn
- jupyterlab
- pip:
- natsort
- watchdog
- alpineer==0.1.10
- mibi-bin-tools==0.2.11
- jupyter_contrib_nbextensions
- -e .
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ style = "pep440"
metadata = false

[tool.poetry.dependencies]
python = ">=3.9,<3.12"
python = "^3.9,<3.12"
alpineer = ">=0.1.9"
mibi-bin-tools = "0.2.11"
mibi-bin-tools = "0.2.12"
ipywidgets = "^8"
numpy = "1.*"
natsort = "^8"
Expand All @@ -48,6 +48,7 @@ watchdog = "^3"
tqdm = "^4"
scipy = "^1.10.1"
pandas = "^2"
pywavelets = "^1.4.1"

[tool.poetry.group.test]
optional = true
Expand Down
8 changes: 4 additions & 4 deletions environment.yml → release-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: toffy_env
channels:
- conda-forge
dependencies:
- python=3.9
- python=3.11
- pip
- numpy
- seaborn
Expand All @@ -11,7 +11,7 @@ dependencies:
- pip:
- natsort
- watchdog
- alpineer==0.1.7
- mibi-bin-tools==0.2.9
- toffy==0.2.0
- alpineer==0.1.10
- mibi-bin-tools==0.2.11
- jupyter_contrib_nbextensions
- toffy==0.2.1

0 comments on commit 36da9e4

Please sign in to comment.