Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Commit aa5191a

Browse files
authored
Merge pull request #72 from m0nhawk/feat/poetry
Feat/poetry
2 parents 5a97b05 + 6c35d9b commit aa5191a

File tree

5 files changed

+39
-70
lines changed

5 files changed

+39
-70
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
os: [ubuntu-latest]
19-
python-version: [3.7, 3.8, pypy3]
19+
python-version: [3.6, 3.7, 3.8, pypy3]
2020
steps:
2121
- uses: actions/checkout@v2
2222
- name: Set up Python
@@ -26,11 +26,11 @@ jobs:
2626
- name: Install dependencies
2727
run: |
2828
python -m pip install --upgrade pip
29-
python -m pip install pipenv
30-
pipenv install --dev
29+
python -m pip install poetry
30+
poetry install
3131
shell: bash
3232
- name: Run tests
3333
run: |
34-
pipenv run coverage run --source grafana_api -m xmlrunner discover -o test-reports
35-
pipenv run codecov
34+
poetry run coverage run --source grafana_api -m xmlrunner discover -o test-reports
35+
poetry run codecov
3636
shell: bash

Pipfile

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

pyproject.toml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[tool.poetry]
2+
name = "grafana_api"
3+
version = "1.0.2"
4+
description = "Yet another Python library for Grafana API"
5+
authors = ["Andrew Prokhorenkov <andrew.prokhorenkov@gmail.com>"]
6+
license = "MIT"
7+
classifiers = [
8+
"Development Status :: 4 - Beta",
9+
"Intended Audience :: Developers",
10+
"Topic :: Internet",
11+
"Topic :: Software Development :: Libraries",
12+
"Topic :: Software Development :: Libraries :: Python Modules",
13+
"Operating System :: OS Independent",
14+
"License :: OSI Approved :: MIT License",
15+
"Programming Language :: Python :: 3",
16+
"Programming Language :: Python :: 3.6",
17+
"Programming Language :: Python :: 3.7",
18+
"Programming Language :: Python :: 3.8"
19+
]
20+
21+
[tool.poetry.dependencies]
22+
python = "^3.6"
23+
requests = "^2.23.0"
24+
25+
[tool.poetry.dev-dependencies]
26+
codecov = "^2.1.8"
27+
coverage = "^5.2.1"
28+
unittest-xml-reporting = "^3.0.2"
29+
requests-mock = "^1.8.0"
30+
31+
[build-system]
32+
requires = ["poetry>=0.12"]
33+
build-backend = "poetry.masonry.api"

setup.py

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

test/api/test_annotations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def setUp(self):
1717
@requests_mock.Mocker()
1818
def test_annotations(self, m):
1919
m.get(
20-
"http://localhost/api/annotations?time_from=1563183710618&time_to=1563185212275"
20+
"http://localhost/api/annotations?from=1563183710618&to=1563185212275"
2121
"&alertId=11&dashboardID=111&panelId=22&tags=tags-test&limit=1",
2222
json=[
2323
{

0 commit comments

Comments
 (0)