From 88dd9bd163690d59700bda598d3ac721eacf937f Mon Sep 17 00:00:00 2001
From: Ali Elnwegy <ali.el-nwegy@tuhh.de>
Date: Wed, 31 Jan 2024 10:47:04 +0100
Subject: [PATCH] fixed merge

---
 .gitignore     |  6 ++++++
 pyproject.toml | 20 ++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 21f0008..cefa04c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,9 @@ activate
 **/__pycache__
 **/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/**
diff --git a/pyproject.toml b/pyproject.toml
index 8806018..665d96e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,13 +1,9 @@
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
-
 [project]
 name = "fn_gen"
 readme = "README.md"
 description = "A library for usage with SCPI compliant function generators (for now the DG2000 series from rigol)"
-requires-python = ">=3.11"
-version = "0.0.1"
+requires-python = "==3.11.*"
+version = "0.0.2"
 dependencies = [
     "easy-scpi==0.1.4",
     "ifaddr==0.2.0",
@@ -18,10 +14,22 @@ dependencies = [
     "setuptools==65.5.0",
     "typing_extensions==4.9.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]
+<<<<<<< HEAD
 sdist = true
 
 [tool.pdm.scripts]
 edit = {shell = "$VISUAL src/"}
+=======
+distribution = true
+>>>>>>> ee5d585f01664255688748582a87f41dbc4af185