Skip to content

Commit 4df71b0

Browse files
committed
Update ci and setup scripts
1 parent cd1063b commit 4df71b0

File tree

6 files changed

+14
-34
lines changed

6 files changed

+14
-34
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ python:
55
- "3.5"
66
- "3.6"
77
- "3.7"
8-
install: "script/ci-bootstrap"
8+
install: "script/setup"
99
script: "script/ci"
1010
cache: pip

script/build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ for i in ${@}; do
3434
done
3535

3636

37+
echo "==> Cleaning previous build artifacts"
38+
script/clean
39+
40+
3741
# Project build steps
3842
if [ ${all} ] || [ ${package} ]; then
3943
echo "==> Building the Source Distribution package"

script/ci

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,15 @@ set -e
99
cd "$(dirname "$0")/.."
1010

1111

12-
# Initialize the CI environment
13-
echo "==> Initializing the CI environment"
12+
# Build the package
13+
script/build package
1414

1515

16-
# Setup the project
17-
script/setup --dev
16+
# Install the package
17+
for file in dist/*.tar.gz; do
18+
pip install ${file}
19+
done
1820

1921

2022
# Run the test suite
2123
script/test
22-
23-
24-
## Build the product(s)
25-
#script/build
26-
#
27-
#
28-
## Push the builds

script/ci-bootstrap

Lines changed: 0 additions & 17 deletions
This file was deleted.

script/installdeps

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ export PIP_REQUIRE_VIRTUALENV=true
1616
# Prefer use of a Pipfile and pipenv for dependency management
1717
if [ -f "Pipfile" ] && [ -n "$(pipenv --version 2>/dev/null)" ]; then
1818
echo "==> Installing Pipfile dependencies"
19-
echo "Installing development dependencies"
20-
pipenv install -e .
21-
pipenv install --dev
19+
pipenv install --dev --skip-lock
2220

2321
elif [ -f "requirements.txt" ]; then
2422
echo "==> Installing requirements.txt dependencies"
@@ -37,7 +35,7 @@ elif [ -f "requirements.txt" ]; then
3735
exit 1
3836
fi
3937

40-
pip install -e .
4138
pip install -r requirements.txt
39+
pip install -e .
4240

4341
fi

script/setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ cd "$(dirname "$0")/.."
1212
echo "==> Setting up / resetting project for initial use"
1313

1414
script/clean --deep
15-
script/installdeps --dev
15+
script/installdeps

0 commit comments

Comments
 (0)