diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 31ddb50..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,70 +0,0 @@ -version: 2 -workflows: - version: 2 - build-workflow: - jobs: - - build: - filters: - tags: - only: /.*/ - - test-python3: - filters: - tags: - only: /.*/ - -jobs: - build: - working_directory: "~/gears" - - docker: - - image: python:2-alpine3.7 - - steps: - - checkout - - - restore_cache: - key: gears-1-{{ checksum "setup.py"}} - - - run: - name: Install Dependencies - command: pip install -e . - - - save_cache: - key: gears-1-{{ checksum "setup.py"}} - paths: - - "~/.cache/pip" - - - run: - name: Validation suite - command: examples/test.py validation - - - run: - name: Exchange litmus test - command: .circleci/litmus-test.sh - - test-python3: - docker: - - image: python:3-alpine3.7 - - steps: - - checkout - - - restore_cache: - key: gears-1-{{ checksum "setup.py"}} - - - run: - name: Install Dependencies - command: pip install -e . - - - save_cache: - key: gears-1-{{ checksum "setup.py"}} - paths: - - "~/.cache/pip" - - - run: - name: Validation suite - command: examples/test.py validation - - - run: - name: Exchange litmus test - command: .circleci/litmus-test.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..3fb9179 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,14 @@ +include: + - project: flywheel-io/infrastructure/ci-templates + ref: python3 + file: python3.yml + +variables: + PYLINT: "false" + PYTEST: "false" + +test:litmus-test: + extends: .python + stage: test + script: + - .gitlab/litmus-test.sh diff --git a/.circleci/litmus-test.sh b/.gitlab/litmus-test.sh similarity index 96% rename from .circleci/litmus-test.sh rename to .gitlab/litmus-test.sh index 83b7f18..7beeae3 100755 --- a/.circleci/litmus-test.sh +++ b/.gitlab/litmus-test.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -euo pipefail set -x diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..3480374 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=1 \ No newline at end of file diff --git a/setup.py b/setup.py index 6a25a1a..3d4b790 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,15 @@ +import os from setuptools import setup +VERSION = os.environ.get('CI_COMMIT_TAG', 0) + setup( - version = '0', - name = 'gears', + version = VERSION, + name = 'flywheel_gears', author = 'Flywheel Exchange, LLC', author_email = 'support@flywheel.io', description = 'Flywheel Gear tools', - url = 'https://github.com/flywheel-io/gears', + url = 'https://gitlab.com/flywheel-io/public/gears', packages = ['gears'], package_data = {'gears': ['../spec/manifest.schema.json']},