Skip to content

Commit

Permalink
Merge pull request #18 from jonnyjohnson1/jonny/install-script2
Browse files Browse the repository at this point in the history
another install test
  • Loading branch information
jonnyjohnson1 authored Nov 10, 2024
2 parents bde1350 + fa829f0 commit 9e28084
Show file tree
Hide file tree
Showing 8 changed files with 150 additions and 172 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ If nix is not installed:
windows: `sh <(curl -L https://nixos.org/nix/install) --daemon`
2. Run Topos and all its dependencies:
```
nix run github:jonnyjohnson1/topos-cli/v0.2.5
nix run github:jonnyjohnson1/topos-cli/v0.2.6
```
This will start all services including Topos, Postgres, Kafka, and Ollama.

Expand Down
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
}
);
toposPoetryEnv = pkgs.poetry2nix.mkPoetryEnv {
python = pkgs.python39; # set python version https://stackoverflow.com/questions/68625627/nix-flake-get-a-specific-python-version
projectDir = self;
preferWheels = true;
inherit overrides;
Expand Down
306 changes: 142 additions & 164 deletions poetry.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "topos"
version = "0.2.5"
version = "0.2.6"
description = "The official Python client for Topos."
authors = ["Dialogues <[email protected]>"]
license = "MIT"
Expand Down Expand Up @@ -38,6 +38,7 @@ pyjwt = "^2.8.0"
python-multipart = "^0.0.9"
pytest-asyncio = "^0.23.7"
textblob = "^0.18.0.post0"
numpy = "1.26.4"
pystray = "0.19.5"
aiokafka = "^0.11.0"
supabase = "^2.6.0"
Expand Down
6 changes: 2 additions & 4 deletions scripts/install.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
#!/bin/bash

# Open a new Terminal window and run nix-shell
# Force install nix on user's system: https://github.com/DeterminateSystems/nix-installer
osascript <<EOF
tell application "Terminal"
do script "cd '$TOPOS_CLI_DIR' && \
if ! command -v nix &> /dev/null && [ ! -d /nix ] && [ ! -f ~/.nix-profile/etc/profile.d/nix.sh ] && [ ! -d ~/.nix-profile ]; then \
do script "if ! command -v nix &> /dev/null && [ ! -d /nix ] && [ ! -f ~/.nix-profile/etc/profile.d/nix.sh ] && [ ! -d ~/.nix-profile ]; then \
echo 'Nix is not installed. Installing Nix...'; \
curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install --no-confirm; \
if [ -f ~/.nix-profile/etc/profile.d/nix.sh ]; then \
Expand All @@ -17,6 +15,6 @@ tell application "Terminal"
echo 'Nix installation complete.'; \
else \
echo 'Nix is already installed.'; \
fi && nix run github:jonnyjohnson1/topos-cli/v0.2.5 --extra-experimental-features nix-command --extra-experimental-features flakes --show-trace"
fi && nix run github:jonnyjohnson1/topos-cli/v0.2.6 --extra-experimental-features nix-command --extra-experimental-features flakes --show-trace"
end tell
EOF
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = topos
version = 0.2.5
version = 0.2.6
author = Jonny Johnson
author_email = [email protected]
description = For interacting with Topos tooling
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='topos',
version='0.2.5',
version='0.2.6',
packages=find_packages(),
entry_points={
'console_scripts': [
Expand Down
Binary file modified topos.dmg
Binary file not shown.

0 comments on commit 9e28084

Please sign in to comment.