Skip to content

Commit

Permalink
fix git dependency for setup&util
Browse files Browse the repository at this point in the history
  • Loading branch information
henneysq committed Mar 18, 2024
1 parent a042d11 commit 2a093ad
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
11 changes: 8 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name="megahat",
version="0.4.0",
version="0.5.0",
author="OptoCeutics",
author_email="[email protected]",
description="Donders OC colab project",
Expand All @@ -18,7 +18,12 @@
"Operating System :: OS Independent",
],
install_requires=[
"pandas",
"pandas==2.1.3",
"pyserial==3.5",
"dotmap==1.3.30",
#"git+https://optogit.optoceutics.com/optoceutics/software/libledcontroller.git@master#egg=libLEDController", # Proprietary software to control OptoCeutics ApS light stimulator
#"git+https://github.com/henneysq/psychopy.git@dev#egg=psychopy", # Forked version of psychopy v. 2023.2.3
#"https://optogit.optoceutics.com/optoceutics/research/megahatledcontroller.git"
],
python_requires='>=3.7',
python_requires='>=3.8',
)
7 changes: 7 additions & 0 deletions tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import logging
from pathlib import Path

from tests.test_util import set_git_executable_path

set_git_executable_path()

import git

test_log_dir = filename=Path(__file__).parent / "test_logs"
Expand All @@ -8,3 +13,5 @@
repo = git.Repo(search_parent_directories=True)
sha = repo.head.object.hexsha[:8]
log_file = test_log_dir/ f"log_{sha}.log"

logging.basicConfig(filename=test_log_dir/ f"log_{sha}.log", level=logging.INFO, filemode="w")
3 changes: 3 additions & 0 deletions util/util.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
from tests.test_util import set_git_executable_path
set_git_executable_path()

import git

def get_git_sha():
Expand Down

0 comments on commit 2a093ad

Please sign in to comment.