Merge branch 'sans932_create_wheel' into 'next' (eae5802b) · Commits · sns-hfir-scse / sans / sans-backend

.gitlab-ci.yml

+21 −9

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ docs-feature:
		- ls .
		- popd
		tags:
		- scse-mantid-builder
		- rse-multi-builder
		except:
		- next
		- master
		@@ -145,7 +145,7 @@ docs-next:
		after_script:
		- cp -r /tmp/sans-backend/build/sphinx/html .
		tags:
		- scse-mantid-builder
		- rse-multi-builder
		only:
		- next
		artifacts:
		@@ -215,11 +215,6 @@ code-pylint:
		stage: test
		dependencies:
		- dockerbuild
		before_script:
		- sudo mkdir -p /SNS/EQSANS/shared/sans-backend/ \|\| true
		- sudo mkdir -p /HFIR/CG2
		- sudo mkdir -p /HFIR/CG3
		- sudo bash scripts/instruments-mount.sh
		script:
		- sudo rm -rf /tmp/sans-backend \|\| true
		- sudo mkdir -p /tmp/sans-backend
		@@ -228,10 +223,27 @@ code-pylint:
		- pushd /tmp/sans-backend
		- docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY
		- time docker pull $CONTAINER_URL
		- time docker run -v /SNS:/SNS -v /HFIR:/HFIR -v $PWD:/opt/sans-backend -t $CONTAINER_URL bash -c "bash /opt/sans-backend/scripts/pylint_job.sh"
		- time docker run -v $PWD:/opt/sans-backend -t $CONTAINER_URL bash -c "bash /opt/sans-backend/scripts/pylint_job.sh"
		- popd
		tags:
		- scse-mantid-builder
		- rse-multi-builder

		create-wheel:
		stage: test
		dependencies:
		- dockerbuild
		script:
		- sudo rm -rf /tmp/sans-backend \|\| true
		- sudo mkdir -p /tmp/sans-backend
		- sudo cp -r . /tmp/sans-backend
		- sudo chmod 777 /tmp/sans-backend
		- pushd /tmp/sans-backend
		- docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY
		- time docker pull $CONTAINER_URL
		- time docker run -v $PWD:/opt/sans-backend -t $CONTAINER_URL bash -c "bash /opt/sans-backend/scripts/create_wheel.sh"
		- popd
		tags:
		- rse-multi-builder

		deploy-dev:
		stage: analysis-update

drtsans-dev.yml

+5 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ channels:
		dependencies:
		- autopep8
		- black
		- build
		- conda-build
		- docutils
		- flake8
		@@ -18,9 +19,13 @@ dependencies:
		- mpld3
		- numexpr
		- pandas
		- pip
		- pip:
		- check-wheel-contents
		- pre-commit
		- pylint
		- pytest >= 3.2
		- pytest-runner
		- pytest-xdist
		- sortedcontainers
		- sphinx >= 5.0.2

requirements_dev.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -12,3 +12,7 @@ flake8
		pylint
		black
		pre-commit

		build
		check-wheel-contents
		pytest-runner

scripts/create_wheel.sh

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		#!/bin/bash

		source activate drtsans-dev
		cd /opt/sans-backend
		python -m build --wheel --no-isolation
		check-wheel-contents dist/drtsans-*.whl

setup.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ setup(
		long_description="""ORNL SANS reduction""",
		license="Apache License 2.0",
		zip_safe=False,
		packages=find_packages(),
		packages=find_packages(exclude=["tests", "tests.*"]),
		scripts=scripts,
		package_dir={},
		package_data={