Skip to content

Commit 4cdfe28

Browse files
authored
Merge pull request #50 from dynata/POP-2464
[POP-2464] Pypi.org project description
2 parents e8a606e + d75c6be commit 4cdfe28

File tree

7 files changed

+25
-45
lines changed

7 files changed

+25
-45
lines changed

.flake8

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[flake8]
2-
exclude=.git,.pytest_cache,venv
2+
exclude=.git,.pytest_cache,.venv,venv

.github/workflows/pythonpackage.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,19 @@ jobs:
2020
- name: Install dependencies
2121
run: |
2222
python -m pip install --upgrade pip
23-
pip install -r requirements.txt
23+
curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py > get-poetry.py
24+
python get-poetry.py --version 1.0.2 -y
25+
$HOME/.poetry/bin/poetry install
26+
rm get-poetry.py
2427
- name: Lint with flake8
2528
run: |
26-
pip install flake8
29+
# activate the virtualenv created by poetry
30+
source .venv/bin/activate
2731
# stop the build if there are Python syntax errors or undefined names
2832
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
2933
# the GitHub editor is 127 chars wide
3034
flake8 . --count --max-complexity=10 --max-line-length=127 --statistics
3135
- name: Test with pytest
3236
run: |
33-
pip install pytest
37+
source .venv/bin/activate
3438
pytest

.github/workflows/release.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ jobs:
2020
- name: Install Poetry
2121
run: |
2222
python -m pip install --upgrade pip
23-
pip install poetry
24-
poetry install
23+
curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py > get-poetry.py
24+
python get-poetry.py --version 1.0.2 -y
25+
$HOME/.poetry/bin/poetry install
26+
rm get-poetry.py
2527
- name: Poetry - Set Version & Build
2628
run: |
27-
poetry version ${{ steps.get_version.outputs.VERSION }}
28-
poetry build
29+
$HOME/.poetry/bin/poetry version ${{ steps.get_version.outputs.VERSION }}
30+
$HOME/.poetry/bin/poetry build
2931
- name: Push to PyPI
3032
run: |
31-
poetry publish --build --username "${{ secrets.PYPI_USERNAME }}" --password "${{ secrets.PYPI_PASSWORD }}" --no-interaction
33+
$HOME/.poetry/bin/poetry publish --build --username "${{ secrets.PYPI_USERNAME }}" --password "${{ secrets.PYPI_PASSWORD }}" --no-interaction
3234
- name: Create Release
3335
id: create_release
3436
uses: actions/create-release@v1

poetry.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[virtualenvs]
2+
create = true
3+
in-project = true

pyproject.toml

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,21 @@ name = "dynatademand"
33
version = "1.0.2"
44
description = "A Python client library for the Dynata Demand API"
55
authors = ["Ridley Larsen <[email protected]>", "Bradley Wogsland <[email protected]>", "Nathan Workman <[email protected]>"]
6+
readme = "README.md"
7+
repository = "https://github.com/dynata/python-demandapi-client"
68

79
[tool.poetry.dependencies]
810
python = "^2.7 || ^3.5 || ^3.6 || ^3.7"
11+
requests = "2.22.0"
12+
jsonschema = "3.2.0"
13+
14+
[tool.poetry.dev-dependencies]
915
responses = "0.10.6"
1016
requests = "2.22.0"
1117
pytest = "4.6.6"
1218
jsonschema = "3.2.0"
1319
pytest-runner = "5.2"
14-
15-
[tool.poetry.dev-dependencies]
20+
flake8 = "^3.7.9"
1621

1722
[build-system]
1823
requires = ["poetry>=0.12"]

requirements.txt

-5
This file was deleted.

setup.py

-29
This file was deleted.

0 commit comments

Comments
 (0)