Commit 58229c0e authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

Merge branch 'fix-setup-bug' into 'master' 

Fix bug with packages installation.

See merge request ska-telescope/csp-lmc!12
parents c8ad5f3a f333e39c

csp-lmc-common/.gitlab-ci.yml

+2 −5
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ test:csp-lmc-common: 
    - cd $COMMON_BUILD_PATH

    - pwd

    - python3 -m pip install -r requirements-tst.txt

    - python3 -m pip install --extra-index-url https://nexus.engageska-portugal.pt/repository/pypi/simple -r requirements.txt

    - python3 setup.py test |tee setup_py_test.stdout

    - python3 -m pip install --extra-index-url https://nexus.engageska-portugal.pt/repository/pypi/simple -r requirements.txt .

    - pytest tests |tee setup_py_test.stdout

    - pwd

    - mkdir -p build/reports

    - ls -alR
@@ -131,9 +131,6 @@ linting:csp-lmc-common: 
  script:

    - cd $BUILD_PATH

    - twine upload --repository-url $PYPI_REPOSITORY_URL dist/* || true

  only:        # publish development package only when source code changes

    changes:

      - "**/*.py"



.publish_python_release_common:

  extends: .publish_python_common

csp-lmc-common/requirements.txt

+0 −1
Original line number Diff line number Diff line
@@ -2,5 +2,4 @@ numpy == 1.17.2 
pytango >= 9.3.2

jsonschema >= 3.2.0

lmcbaseclasses >= 0.7.2

ska-skuid

ska-log-transactions

csp-lmc-common/setup.py

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ setup( 
            'pytango >9.3.1',

            'future',

            'lmcbaseclasses',

            'ska-log-transactions',

            'ska-skuid>=1.2.0'

            'ska-log-transactions'

        ],

        dependency_links=[

            'https://nexus.engageska-portugal.pt/repository/pypi/simple'

csp-lmc-mid/.make/k8s.mk

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ k8s_test = tar -c . | \ 
		--image-pull-policy=IfNotPresent \

		--image=$(IMAGE_TO_TEST) -- \

		/bin/bash -c "tar xv --strip-components 1 --warning=all && \

		python3 -m pip install . &&\

		python3 -m pip install -r requirements-tst.txt . && \

		cd test-harness &&\

		make TANGO_HOST=$(TANGO_HOST) $1 && \

		tar -czvf /tmp/build.tgz build && \

csp-lmc-mid/requirements-tst.txt

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ pytest-bdd 
pytest-cov

pytest-json-report

pytest-mock

#pytest-xdist == 1.34.0

pytest-forked

pycodestyle

coverage

mock

assertpy