Skip to content

Commit e464c25

Browse files
authored
Bugfix: reestablish broken sockets (#44)
* version v0.3.0 * version v0.3.0 * remove setup.py from .gitignore * release-script improvements * release_script improvements * release requirments as sprectrum is mainly used as a lib * moving deps back to requirements * reestablish connection feature * removing the worthless self._waiting * optimizing test and docstrings * adding callback and finalizing tests * polishing * fix: dependencies * fix: dependencies * fix: dependencies * fix tests * kick * last changes
1 parent 2dc8d2d commit e464c25

File tree

13 files changed

+575
-219
lines changed

13 files changed

+575
-219
lines changed

.github/workflows/nigiri-infra.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ jobs:
3535
- name: Run integration tests
3636
run: |
3737
pytest tests/integration/basics.py
38+
pytest tests/integration/spectrum_test.py
39+
pytest tests/integration/elsock_test.py
3840

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,5 +139,4 @@ dmypy.json
139139

140140
# MacOS
141141
.DS_Store
142-
setup.py
143142
src/cryptoadvance/spectrum/_version.py

pyproject.toml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,40 +20,33 @@ license = {file = "LICENSE"}
2020

2121
requires-python = ">=3.10"
2222

23-
dependencies = [
24-
'embit==0.6.1',
25-
'Flask==2.1.1',
26-
'Flask-SQLAlchemy==2.5.1',
27-
'sqlalchemy==1.4.42',
28-
'psycopg2-binary',
29-
'requests==2.26.0'
30-
]
31-
32-
3323
classifiers =[
3424
'Programming Language :: Python :: 3',
3525
'License :: OSI Approved :: MIT License',
3626
'Operating System :: OS Independent',
3727
'Framework :: Flask',
3828
]
39-
dynamic=["version"]
29+
dynamic=["dependencies","version"]
30+
31+
[tool.setuptools.dynamic]
32+
dependencies = {file = ["requirements.txt"]}
4033

4134
[tool.setuptools_scm]
4235
write_to = "src/cryptoadvance/spectrum/_version.py"
4336

4437
[tool.pytest.ini_options]
45-
norecursedirs = "tests/bintegration"
38+
norecursedirs = "tests/bintegration/*"
4639
log_format = "[%(levelname)8s] %(message)s %(name)s (%(filename)s:%(lineno)s)"
4740
markers = [
4841
"slow: mark test as slow.",
4942
"elm: mark test as elementsd dependent",
5043
]
44+
python_files = "tests/test*.py"
5145

5246
filterwarnings = [
5347
"ignore::DeprecationWarning:bitbox02[.*]"
5448
]
5549

56-
5750
[project.optional-dependencies]
5851
test = [
5952
"pytest >=7.1.3",

requirements.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
embit==0.6.1
2-
Flask==2.1.1
3-
Flask-SQLAlchemy==2.5.1
1+
embit>=0.6.1
2+
Flask>=2.1.1
3+
Flask-SQLAlchemy>=2.5.1
4+
sqlalchemy>=1.4.42
45
psycopg2-binary
5-
requests==2.26.0
6+
requests>=2.26.0

setup.cfg

Lines changed: 0 additions & 6 deletions
This file was deleted.

setup.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,9 @@
11
from setuptools import setup, find_namespace_packages
22

3-
with open("requirements.txt") as f:
4-
install_reqs = f.read().strip().split("\n")
5-
6-
# Filter out comments/hashes
7-
requirements = [
8-
req.rstrip(" \\")
9-
for req in install_reqs
10-
if req.rstrip(" \\")
11-
and not req.startswith("#") # comments
12-
and not req.strip().startswith("--hash=") # hash of the package
13-
]
14-
153
setup(
164
packages=find_namespace_packages("src", include=["cryptoadvance.*"]),
175
package_dir={"": "src"},
186
package_data={},
197
# take METADATA.in into account, include that stuff as well (static/templates)
208
include_package_data=True,
21-
install_requires=requirements,
229
)

0 commit comments

Comments
 (0)