Merge pull request #22 from genid/v3.2

V3.2
genid · Jan 24, 2024 · 759ec23 · 759ec23
2 parents 34c56f0 + 448f61a
commit 759ec23
Show file tree

Hide file tree

Showing 75 changed files with 392,025 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,9 @@ Yleaf.egg-info/
 build/
 yleaf/data/hg38/full_reference.fa.gz
 yleaf/data/hg19/full_reference.fa.gz
+yleaf/data/hg38/full_reference.fa
+yleaf/data/hg19/full_reference.fa
+yleaf/data/hg38/chrY.fa
+yleaf/data/hg19/chrY.fa
 male_pedigree_toolbox.egg-info/
+/venv/
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,8 @@
-pandas
-numpy
 setuptools
 graphviz
+networkx
+numpy
+pandas
+python-dateutil
+pytz
+six
diff --git a/setup.py b/setup.py
@@ -41,6 +41,7 @@ def get_version():
     entry_points={
         'console_scripts': [
             'Yleaf=yleaf.Yleaf:main',
+            'predict_haplogroup=yleaf.predict_haplogroup:main',
         ],
     },
     include_package_data=True,

diff --git a/yleaf/Yleaf.py b/yleaf/Yleaf.py
diff --git a/yleaf/__init__.py b/yleaf/__init__.py
@@ -1 +1 @@
-__version__ = "3.1"
+__version__ = "3.2"
diff --git a/yleaf/chr_naming_convention.txt b/yleaf/chr_naming_convention.txt
@@ -0,0 +1,3 @@
+Y chrY
+y chrY
+chry chrY