From 130c0c6cea837d2ed42cca569d736748f2e06249 Mon Sep 17 00:00:00 2001 From: Jensun Ravichandran Date: Mon, 10 May 2021 15:50:06 +0200 Subject: [PATCH 1/3] [BUGFIX] Fix typo in setup.py --- setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 31438d6..57f8573 100644 --- a/setup.py +++ b/setup.py @@ -20,15 +20,16 @@ with open("README.md", "r") as fh: long_description = fh.read() INSTALL_REQUIRES = ["prototorch", "pytorch_lightning", "torchmetrics"] +DEV = ["bumpversion"] EXAMPLES = ["matplotlib", "scikit-learn"] TESTS = ["codecov", "pytest"] -ALL = EXAMPLES + TESTS +ALL = DEV + EXAMPLES + TESTS setup( name=safe_name("prototorch_" + PLUGIN_NAME), version="0.0.0", - descripion= - "Pre-packaged prototype-based machine learning models using ProtoTorch and PyTorch-Lightning.", + description="Pre-packaged prototype-based " + "machine learning models using ProtoTorch and PyTorch-Lightning.", long_description=long_description, author="Alexander Engelsberger", author_email="engelsbe@hs-mittweida.de", @@ -37,6 +38,7 @@ setup( license="MIT", install_requires=INSTALL_REQUIRES, extras_require={ + "dev": DEV, "examples": EXAMPLES, "tests": TESTS, "all": ALL, From 34fb8d796f14028505ff7854f62dbbb893c10439 Mon Sep 17 00:00:00 2001 From: Jensun Ravichandran Date: Mon, 10 May 2021 16:03:23 +0200 Subject: [PATCH 2/3] Setup travis --- .travis.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fd277b..38b61fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,31 +5,17 @@ python: 3.8 cache: directories: - "./tests/artifacts" - # - "$HOME/.prototorch/datasets" install: - pip install .[all] --progress-bar off - -# Generate code coverage report script: - coverage run -m pytest - -# Push the results to codecov after_success: - bash <(curl -s https://codecov.io/bash) - -# Publish on PyPI deploy: provider: pypi username: __token__ password: - secure: rVQNCxKIuiEtMz4zLSsjdt6spG7cf3miKN5eqjxZfcELALHxAV4w/+CideQObOn3u9emmxb87R9XWKcogqK2MXqnuIcY4mWg7HUqaip1bhz/4YiVXjFILcG6itjX9IUF1DrtjKKRk6xryucSZcEB7yTcXz1hQTb768KWlLlKOVTRNwr7j07eyeafexz/L2ANQCqfOZgS4b0k2AMeDBRPykPULtyeneEFlb6MJZ2MxeqtTNVK4b/6VsQSZwQ9jGJNGWonn5Y287gHmzvEcymSJogTe2taxGBWawPnOsibws9v88DEAHdsEvYdnqEE3hFl0R5La2Lkjd8CjNUYegxioQ57i3WNS3iksq10ZLMCbH29lb9YPG7r6Y8z9H85735kV2gKLdf+o7SPS03TRgjSZKN6pn4pLG0VWkxC6l8VfLuJnRNTHX4g6oLQwOWIBbxybn9Zw/yLjAXAJNgBHt5v86H6Jfi1Va4AhEV6itkoH9IM3/uDhrE/mmorqyVled/CPNtBWNTyoDevLNxMUDnbuhH0JzLki+VOjKnTxEfq12JB8X9faFG5BjvU9oGjPPewrp5DGGzg6KDra7dikciWUxE1eTFFDhMyG1CFGcjKlDvlAGHyI6Kih35egGUeq+N/pitr2330ftM9Dm4rWpOTxPyCI89bXKssx/MgmLG7kSM= + secure: PDoASdYdVlt1aIROYilAsCW6XpBs/TDel0CSptDzX0CI7i4+ksEW6Jk0JyL58bQt7V4F8PeGty4A8SODzAUIk2d8sty5RI4VJjvXZFCXlUsW+JGUN3EvWNqJLnwN8TDxgu2ENao37GUh0dC6pL8b6bVDGeOLaY1E/YR1jimmTJuxxjKjBIU8ByqTNBnC3rzybMTPU3nRoOM/WMQUyReHrPoUJj685sLqrLruhAqhiYsPbotP8xY6i8+KBbhp5vgiARV2+LkbeGcYZwozCzrEqPKY7YIfVPh895cw0v4NRyFwK1P2jyyIt22Z9Ni0Uy1J5/Qp9Sv6mBPeGjm3pnpDCQyS+2bNIDaj08KUYTIo1mC/Jcu4jQgppZEF+oey9q1tgGo+/JhsTeERKV9BoPF5HDiRArU1s5aWJjFnCsHfu+W1XqX8bwN3aTYsEIaApT3/irc6XyFJIfMN82+z+lUcZ4Y1yAHT3nH1Vif+pZYZB0UOSGrHwuI/UayjKzbCzHMuHWylWB/9ehd4o4YVp6iubVHc7Sj0KQkwBgwgl6TvwNcUuFsplFabCxmX0mVcavXsWiOBc+ivPmU6574zGj0JcEk5ghVgnKH+QS96aVrKOzegwbl4O13jY8dJp+/zgXl0gJOvRKr4BhuBJKcBaMQHdSKUChVsJJtqDyt59GvWcbg= on: tags: true skip_existing: true - -# The password is encrypted with: -# `cd prototorch && travis encrypt your-pypi-api-token --add deploy.password` -# See https://docs.travis-ci.com/user/deployment/pypi and -# https://github.com/travis-ci/travis.rb#installation -# for more details -# Note: The encrypt command does not work well in ZSH. From f6e3a37e2bf75cf7bdde7bc6fdab8d5b76344041 Mon Sep 17 00:00:00 2001 From: Alexander Engelsberger Date: Mon, 10 May 2021 16:01:46 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Bump=20version:=200.0.0=20=E2=86=92=200.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- prototorch/models/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d188091..d8f783e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.0.0 +current_version = 0.1.0 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/prototorch/models/__init__.py b/prototorch/models/__init__.py index 0f1674e..4e1ff6b 100644 --- a/prototorch/models/__init__.py +++ b/prototorch/models/__init__.py @@ -5,4 +5,4 @@ from .glvq import GLVQ, GMLVQ, GRLVQ, LVQMLN, ImageGLVQ, SiameseGLVQ from .neural_gas import NeuralGas from .vis import * -__version__ = "0.0.0" \ No newline at end of file +__version__ = "0.1.0" \ No newline at end of file diff --git a/setup.py b/setup.py index 57f8573..c5547a0 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ ALL = DEV + EXAMPLES + TESTS setup( name=safe_name("prototorch_" + PLUGIN_NAME), - version="0.0.0", + version="0.1.0", description="Pre-packaged prototype-based " "machine learning models using ProtoTorch and PyTorch-Lightning.", long_description=long_description,