adding auto deploy docs

python-arq · Jan 17, 2017 · 2103b5b · 2103b5b
1 parent 81139d1
commit 2103b5b
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,32 +1,51 @@
 language: python
+
 cache: pip
+
 services:
 - redis-server
+
 python:
 - '3.5'
 - '3.6'
 - '3.6-dev'
 - 'nightly'
+
 matrix:
   allow_failures:
   - python: '3.6-dev'
   - python: 'nightly'
+
 install:
 - make install
+
 script:
 - make lint
 - make test
 - make docs
 - ./tests/check_tag.py
+
 after_success:
 - ls -lha
 - bash <(curl -s https://codecov.io/bash)
+
+env:
+- secure: "CT1j0VZeLoqBBiMXLOImIBGiPDgPeNZ9xHBf+7bhvurCjcXnFwfhwKFk59o6O1PNLiLB21zeKP9QBLwHaAnQfeahP4+I/FkqowN1NjeKzm95wqFnQvZap3ww33/NYt8Wbs+LBK6SF6GjBJpcV7MMwpDjrxXW4+rN4zVcZNQEcE4t5Gcs49twVqU+nTUwNMuYO1GORhNvM4FNIJ2GI578GFA16WVoiRyfu2wij0mgp0WMddQFJUwxvG37Ehu3DxVkj5pxH9UPouH4j6MVnnx+8Uv36Ux+4j7lOavhqWgbSZkPAFTS7gq3STlPbLWzAwJMkI0fWCW67wPvNCGp6d7HJbRq/g3tld02adg/herdtDbwbqkaR/Ahltbjkl/pshX6u/HA7UnPtp1q9g5qnWJOd+ip/ngSKoIcJb9aYeqqrHMB2wIKJZit1hlwgFwRGgW3HNMWAuoTpdMuFGUSrGWg2oKAUFiwMhhOww7DIHsj1S3uOc6JfGEo9K5IODZdjSge3FeeDQwpU0vZWlCD9bXJoWHVIbtckPRQhlrD/9cojEIhpU1wV+xO/yp5qdtEJGoTaAyn7xdN+pfsujeMElgbU5oUZjtI5rbglHQM3N1ZQOwaK514vMHguBoW8f3kvSx0Bpub/aCgWDQDvnSuX+nzZbkoCAs2igvsQtefqAWnrE4="
+
 deploy:
   provider: pypi
   user: samuelcolvin
   password:
     secure: fM1AEWtweEM0JMJET4ONgbk0E3FlPo0A4lymNRj+iKBAG1qhYtR+jJNtYCAnTbL0RZJjxofIP1vnDOW/xukAzh8stDjc199Gr2uqVox3xH6LplK75Ouc8QpEhYKg4r3y58m+9cp0H10OBNsUV3pTJe52KQFfT+C1e+rA1zKk0t1QbUiBaXyRweqNLfS1K+Bfb9dXtbKE66KV8TXKS4HXrsjBU3I4OlgDOSC2JCOivPUCBwVsN8OW4MDLt8gEuK+i5JkN0hBEBR3LGSi8n8CU+32fXDpl0RVmYbIR3CbgDVx79HKZIWSYbFJ+JRDpKIio0H0bvgpy1hI92olS4K0ExI3Y2S/gToGMA+jdZdjQgobCoDor3kGaG2ZzT/iG2IzB4pnNjrwQhEzVGQMrXBxiWT8Yw1I+lanV88U57x2A8/RmTzMPMu5bK0QCFBPZ9cOUA7lmFpG2lJvYnK/kdjIE4/RX1LGfKgPs7i2dM+yj7jSUuVUQY+Y0Ja5I11GsAzMpKtH1HnN9dQ0n0rfE+Le4ATdVA9lj2te4v/csrC/wiC5n4mg1YIGxDU0obEvtiNepK4suCsy/PDLiHx5xzIS0z7WWhHK+6XCBDC5enw+2hKs3ETJW3KbDU0Mz3q8vV64VObxZPLQxfKgT5o30OyMElsnLIZhK4R2Vsr5CzRzP2pY=
   distributions: sdist bdist_wheel
+  skip_upload_docs: true
   on:
     tags: true
     python: 3.5
+
+deploy:
+  provider: script
+  script: make travis-deploy-docs
+  on:
+    # tags: true
+    python: 3.5
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -0,0 +1,22 @@
+.. :changelog:
+
+History
+-------
+
+v1.0.0 (TBD)
+...................
+* Switch to `semver <http://semver.org/>`_ versioning
+* rename settings class to ``RedisSettings`` and simplify significantly
+
+v0.2.0 (2016-12-09)
+...................
+* add ``concurrency_enabled`` argument to aid in testing
+* fix conflict with unitest.mock
+
+v0.1.0 (2016-12-06)
+...................
+* prevent logs disabling other logs
+
+v0.0.6 (2016-08-14)
+...................
+* first proper release
diff --git a/Makefile b/Makefile
@@ -49,4 +49,9 @@ docs:
 
 .PHONY: deploy-docs
 deploy-docs: docs
-	ghp-import -m "update docs" -p docs/_build/html/
+	ghp-import -n -m "update docs" -p docs/_build/html/
+
+.PHONY: travis-deploy-docs
+travis-deploy-docs: docs
+	ghp-import -n -m "update docs" docs/_build/html/
+	@git push -fq https://${GH_TOKEN}@github.com/$(TRAVIS_REPO_SLUG).git gh-pages > /dev/null
diff --git a/arq/utils.py b/arq/utils.py
@@ -13,10 +13,7 @@
 import aioredis
 from aioredis.pool import RedisPool
 
-__all__ = [
-    'RedisSettings',
-    'RedisMixin',
-]
+__all__ = ['RedisSettings', 'RedisMixin']
 
 
 class RedisSettings:

diff --git a/arq/version.py b/arq/version.py
@@ -2,4 +2,4 @@
 
 __all__ = ['VERSION']
 
-VERSION = StrictVersion('0.3a1')
+VERSION = StrictVersion('1.0a1')
diff --git a/docs/index.rst b/docs/index.rst
@@ -36,7 +36,7 @@ Why use *arq*?
     to the request? or thread local? or truly global? where am I, hell, what does global even mean?).
 
 **small**
-    and easy to reason with - currently *arq* is only about 500 lines, that won't change significantly.
+    and easy to reason with - currently *arq* is only about 600 lines, that won't change significantly.
 
 Dependencies
 ------------
@@ -83,6 +83,8 @@ API Reference
 .. automodule:: arq.testing
    :members:
 
+.. include:: ../HISTORY.rst
+
 Indices and tables
 ------------------
 

diff --git a/tests/check_tag.py b/tests/check_tag.py
@@ -6,10 +6,10 @@
 
 git_tag = os.getenv('TRAVIS_TAG')
 if git_tag:
-    if git_tag != str(VERSION):
+    if git_tag.lower().lstrip('v') != str(VERSION).lower():
         print('✖ "TRAVIS_TAG" environment variable does not match arq.version: "%s" vs. "%s"' % (git_tag, VERSION))
         sys.exit(1)
     else:
-        print('✓ "TRAVIS_TAG" environment variable matches arq.version: "{}"'.format(VERSION))
+        print('✓ "TRAVIS_TAG" environment variable matches arq.version: "{}" vs. "%s"'.format(git_tag, VERSION))
 else:
     print('✓ "TRAVIS_TAG" not defined')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		__all__ = ['VERSION']

		VERSION = StrictVersion('0.3a1')
		VERSION = StrictVersion('1.0a1')