diff --git a/.travis.yml b/.travis.yml index 18166dd..f33ca92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ sudo: false language: python conditions: v1 +python: 3.6 # There are two accounts made specifically for Travis, and the passwords are really only encrypted for obscurity # The global env variables `client1_email`, `client1_password`, `client2_email`, `client2_password` and `group_id` @@ -8,9 +9,9 @@ conditions: v1 # The tests are run with `Limit concurrent jobs = 1`, since the tests can't use the clients simultaneously -install: - - pip install -U -r requirements.txt - - pip install -U -r dev-requirements.txt +before_install: pip install flit +# Use `--deps production` so that we don't install unnecessary dependencies +install: flit install --deps production --extras test cache: pip: true @@ -28,63 +29,62 @@ jobs: # and in `tests.utils.load_client`, we need 6 new sessions per branch. This is usually the point where Facebook # starts complaining, and we have to manually fix it + # Run online tests in all the supported python versions - &test-online if: (branch = master OR tag IS present) AND type != pull_request stage: online tests script: scripts/travis-online - - # Run online tests in all the supported python versions + - <<: *test-online python: 2.7 + before_install: + - sudo apt-get -y install python3-pip python3-setuptools + - sudo pip3 install flit + install: flit install --python python --deps production --extras test - <<: *test-online python: 3.4 - <<: *test-online python: 3.5 - <<: *test-online - python: 3.6 - - <<: *test-online - python: pypy + python: pypy3.5 # Run the expensive tests, with the python version most likely to break, aka. 2 - <<: *test-online # Only run if the commit message includes [ci all] or [all ci] if: commit_message =~ /\[ci\s+all\]|\[all\s+ci\]/ python: 2.7 + before_install: + - sudo apt-get -y install python3-pip python3-setuptools + - sudo pip3 install flit + install: flit install --python python --deps production --extras test env: PYTEST_ADDOPTS='-m expensive' + # Run offline tests in all the supported python versions - &test-offline # Ideally, it'd be nice to run the offline tests in every build, but since we can't run jobs concurrently (yet), # we'll disable them when they're not needed, and include them inside the online tests instead if: not ((branch = master OR tag IS present) AND type != pull_request) stage: offline tests script: scripts/travis-offline - - # Run offline tests in all the supported python versions + - <<: *test-offline python: 2.7 + before_install: + - sudo apt-get -y install python3-pip python3-setuptools + - sudo pip3 install flit + install: flit install --python python --deps production --extras test - <<: *test-offline python: 3.4 - <<: *test-offline python: 3.5 - <<: *test-offline - python: 3.6 - - <<: *test-offline - python: 3.6 - - <<: *test-offline - python: pypy + python: pypy3.5 - # Deploy to PyPI - - &deploy - stage: deploy - if: branch = master AND tag IS present + - stage: deploy + name: PyPI + if: tag IS present install: skip + script: skip deploy: - provider: pypi - user: madsmtm - password: - secure: "VA0MLSrwIW/T2KjMwjLZCzrLHw8pJT6tAvb48t7qpBdm8x192hax61pz1TaBZoJvlzyBPFKvluftuclTc7yEFwzXe7Gjqgd/ODKZl/wXDr36hQ7BBOLPZujdwmWLvTzMh3eJZlvkgcLCzrvK3j2oW8cM/+FZeVi/5/FhVuJ4ofs=" - distributions: sdist bdist_wheel - skip_existing: true - - # We need the bdist_wheels from both Python 2 and 3 - python: 3.6 - - <<: *deploy - python: 2.7 + provider: script + script: flit publish + on: + tags: true diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 57c2977..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -include LICENSE -include CONTRIBUTING.rst -include README.rst diff --git a/README.rst b/README.rst index 718a7f3..88aced4 100644 --- a/README.rst +++ b/README.rst @@ -27,17 +27,18 @@ or jump right into the code by viewing the `examples =2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4.0 -install_requires = - aenum - requests - beautifulsoup4 diff --git a/setup.py b/setup.py deleted file mode 100755 index 3216505..0000000 --- a/setup.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python -# -*- coding: UTF-8 -*- - -from __future__ import unicode_literals - -from setuptools import setup - -setup()