Skip to content

Commit c3bf788

Browse files
author
Charlotte Godley
authored
Move to drone (#33)
Move to drone
2 parents d76626d + 30f0647 commit c3bf788

9 files changed

Lines changed: 56 additions & 124 deletions

File tree

.drone.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
kind: pipeline
2+
name: default
3+
4+
steps:
5+
- name: test
6+
image: python:3.8.0-alpine3.10
7+
commands:
8+
- pip install --upgrade pip setuptools wheel pytest hypothesis
9+
- pip install -e .[test]
10+
- pytest dotscience
11+
- name: pypi_publish
12+
image: plugins/pypi
13+
when:
14+
event: [ tag ]
15+
settings:
16+
username:
17+
from_secret: pypi_username
18+
password:
19+
from_secret: pypi_password
20+
- name: docker-publish
21+
image: plugins/docker
22+
when:
23+
event: [ push ]
24+
settings:
25+
repo: quay.io/dotmesh/dotscience-python3
26+
registry: quay.io
27+
dockerfile: Dockerfile
28+
tags:
29+
- ${DRONE_COMMIT_SHA}
30+
- ${DRONE_BRANCH}
31+
username:
32+
from_secret: docker_username
33+
password:
34+
from_secret: docker_password
35+
- name: docker-publish-tag
36+
image: plugins/docker
37+
when:
38+
event: [ tag ]
39+
settings:
40+
repo: quay.io/dotmesh/dotscience-python3
41+
registry: quay.io
42+
dockerfile: Dockerfile
43+
tags:
44+
- ${DRONE_TAG}
45+
- latest
46+
username:
47+
from_secret: docker_username
48+
password:
49+
from_secret: docker_password

.gitlab-ci.yml

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

Dockerfile.base renamed to Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3
1+
FROM python:3.8
22

33
RUN apt-get update && apt-get install git
44
RUN mkdir dsbuild
@@ -11,3 +11,6 @@ COPY LICENSE ./dsbuild
1111
COPY setup.cfg ./dsbuild
1212
COPY MANIFEST.in ./dsbuild
1313
COPY versioneer.py ./dsbuild
14+
15+
RUN cd dsbuild ; python3 setup.py install
16+
#RUN rm -rf dsbuild

Dockerfile.python

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

Dockerfile.test

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

dotscience/test_dotscience.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ def test_default_script_name():
484484
m1 = _parse(s1.getvalue())
485485

486486
# This might be a fragile assertion...
487-
assert m1["workload-file"] == "../usr/local/bin/pytest"
487+
assert m1["workload-file"].endswith("/usr/local/bin/pytest")
488488

489489
def test_explicit_script_name():
490490
ds = dotscience.Dotscience()

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
long_description_content_type="text/markdown",
1616
url="https://github.com/dotmesh-io/dotscience-python",
1717
packages=setuptools.find_packages(),
18-
install_requires=['jsonrpcclient[requests]', 'requests', 'datadots-api>=0.2.1'],
19-
tests_require=['pytest', 'hypothesis', 'jsonrpcclient[requests]', 'requests', 'datadots-api>=0.2.1'],
18+
install_requires=['datadots-api>=0.2.1'],
19+
tests_require=['pytest', 'hypothesis', 'datadots-api>=0.2.1'],
2020
zip_safe=True,
2121
classifiers=[
2222
"Programming Language :: Python :: 3",

shipit-docker.sh

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

shipit-pypi.sh

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

0 commit comments

Comments
 (0)