diff --git a/.travis.yml b/.travis.yml index f441a0d..1311758 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,28 @@ jobs: os: osx osx_image: xcode11.2 # Python 3.7.4 running on macOS 10.14.4 language: shell # 'language: python' is an error on Travis CI macOS +# Build requisites (only some of them) +addons: + apt: + packages: + # See the Dockerfiles for more details about those dependencies + - build-essential + - cmake + - g++ + - git + - libffi-dev + - libssl-dev + - make + - python3-dev + - rustc + homebrew: + packages: rust install: + - pip3 install -r requirements-build.txt -r requirements-runtime.txt # Generates nicobot/version.py # 'python' points to Python 2.7 on macOS but points to Python 3.8 on Linux and Windows # 'python3' is a 'command not found' error on Windows but 'py' works on Windows only - python3 setup.py build || python setup.py build - - pip3 install -r requirements-build.txt -r requirements-runtime.txt script: # 'python' points to Python 2.7 on macOS but points to Python 3.8 on Linux and Windows # 'python3' is a 'command not found' error on Windows but 'py' works on Windows only diff --git a/Makefile b/Makefile index c9842f1..6d06583 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,8 @@ +clean: + rm -rf build + build: + pip3 install --upgrade -r requirements-build.txt -r requirements-runtime.txt python3 setup.py build sdist bdist_wheel build-docker-alpine: @@ -24,3 +28,7 @@ docker-askbot: docker-transbot: docker run --rm -it nicolabs/nicobot:debian transbot $(ARGS) + +# All targets might be declared phony, since this Makefile is just a helper +# However most just don't match a file/directory so they will work without it +.PHONY: build test diff --git a/requirements-runtime.txt b/requirements-runtime.txt index c2fc745..583384d 100644 --- a/requirements-runtime.txt +++ b/requirements-runtime.txt @@ -11,4 +11,5 @@ emoji-country-flag pyyaml ##### Requirements for jabber ##### +slixmpp slixmpp-omemo