Merge pull request #1 from LN-Zap/integrate-fork

Integrate our own schwifty fork
LN-Zap · Apr 18, 2024 · f710ee6 · f710ee6
2 parents 4e6aa1d + 7b7d416
commit f710ee6
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 189 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 .PHONY: build test test-binary dist-linux dist-macos dist-windows
 
 build:
+	pip install -r requirements.txt
 	pyinstaller --clean --noconfirm schwifty.spec
 
 test:

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ git clone https://github.com/LN-Zap/schwifty-cli.git
 cd schwifty-cli
 ```
 
-If you have [`devenv`](https://devenv.sh/) and [`direnv`](https://direnv.net/) setup, the Schwifty development environment should activate automatically on entering the project directory. If not, install those dependencies. Alternativly, install the Python and Poetry project dependencies.
+If you have [`devenv`](https://devenv.sh/) and [`direnv`](https://direnv.net/) setup, the Schwifty development environment should activate automatically on entering the project directory. If not, install those dependencies. Alternativly, install the Python project dependencies.
 
 ## Build
 

diff --git a/devenv.nix b/devenv.nix
@@ -23,7 +23,6 @@
   # https://devenv.sh/languages/
   languages.python.enable = true;
   languages.python.venv.enable = true;
-  languages.python.poetry.enable = true;
 
   # https://devenv.sh/integrations/codespaces-devcontainer/
   devcontainer.enable = true;

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-schwifty==2024.1.1.post0
+schwifty @ git+https://github.com/LN-Zap/schwifty@8c88b005adb2c4ff799cbd3ceb3386e7d655ded9
 pyinstaller==6.5.0