Merge pull request #185 from cs50/develop

v3.0.0

.gitignore

@@ -1,9 +1,104 @@
-.*
-*.mo
-!.gitignore
-!.travis.yml
-__pycache__
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
 build/
-*.egg-info/
+develop-eggs/
 dist/
-locale/*/LC_MESSAGES/*.mo
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/

.travis.yml

@@ -1,33 +1,31 @@
 language: python
-python:
-- '2.7'
-- '3.4'
-dist: trusty
-sudo: false
+python: 3.6
 branches:
-  except: "/^v\\d/"
-install: true
-script:
-- pip install .
-- submit50 --help
-jobs:
-  include:
-  - stage: deploy
-    python: '3.4'
-    install: true
-    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/
+before_install: pip install babel
+install: pip install --upgrade .
+script: 
+  - submit50 --help
+  - python setup.py compile_catalog
+before_deploy: |
+  version="v$(submit50 --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: $GH_TOKEN
+  skip_cleanup: true
+  on:
+    branch: master
+- provider: pypi
+  user: "$PYPI_USERNAME"
+  password: "$PYPI_PASSWORD"
+  skip_cleanup: true
+  on:
+    branch: master
 notifications:
   slack:
     secure: BEHsqQe6Z7ja0+hJ2oApQAtAvdUijWf3BKDmOwcKPeTurpnSeKfQ0ocaJkwakvT7Uy237THPFVf4L5+TIHCpF4MpxjYQRZOfkbXyNdA8vm7ohuuC7jJk0UGks02FoXl65hG6ZaETYZVHqvUbCy7EpGu0LRi/hFCpzWDa12HPzxm9jDTXp5e2lvED+vuwZNI9VEoqdA1MLPSZp1TRpwY3OcQfVZ7U2NfT8nUIcpCcpEXsFYuhl+j/Xmae7CwBfRS//6T8vGbBDhuSqzeHGgr9209yuwQZ9nRiyrH8nAKrseTJCLFEDuDxFqgpBZ920Yuz9aPshjFYalWfBs48tSf/9x0pLdfzuZ3JvSLvIghXOlZlyG8ddLUsrIU/SDPl4eAv4z75k6SPGapSPew3e7S5r8Ihxlfylxx8FsBafMa5gkF/vcunLYHjkzlVLqqLU2qV7b755bj7cMvcPgcsCBnv+2huPgEKeaOodV85tlzOIX5YgLc/vjidmT3ILCycVXvElWxiuQdVEPTITTSBhPYR8z/+AXdjkIAFS7Fk6pnTUcIr8wGSkcGDRswIpR8NBB2cX4UCU50Fg9U84/FMIKdthDdYCWOpdBlrw+rkCrSlY0pns9IP6Pm9Lnq60uRD8LB7xcoVTdd23rGRKgHPU1M7ZdTwVVhQHQFYSIQf01IlLs0=