Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Next Release v0.6.4 #1012

Merged
merged 10 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Open terminal and navigate to where you want the code stored.
If you would like to use the latest version of `ark` simply clone the project and create the Conda environment.

```sh
git clone https://github.com/angelolab/ark-analysis.git
git clone -b v0.6.4 https://github.com/angelolab/ark-analysis.git
cd ark-analysis
conda env create -f environment.yml
```
Expand Down
9 changes: 7 additions & 2 deletions docs/_rtd/windows_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ After finishing the installer guidelines, go to your Command Prompt and type `gi

Go to [Docker for Windows install](https://docs.docker.com/desktop/windows/install) to download `Docker Desktop`.

Open the shortcut (which should be added to your Desktop after installation) and open `Docker Desktop`. If the engine starts up successfully, Docker has been configured. Note that the engine may take a while to setup properly.
Open the shortcut (which should be added to your Desktop after installation) and open `Docker Desktop`. If the engine starts up successfully, Docker has been configured. Note that the engine may take a while to set up properly.

### Setting up the repo

Expand All @@ -46,7 +46,12 @@ In your Command Prompt, follow similar steps to clone the `ark-analysis` repo an
To run the script, you have to use `bash start_docker.sh`. If you run into issues with invalid carriage returns (`\r`), please run the following before trying again:

* Run `wsl sudo apt-get install dos2unix`
* Run `wsl dos2unix start_docker.sh` and `wsl dos2unix update_notebooks.sh`
* Run the following commands:
> `wsl dos2unix start_docker.sh`

> `wsl dos2unix start_jupyter.sh`

> `wsl dos2unix update_notebooks.sh`

### Addressing `docker` not found

Expand Down
12 changes: 0 additions & 12 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,5 @@ dependencies:
- python=3.11
- pip
- hdf5
- jupyterlab
- ipywidgets
- tqdm
- numpy
- pandas
- xarray
- scipy
- scikit-image
- matplotlib
- seaborn
- pip:
- alpineer>=0.1.8
- pyFlowSOM>=0.1.5
- .[lab_ext]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
]

setup(
ext_modules=cythonize(extensions, compiler_directives={"language_level": "3"}),
ext_modules=cythonize(extensions, compiler_directives=_compiler_directives),
)
2 changes: 1 addition & 1 deletion start_docker.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

# define the version number, this needs to be updated every new Docker release
VERSION='v0.6.3'
VERSION='v0.6.4'

# check for template developer flag
JUPYTER_DIR='scripts'
Expand Down