nwegy/Rigol-DG2052-Function-Generator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge

Browse Source
This commit is contained in:
Ali Elnwegy 2024-01-31 10:47:04 +01:00
parent 0400bd6ecd
commit 88dd9bd163
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -9,3 +9,9 @@ activate
**/__pycache__ **/__pycache__
**/build **/build
**/build/** **/build/**
pdm.lock
.pdm-python
rigol_dg2052_python_library/
rigol_dg2052_python_library/**
rigol_dg2052_python_library.egg-info/
rigol_dg2052_python_library.egg-info/**

20
pyproject.toml
View File

@ -1,13 +1,9 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"
[project] [project]
name = "fn_gen" name = "fn_gen"
readme = "README.md" readme = "README.md"
description = "A library for usage with SCPI compliant function generators (for now the DG2000 series from rigol)" description = "A library for usage with SCPI compliant function generators (for now the DG2000 series from rigol)"
requires-python = ">=3.11" requires-python = "==3.11.*"
version = "0.0.1" version = "0.0.2"
dependencies = [ dependencies = [
"easy-scpi==0.1.4", "easy-scpi==0.1.4",
"ifaddr==0.2.0", "ifaddr==0.2.0",
@ -18,10 +14,22 @@ dependencies = [
"setuptools==65.5.0", "setuptools==65.5.0",
"typing_extensions==4.9.0", "typing_extensions==4.9.0",
"zeroconf==0.131.0", "zeroconf==0.131.0",
<<<<<<< HEAD
=======
"typing-extensions==4.9.0",
>>>>>>> ee5d585f01664255688748582a87f41dbc4af185
] ]
authors = [
{name = "Ali Nwegy", email = "ali.el-nwegy@tuhh.de"},
]
license = {text = "MIT"}
[tool.pdm] [tool.pdm]
<<<<<<< HEAD
sdist = true sdist = true
[tool.pdm.scripts] [tool.pdm.scripts]
edit = {shell = "$VISUAL src/"} edit = {shell = "$VISUAL src/"}
=======
distribution = true
>>>>>>> ee5d585f01664255688748582a87f41dbc4af185