Skip to content

Commit

Permalink
Merge pull request #161 from EGA-archive/EE-2310_include-version-file
Browse files Browse the repository at this point in the history
EE-2310 Include version file in the package
  • Loading branch information
CsabaHalmagyi committed Jun 27, 2022
2 parents c2c03b5 + fc53164 commit 1bf6e00
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ build_package:
script:
- pip install -r requirements.txt
- python setup.py sdist
- export PYEGA3_VERSION=$(cat VERSION)
- export PYEGA3_VERSION=$(cat pyega3/VERSION)
artifacts:
name: "pyega3-$PYEGA3_VERSION.tar.gz"
paths:
Expand All @@ -78,7 +78,7 @@ functional_tests:
allow_failure: true
script:
- pip install pytest
- export PYEGA3_VERSION=$(cat VERSION)
- export PYEGA3_VERSION=$(cat pyega3/VERSION)
- pip install "dist/pyega3-$PYEGA3_VERSION.tar.gz"
- pytest tests/functional

Expand Down
3 changes: 2 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
include pyega3/config/default_credential_file.json
include pyega3/config/default_server_file.json
include pyega3/config/default_server_file.json
include pyega3/VERSION
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import sys
from os.path import abspath, dirname, join

from setuptools import setup, find_packages

VERSION = "4.0.4"
base_dir = abspath(dirname(__file__))
VERSION = open(join(base_dir, 'pyega3/VERSION')).read().strip()

CURRENT_PYTHON_VERSION = sys.version_info[:2]

Expand Down

0 comments on commit 1bf6e00

Please sign in to comment.