From 3238f70beae7b130672af38c533393640ab3def5 Mon Sep 17 00:00:00 2001 From: Brenda Praggastis Date: Tue, 10 Sep 2019 12:31:24 -0700 Subject: [PATCH 1/4] updated gitignore --- .gitignore | 3 ++- docs/.nojekyll | 0 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 docs/.nojekyll diff --git a/.gitignore b/.gitignore index ac169d84..85edfbd4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ gitmerge.sh dist hypernetx.egg-info logfiles/ -stashmerge.sh \ No newline at end of file +stashmerge.sh +jacksnbs \ No newline at end of file diff --git a/docs/.nojekyll b/docs/.nojekyll old mode 100644 new mode 100755 From 326f82bf35490dffa93d4ebb7e77eeacd4e6b988 Mon Sep 17 00:00:00 2001 From: Brenda Praggastis Date: Mon, 16 Sep 2019 08:36:12 -0700 Subject: [PATCH 2/4] updated gitignore --- .gitignore | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 85edfbd4..ece09e56 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,12 @@ gitmerge.sh dist hypernetx.egg-info + +stashmerge.sh +homology_log.log logfiles/ stashmerge.sh -jacksnbs \ No newline at end of file +jacksnbs + +__pycache__ +*.ipynb_checkpoints From 25455fe3911f2dfa145b6a004a8209fd53681393 Mon Sep 17 00:00:00 2001 From: Brenda Praggastis Date: Wed, 9 Oct 2019 09:05:28 -0700 Subject: [PATCH 3/4] adding to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ece09e56..d307bfa2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ homology_log.log logfiles/ stashmerge.sh jacksnbs +demos __pycache__ *.ipynb_checkpoints From 819eb15866e309ad042bba58aae19b6b95e243a8 Mon Sep 17 00:00:00 2001 From: Brenda Praggastis Date: Mon, 27 Jan 2020 11:51:45 -0800 Subject: [PATCH 4/4] updating version after hotfix/hyp-110/43 q --- docs/source/conf.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 09da3d67..187f6d84 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -19,7 +19,7 @@ import os import shlex -__version__ = "0.2.5" +__version__ = "0.2.6" # If extensions (or modules to document with autodoc) are in another directory, diff --git a/setup.py b/setup.py index 3146773b..437efa9a 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup import sys, os.path -__version__ = '0.2.5' +__version__ = '0.2.6' if sys.version_info < (3,6): sys.exit('HyperNetX requires Python 3.6 or later.')