Skip to content

Commit

Permalink
Freeze dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
tecnovert committed Oct 10, 2024
1 parent 5a245e2 commit 0ad71df
Show file tree
Hide file tree
Showing 8 changed files with 347 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ ENV LANG=C.UTF-8 \
DATADIRS="/coindata"

RUN apt-get update; \
apt-get install -y git python3-pip gnupg make g++ autoconf automake libtool pkg-config gosu tzdata;
apt-get install -y python3-pip pkg-config gosu tzdata;

# Install requirements first so as to skip in subsequent rebuilds
COPY ./requirements.txt requirements.txt
RUN pip3 install -r requirements.txt
RUN pip3 install -r requirements.txt --require-hashes

COPY . basicswap-master
RUN cd basicswap-master; \
Expand Down
14 changes: 14 additions & 0 deletions doc/dev.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

## Install dev dependencies

pip install -e .[dev]


## Update requirements.txt

hashin --update-all -p3.9 -p3.10 -p3.11 -p3.12 -p3.13


## Run One Test

pytest -v -s tests/basicswap/test_xmr.py::Test::test_02_leader_recover_a_lock_tx
5 changes: 0 additions & 5 deletions doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ Test:
basicswap-prepare.exe --help


## Run One Test

pytest -v -s tests/basicswap/test_xmr.py::Test::test_02_leader_recover_a_lock_tx


## Private Offers

To send a private offer:
Expand Down
3 changes: 2 additions & 1 deletion docker/production/swapclient/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ ENV LANG=C.UTF-8 \
DATADIR=/data

RUN apt-get update; \
apt-get install -y wget python3-pip gnupg unzip make g++ autoconf automake libtool pkg-config gosu tzdata;
apt-get install -y python3-pip unzip pkg-config gosu tzdata;

ARG BASICSWAP_URL=https:/basicswap/basicswap/archive/master.zip
ARG BASICSWAP_DIR=basicswap-master
RUN wget -O basicswap-repo.zip $BASICSWAP_URL; \
unzip basicswap-repo.zip; \
mv $BASICSWAP_DIR /basicswap; \
cd /basicswap; \
pip3 install -r requirements.txt --require-hashes; \
pip3 install .;

#COPY ./test_code basicswap
Expand Down
26 changes: 15 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,22 @@ description = "Simple atomic swap system"
keywords = ["crypto", "cryptocurrency", "particl", "bitcoin", "monero", "wownero"]
readme = "README.md"
license = {file = "LICENSE"}
requires-python = ">=3.8"
dependencies = [
"wheel",
"pyzmq",
"sqlalchemy==1.4.39",
"python-gnupg",
"Jinja2",
"pycryptodome",
"PySocks",
"coincurve@git+https:/basicswap/coincurve@basicswap_v0.2"
]
requires-python = ">=3.9"
classifiers = [
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Topic :: Security :: Cryptography",
]
dependencies = [
"pyzmq==26.2.0",
"sqlalchemy==1.4.39",
"python-gnupg==0.5.3",
"Jinja2==3.1.4",
"pycryptodome==3.21.0",
"PySocks==1.7.1",
"coincurve@https:/basicswap/coincurve/archive/refs/tags/basicswap_v0.2.zip#sha256=c309deef22c929c9ab5b3adf7adbda940bffcea6c6ec7c66202d6c3d4e3ceb79"
]
dynamic = ["version"]

[project.urls]
Expand All @@ -35,6 +34,11 @@ Source = "https:/basicswap/basicswap"
basicswap-prepare = "basicswap.bin.prepare:main"
basicswap-run = "basicswap.bin.run:main"

[project.optional-dependencies]
dev = [
"pytest",
"hashin",
]

[tool.hatch.version]
path = "basicswap/__init__.py"
Expand Down
321 changes: 313 additions & 8 deletions requirements.txt

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tests/lint/spelling.ignore-words.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
eventtypes
wit
ro
hashin
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ passenv =
deps =
pytest
-rrequirements.txt
git+https:/basicswap/coincurve.git@basicswap#egg=coincurve
commands =
pytest

Expand Down

0 comments on commit 0ad71df

Please sign in to comment.