Commit d5804033 authored by Mat's avatar Mat
Browse files

Merge branch 'fix-version' into 'master' 

Allow including SharedArray in other project's dependencies

See merge request !6
parents 4d69abd3 bb1f48c4

.gitlab-ci.yml

+10 −5
Original line number Diff line number Diff line
@@ -27,8 +27,11 @@ before_script: 
build:python2:

  stage: build

  script:

    - apt-get install -y libc6-dev gcc make python-numpy python-dev python-setuptools

    - python setup.py build_ext --inplace

    - apt-get install -y libc6-dev gcc make python2-dev wget

    - wget https://bootstrap.pypa.io/pip/2.7/get-pip.py -O get-pip.py

    - python2 get-pip.py

    - python2 -m pip install setuptools numpy

    - python2 setup.py build_ext --inplace



build:python3:

  stage: build
@@ -40,8 +43,10 @@ release: 
  stage: deploy

  only:

    - tags

  variables:

    SHARED_ARRAY_VERSION: "$CI_COMMIT_TAG"

  script:

    - apt-get install -y python-numpy python-setuptools python-pypandoc twine

    - echo $CI_COMMIT_TAG > .version

    - python setup.py sdist

    - apt-get install -y python3-numpy python3-setuptools python3-pypandoc twine

    - echo $SHARED_ARRAY_VERSION > .version

    - python3 setup.py sdist

    - twine upload dist/*

setup.py

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ def get_version(): 
    # GitLab CI environment and points as the git tag being built, if

    # any. This is the path followed by official releases.

    try:

        return os.environ['CI_COMMIT_TAG']

        return os.environ['SHARED_ARRAY_VERSION']

    except:

        pass