Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 12 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ jobs:
ssh-fingerprints: "9f:09:37:d6:4a:48:0d:17:a7:c5:4a:5d:af:b5:fc:ab"
build-dir: ./docs/build/html


pre-release:
docker:
- image: buildpack-deps:trusty
Expand All @@ -174,21 +173,20 @@ jobs:

release:
docker:
- image: buildpack-deps:trusty
- image: cimg/python:3.6
working_directory: ~/repo
steps:
- checkout
- run:
name: Tag code with the latest version in VERSION and push tag.
name: Build distribution
command: |
VERSION=`cat VERSION`
git fetch --tags
git tag $VERSION
git push origin $VERSION
pip install cython numpy twine
python setup.py sdist

- run:
name: Publish to PyPI
command: |
echo "TODO"
twine upload dist/* --username hungpham --password $PYPI_PASSWORD

workflows:
version: 2
Expand All @@ -210,22 +208,17 @@ workflows:
only:
- fix-doc
- develop

release:
jobs:
- pre-release:
- release:
filters:
branches:
only:
- /release-.*/
- master
- test-release

publish:
release:
jobs:
- release:
- pre-release:
filters:
branches:
only:
- master



- /release-.*/
3 changes: 2 additions & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ disable=
xreadlines-attribute,
zip-builtin-not-iterating,
bad-continuation,
arguments-differ
arguments-differ,
super-with-arguments

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.0
0.3.0-alpha.3
9 changes: 6 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
with open("VERSION", "r") as file_:
VERSION = file_.read()
DESCR = "toppra: time-optimal parametrization of trajectories for robots subject to constraints."
LONG_DESCRIPTION = "An implementation of TOPP-RA (TOPP via Reachability Analysis) for time-parametrizing" \
"trajectories for robots subject to kinematic (velocity and acceleration) and dynamic" \
"(torque) constraints. Some other kinds of constraints are also supported."
with open("README.md", "r") as file_:
LONG_DESCRIPTION = file_.read()

URL = "https://github.com/hungpham2511/toppra"

Expand Down Expand Up @@ -52,6 +51,9 @@
include_dirs=[np.get_include()])

EXTENSIONS = [ext_1, ext_2]
SETUP_REQUIRES = ["numpy", "cython"]
if sys.version[0] == '2' or sys.version[:3] == '3.5':
SETUP_REQUIRES = ["numpy", "cython", "strip_hints"]


# custom install command: strip type-hints before installing toppra
Expand Down Expand Up @@ -94,6 +96,7 @@ def process_file(f):
version=VERSION,
description=DESCR,
long_description=LONG_DESCRIPTION,
long_description_content_type='text/markdown',
author=AUTHOR,
author_email=EMAIL,
url=URL,
Expand Down