Skip to content

Fix installation #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JuliaSprenger merged 4 commits into from
May 24, 2022
Merged

Fix installation #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2cd234
Enhance init and restructure version file handling
JuliaSprenger May 23, 2022
084c365
fix version file reference
JuliaSprenger May 23, 2022
65dd5ff
add MANIFEST.in
JuliaSprenger May 23, 2022
58aa0cb
pep8
JuliaSprenger May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
include redcap_bridge/VERSION
include README.md
include requirements.txt
global-include redcap_bridge/template_parts/*
0 VERSION → redcap_bridge/VERSION
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions redcap_bridge/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import os.path
# Extract central version information
with open(os.path.join(os.path.dirname(__file__), "VERSION")) as version_file:
version = version_file.read().strip()

__version__ = version
__licence__ = 'MIT'
2 changes: 1 addition & 1 deletion redcap_bridge/project_building.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def build_project(project_csv, output_file=None, include_provenance=True):

# collect provenance infos
diglabtools_hash, diglabtools_state = get_repo_state(redcap_bridge_dir.parent)
diglabtools_version = open(redcap_bridge_dir.parent / 'VERSION').read()
diglabtools_version = open(redcap_bridge_dir / 'VERSION').read()
project_conf_repo_hash, project_conf_repo_state = get_repo_state(project_csv)

if not diglabtools_state:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import os

# Extract central version information
with open(os.path.join(os.path.dirname(__file__), "VERSION")) as version_file:
with open(os.path.join(os.path.dirname(__file__), "redcap_bridge/VERSION")) as version_file:
version = version_file.read().strip()

with open('requirements.txt') as f:
Expand All @@ -23,7 +23,7 @@
# If any package contains *.json or *.csv files, include them:
"": ["*.json", '*.csv', '*.zip'],
},
data_files=[('.', ['VERSION', 'README.md', 'requirements.txt'])],
data_files=[('DigLabTools', ['redcap_bridge/VERSION', 'README.md', 'requirements.txt'])],
author="Julia Sprenger, Jeremy Garcia",
description="Tools to interact with the DigLab metadata collection standard",
long_description_content_type="text/markdown",
Expand Down