Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove pyproject.toml from sdist #11

Merged
merged 4 commits into from
Apr 1, 2020
Merged

Remove pyproject.toml from sdist #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
278c98e
Remove pyproject.toml from sdist
tammoippen Apr 1, 2020
0578ca9
Update builds
tammoippen Apr 1, 2020
c94f3d8
fix typo
tammoippen Apr 1, 2020
071648d
Update readme
tammoippen Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 44 additions & 16 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ commands:

- run:
name: Build sdist
command: poetry build -vvv -f sdist
command: |
poetry build -vvv -f sdist
for f in `ls dist/`; do
zcat dist/$f | tar --wildcards --delete "*/pyproject.toml" | gzip > dist/x$f ; mv dist/x$f dist/$f
done

- store_artifacts:
path: ~/app/dist
Expand Down Expand Up @@ -104,14 +108,14 @@ jobs:
test_2_7_pypy:
executor:
name: python
image: "pypy:2-6.0.0"
image: "pypy:2-7.3.0"
with_cython: 0
steps:
- tester
test_2_7_pypy_cython:
executor:
name: python
image: "pypy:2-6.0.0"
image: "pypy:2-7.3.0"
with_cython: 1
steps:
- tester
Expand All @@ -129,52 +133,66 @@ jobs:
with_cython: 1
steps:
- tester
test_3_5_pypy:
test_3_6_pypy:
executor:
name: python
image: "pypy:3-6.0.0"
image: "pypy:3-7.3.0"
with_cython: 0
steps:
- tester
test_3_5_pypy_cython:
test_3_6_pypy_cython:
executor:
name: python
image: "pypy:3-6.0.0"
image: "pypy:3-7.3.0"
with_cython: 1
steps:
- tester
test_3_6:
executor:
name: python
image: "circleci/python:3.6.8"
image: "circleci/python:3.6"
with_cython: 0
steps:
- tester
test_3_6_cython:
executor:
name: python
image: "circleci/python:3.6.8"
image: "circleci/python:3.6"
with_cython: 1
steps:
- tester
test_3_7:
executor:
name: python
image: "circleci/python:3.7.2"
image: "circleci/python:3.7"
with_cython: 0
steps:
- tester
test_3_7_cython:
executor:
name: python
image: "circleci/python:3.7.2"
image: "circleci/python:3.7"
with_cython: 1
steps:
- tester
test_3_8:
executor:
name: python
image: "circleci/python:3.8"
with_cython: 0
steps:
- tester
test_3_8_cython:
executor:
name: python
image: "circleci/python:3.8"
with_cython: 1
steps:
- tester

deploy_job:
docker:
- image: circleci/python:3.6.8
- image: circleci/python:3.6
description: "Deploy geohash-hilbert to pypi."
steps:
- checkout
Expand Down Expand Up @@ -220,11 +238,11 @@ workflows:
filters:
tags:
only: /.*/
- test_3_5_pypy:
- test_3_6_pypy:
filters:
tags:
only: /.*/
- test_3_5_pypy_cython:
- test_3_6_pypy_cython:
filters:
tags:
only: /.*/
Expand All @@ -244,6 +262,14 @@ workflows:
filters:
tags:
only: /.*/
- test_3_8:
filters:
tags:
only: /.*/
- test_3_8_cython:
filters:
tags:
only: /.*/
- deploy_job:
requires:
- test_2_7
Expand All @@ -252,12 +278,14 @@ workflows:
- test_2_7_pypy_cython
- test_3_5
- test_3_5_cython
- test_3_5_pypy
- test_3_5_pypy_cython
- test_3_6_pypy
- test_3_6_pypy_cython
- test_3_6
- test_3_6_cython
- test_3_7
- test_3_7_cython
- test_3_8
- test_3_8_cython
filters:
branches:
ignore: /.*/
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ geohash-hilbert

[![CircleCI](https://circleci.com/gh/tammoippen/geohash-hilbert.svg?style=svg)](https://circleci.com/gh/tammoippen/geohash-hilbert)
[![Coverage Status](https://coveralls.io/repos/github/tammoippen/geohash-hilbert/badge.svg?branch=master)](https://coveralls.io/github/tammoippen/geohash-hilbert?branch=master)
[![Tested CPython Versions](https://img.shields.io/badge/cpython-2.7%2C%203.5%2C%203.6%2C%203.7-brightgreen.svg)](https://img.shields.io/badge/cpython-2.7%2C%203.5%2C%203.6%2C%203.7-brightgreen.svg)
[![Tested PyPy Versions](https://img.shields.io/badge/pypy-2.7--6.0.0%2C%203.5--6.0.0-brightgreen.svg)](https://img.shields.io/badge/pypy-2.7--6.0.0%2C%203.5--6.0.0-brightgreen.svg)
[![Tested CPython Versions](https://img.shields.io/badge/cpython-2.7%2C%203.5%2C%203.6%2C%203.7%203.8-brightgreen.svg)](https://img.shields.io/badge/cpython-2.7%2C%203.5%2C%203.6%2C%203.7%203.8-brightgreen.svg)
[![Tested PyPy Versions](https://img.shields.io/badge/pypy-2.7--7.3.0%2C%203.6--7.3.0-brightgreen.svg)](https://img.shields.io/badge/pypy-2.7--7.3.0%2C%203.6--7.3.0-brightgreen.svg)
[![PyPi version](https://img.shields.io/pypi/v/geohash-hilbert.svg)](https://pypi.python.org/pypi/geohash-hilbert)
[![PyPi license](https://img.shields.io/pypi/l/geohash-hilbert.svg)](https://pypi.python.org/pypi/geohash-hilbert)

Expand Down