Skip to content

Commit

Permalink
Merge pull request #75 from epoch8/setuptools_scm
Browse files Browse the repository at this point in the history
Use setuptools_scm instead of manual version
  • Loading branch information
elephantum authored Feb 22, 2020
2 parents 604390d + ca709c8 commit c620b2c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
name: Test airflow-exporter

on:
- push
- pull_request
push:
branches:
- master
pull_request:
branches:
- '*'

jobs:

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
.gitkeep
.env
.vscode/
.eggs/

tests/logs
dist/
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ version: '3'

services:
airflow:
environment:
SETUPTOOLS_SCM_PRETEND_VERSION: 1.0
volumes:
- .:/tmp/airflow_exporter
- ./tests/airflow-requirements.txt:/requirements.txt
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

setup(
name="airflow-exporter",
version="1.3.0",
use_scm_version=True,
description="Airflow plugin to export dag and task based metrics to Prometheus.",
long_description=readme,
long_description_content_type="text/markdown",
Expand All @@ -27,6 +27,7 @@
keywords="airflow plugin prometheus exporter metrics",
url="https://github.com/epoch8/airflow-exporter",
packages=["airflow_exporter"],
setup_requires=['setuptools_scm'],
install_requires=[
"apache-airflow>=1.10.3",
"prometheus_client>=0.4.2",
Expand Down

0 comments on commit c620b2c

Please sign in to comment.