Merge pull request #289 from cs50/develop

3.0.3

.travis.yml

@@ -1,29 +1,28 @@
 language: python
-python: '3.6'
+python: 3.6
 branches:
-  except: "/^v\\d/"
-install: true
-script:
-- pip install .
-- help50 foo
-jobs:
-  include:
-  - stage: deploy
-    python: '3.6'
-    install: skip
-    script: skip
-    deploy:
-    - provider: script
-      script: 'curl --fail --data "{ \"tag_name\": \"v$(python setup.py --version)\",
-        \"target_commitish\": \"$TRAVIS_COMMIT\", \"name\": \"v$(python setup.py --version)\"
-        }" --user bot50:$GITHUB_TOKEN https://api.github.com/repos/$TRAVIS_REPO_SLUG/releases'
-      on:
-        branch: master
-    - provider: pypi
-      user: "$PYPI_USERNAME"
-      password: "$PYPI_PASSWORD"
-      on:
-        branch: master
+  except: /^v\d+\.\d+\.\d+/
+install: pip install .
+script: help50 foo
+before_deploy: |
+  version="v$(help50 --version | cut --delimiter ' ' --fields 2)"
+  if [ -z "$(git tag --list "$version")" ]; then \
+      git config --local user.name "bot50"; \
+      git config --local user.email "[email protected]"; \
+      git tag "$version"; \
+  fi
+deploy:
+- provider: releases
+  api_key: $GITHUB_TOKEN
+  skip_cleanup: true
+  on:
+    branch: master
+- provider: pypi
+  user: "$PYPI_USERNAME"
+  password: "$PYPI_PASSWORD"
+  skip_cleanup: true
+  on:
+    branch: master
 notifications:
   slack:
     secure: mX+aQD+EcHlYRYV1aKdDdKDyOQQpKi1Ygt6ygyJDzZGDqo3Y0zTT6M0vkxBjJKCnBfeaAIhKBQbKQl8skdBE2Fa7dZWKT1mxa4G+nGIyH3eEEZIIw9YxnUYBaAr8i0HXQs0B6b52LX8c+CWRYXWknEER4CdlIBkabYW4YlsaVLmLmUhtTxFJARKDYe6d8DTrFaSLug8SNVeyQPPnqBgRgu97WRd1VNyyQwuyW0Ax2+KAzzTiA7O6wuBk8/pBfbNDzdH44BCZcvUIccbRAFq4V1jDPjhdR/iZcPexX+pLlnK6BFyCXLD1Fwpkcc2A16fpqieRuwjqAVHv4yrUo3WouhJVr/XXgIu/lWX4Sj7KKJHSGfw9vHWP7FORLJ/6KPObM1bAGe/sunmFCz7wJw96+/KlgdwXWIvab/ErRpC8Omjabd+tPmNYWPyMHYGtprppO9DDW7oJ5XJ6PO/NyYwG4QlZ9vFabyAb2q97TXjZLNPqd85t4MhxlMxAZFbNkTEXdCdFMVpgGBJD8NUniYuns0a+g8HBZqgbKvv1XjJAFPYUNuOqqfBwxvVF5RLE7dErjcsu44NmrkI74LYoaDqTNNflZ4xGHMsg7o3BJQlBQBqJyKizhAxOHUyrGHUd7mklGANLj8me92UWhdrDx9Xtt3d3CNvocx9PyzPcTlTMA4E=

setup.py

@@ -12,7 +12,7 @@
     ],
     license="GPLv3",
     description="This is help50, a command-line tool that helps students understand error messages.",
-    install_requires=["colorama", "termcolor", "lib50>=2.1,<4"],
+    install_requires=["colorama", "termcolor", "lib50>2,<3"],
     keywords="help50",
     name="help50",
     packages=["help50"],
@@ -21,5 +21,5 @@
     },
     py_requires="3.6",
     url="https://github.com/cs50/help50",
-    version="3.0.2"
+    version="3.0.3"
 )