Merge pull request #9 from cs50/travis/pypi

tweaks for CI and CD

Author: kzidane

.gitignore

@@ -1,5 +1,5 @@
 .*
 !.gitignore
-*.pyc
-__pycache__/
-build/
+!.travis.yml
+dist/
+*.egg-info/

.travis.yml

@@ -0,0 +1,44 @@
+language: python
+
+python: "3.4"
+
+# build sdist
+script: make build
+
+# install twine for uploading to PyPI
+before_deploy: pip install twine
+
+deploy:
+
+  # create github release
+  - provider: releases
+
+    # GitHub access token
+    api_key:
+      secure: "Hv2ICkPkC7hiRw8GS9adkEcfoYGeVPbGHRNPQdGxLTeP1Mz9x/2ylUprrb2Ohq+pHGRa1W55nSJAZWHto4L/seWS17vN1JB1o71KYeD8h4Ywm/iJzYJFu4v8cmuT9qMPC89GtSGUkEZml+Vd6lb6d/eBr7HWoAMF7LCobzVvpJftgSBqkN1Z0aaunGNRtPVaqf0D4iQMSU1e0X9HFyIsxjS68sNqVcU/eSqbkHQ32COliOdEZXDqNmoJjIq4NYVH7DCS4kSpfxSd3BkJPn1UH4891MntflMllH7khmSA0lqSuunp+olfzhzchYb0/e0LavqYyFU/cRemyt8RBuE0GD3J3TMudVav/5HLKt6/exZwqfv7bHyorDXkkKGJqYNPUCOD2K4RS4ExpUU5c5en5inJZdgKYVI9gZS15oXmKV3H/8JkJPgx0xRP1Rx8niQKezKdFb0dZxArbMBUuAnolgyoq2EgnsNYhboRWXoJP36FCWFn8U8UNUfmgOkkMcP59mZ6svznxWPIyCMhfGgShY03GTvPp94P6c6OZJpjyjmWyPsvGZJrvnRlJ8VxBaUBcfuQl9rtBorwJ3VI1VWguyBaSINM6OWPtEJ0J2oVM/8Dvjuw2qPNkCdUhflc7wV/AUYB9/6rfpjY+GwTEKtZBBw4epbZX/B0L+vdRONZJ0Q="
+
+    # enable wildcards in filenames
+    file_glob: true
+
+    # upload sdist
+    file: dist/*
+
+    # avoid stashing sdist
+    skip_cleanup: true
+
+    # create releases on tags only
+    on:
+      tags: true
+
+  # deploy to PyPI
+  - provider: script
+
+    # upload sdist to PyPI
+    script: twine upload -u $PYPI_USERNAME -p $PYPI_PASSWORD dist/*
+
+    # avoid stashing sdist
+    skip_cleanup: true
+
+    # deploy on tags only
+    on:
+      tags: true

Makefile

@@ -1,42 +1,22 @@
-BUILD_DIR = build
-DESCRIPTION = CS50 Library for Python
-MAINTAINER = CS50 <sysadmins@cs50.harvard.edu>
-NAME = python-cs50
-OLD_NAME = lib50-python
-VERSION = 1.3.0
-
-.PHONY: bash
-bash:
-	docker run -i --rm -t -v "$(PWD)":/root cs50/cli
-
 .PHONY: build
 build: clean
-	mkdir -p "$(BUILD_DIR)"/usr/lib/python2.7/dist-packages/cs50
-	cp src/* "$(BUILD_DIR)"/usr/lib/python2.7/dist-packages/cs50
-	mkdir -p "$(BUILD_DIR)"/usr/lib/python3/dist-packages/cs50
-	cp src/* "$(BUILD_DIR)"/usr/lib/python3/dist-packages/cs50
+	python setup.py sdist
 
 .PHONY: clean
 clean:
-	rm -rf "$(BUILD_DIR)"
+	rm -rf *.egg-info dist
+
+.PHONY: install
+install: build
+	pip install dist/*.tar.gz
+
+.PHONY: push
+push:
+	git push origin "v$$(python setup.py --version)"
+
+.PHONY: release
+release: tag push
 
-.PHONY: deb
-deb: build
-	fpm \
-	-C "$(BUILD_DIR)" \
-	-m "$(MAINTAINER)" \
-	-n "$(NAME)" \
-	-p "$(BUILD_DIR)" \
-	-s dir \
-	-t deb \
-	-v "$(VERSION)" \
-	--after-install after-install.sh \
-	--conflicts "$(NAME) (<< $(VERSION)), $(OLD_NAME)" \
-	--deb-no-default-config-files \
-	--depends python \
-	--depends python3 \
-	--description "$(DESCRIPTION)" \
-	--replaces "$(NAME) (<= $(VERSION)), $(OLD_NAME)" \
-	--provides "$(NAME)" \
-	--provides "$(OLD_NAME)" \
-	usr
+.PHONY: tag
+tag:
+	git tag "v$$(python setup.py --version)"

README.md

@@ -1,5 +1,7 @@
 # CS50 Library for Python
 
+[![Build Status](https://travis-ci.org/cs50/python-cs50.svg?branch=master)](https://travis-ci.org/cs50/python-cs50)
+
 Supports Python 2 and Python 3.
 
 ## Development

after-install.sh

@@ -0,0 +1,19 @@
+from setuptools import setup
+
+setup(
+    author="CS50",
+    author_email="sysadmins@cs50.harvard.edu",
+    classifiers=[
+        "Intended Audience :: Developers",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Topic :: Software Development :: Libraries :: Python Modules"
+    ],
+    description="CS50 library for Python",
+    install_requires=["SQLAlchemy"],
+    keywords="cs50",
+    name="cs50",
+    packages=["cs50"],
+    url="https://github.com/cs50/python-cs50",
+    version="1.3.0"
+)