Skip to content

Commit

Permalink
Develop (#5)
Browse files Browse the repository at this point in the history
* classes, tests

* fix ci

* fix ci

* fix ci

* fix ci

* ci, makefile

* make release

* make release
  • Loading branch information
wchatx authored Sep 19, 2020
1 parent 2c60b36 commit 74b8ecd
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 47 deletions.
44 changes: 0 additions & 44 deletions .github/workflows/master.yml

This file was deleted.

23 changes: 23 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Create Release

on:
push:
branches:
- 'releases/**'

jobs:
release:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.6
uses: actions/setup-python@v1
with:
python-version: 3.6
- name: make release
env:
PYPI_USERNAME: ${{secrets.PYPI_USER}}
PYPI_PASSWORD: ${{secrets.PYPI_PASSWORD}}
run: make release
File renamed without changes.
13 changes: 13 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
SHELL := /bin/bash
.PHONY: release test

release:
python3 -m pip install twine
echo -e "[pypi]" >> ~/.pypirc
echo -e "username = ${PYPI_USERNAME}" >> ~/.pypirc
echo -e "password = ${PYPI_PASSWORD}" >> ~/.pypirc
python3 setup.py sdist bdist_wheel
twine upload dist/*

test:
source venv/bin/activate && pytest tests.py
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ For exporting a single Map or Feature service to GeoDataFrame:
```python

```

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
from pathlib import Path
from setuptools.command.install import install

VERSION = '0.0.2'
VERSION = '0.0.3'


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

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

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

0 comments on commit 74b8ecd

Please sign in to comment.