Skip to content

Commit 74b8ecd

Browse files
authored
Develop (#5)
* classes, tests * fix ci * fix ci * fix ci * fix ci * ci, makefile * make release * make release
1 parent 2c60b36 commit 74b8ecd

6 files changed

Lines changed: 38 additions & 47 deletions

File tree

.github/workflows/master.yml

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

.github/workflows/release.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Create Release
2+
3+
on:
4+
push:
5+
branches:
6+
- 'releases/**'
7+
8+
jobs:
9+
release:
10+
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: Set up Python 3.6
16+
uses: actions/setup-python@v1
17+
with:
18+
python-version: 3.6
19+
- name: make release
20+
env:
21+
PYPI_USERNAME: ${{secrets.PYPI_USER}}
22+
PYPI_PASSWORD: ${{secrets.PYPI_PASSWORD}}
23+
run: make release

Makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
SHELL := /bin/bash
2+
.PHONY: release test
3+
4+
release:
5+
python3 -m pip install twine
6+
echo -e "[pypi]" >> ~/.pypirc
7+
echo -e "username = ${PYPI_USERNAME}" >> ~/.pypirc
8+
echo -e "password = ${PYPI_PASSWORD}" >> ~/.pypirc
9+
python3 setup.py sdist bdist_wheel
10+
twine upload dist/*
11+
12+
test:
13+
source venv/bin/activate && pytest tests.py

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ For exporting a single Map or Feature service to GeoDataFrame:
1313
```python
1414

1515
```
16-

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
from pathlib import Path
66
from setuptools.command.install import install
77

8-
VERSION = '0.0.2'
8+
VERSION = '0.0.3'
99

1010

1111
class VerifyVersionCommand(install):
1212
description = 'verify that git tag matches VERSION prior to publishing to pypi'
1313

1414
def run(self):
15-
tag = os.getenv('GITHUB_REF')
15+
tag = os.getenv('GITHUB_REF').split('/')[-1]
1616

1717
if tag != VERSION:
1818
info = 'Git tag: {0} does not match the version of this app: {1}'.format(

0 commit comments

Comments
 (0)