From 921c665680dc9d70d9ad6a9a7f36007ef8e4567b Mon Sep 17 00:00:00 2001
From: Dan <14043624+delivrance@users.noreply.github.com>
Date: Fri, 23 Oct 2020 16:45:43 +0200
Subject: [PATCH] Add support for Python 3.9 and AArch64 (#18)

---
 .appveyor.yml       | 17 -----------------
 .travis.yml         | 43 ++++++++++++++++++++++++++++++-------------
 requirements-ci.txt |  1 -
 tox.ini             |  3 +++
 4 files changed, 33 insertions(+), 31 deletions(-)
 delete mode 100644 .appveyor.yml
 delete mode 100644 requirements-ci.txt
 create mode 100644 tox.ini

diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index e5920a9..0000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-environment:
-  CIBW_BUILD: cp34-* cp35-* cp36-* cp37-* cp38-*
-  CIBW_BUILD_VERBOSITY: 3
-  CIBW_TEST_COMMAND: cd {project} && python setup.py test -q
-
-install:
-  - set PATH=C:\Python37;%PATH%
-  - set BUILD_OUTPUT_PATH=windows-tgcrypto-wheels
-  - cmd: pip install -r requirements-ci.txt
-
-build_script:
-  - cmd: cibuildwheel --output-dir %BUILD_OUTPUT_PATH%
-  - ps: Compress-Archive "$env:BUILD_OUTPUT_PATH/*" "$env:BUILD_OUTPUT_PATH.zip"
-
-artifacts:
-  - path: "$(BUILD_OUTPUT_PATH).zip"
-    name: wheels
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 3bd0be4..a3fbcf8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,40 @@
-dist: xenial
 language: python
-python: "3.7"
+
+jobs:
+  include:
+    # Perform a Linux i686 and x86_64 build
+    - services: docker
+    
+    # Perform a Linux AArch64 build
+    - services: docker
+      arch: arm64
+    
+    # Perform a macOS x86_64 build
+    - os: osx
+      # PyPy 7.3.2 needs macOS >= 10.14
+      osx_image: xcode10.2
+      language: shell
+      
+    # Perform a Windows 32-bit and 64-bit build
+    - os: windows
+      language: shell
+      before_install:
+        - choco install python --version 3.8.0
+        - export PATH="/c/Python38:/c/Python38/Scripts:$PATH"
+        # Make sure Python is on PATH as "python3"
+        - ln -s /c/Python38/python.exe /c/Python38/python3.exe
 
 env:
   global:
-    - CIBW_BUILD="cp34-* cp35-* cp36-* cp37-* cp38-*"
+    - CIBW_BUILD="cp36-* cp37-* cp38-* cp39-*"
     - CIBW_BUILD_VERBOSITY=3
-    - CIBW_TEST_COMMAND="cd {project} && python3 setup.py test -q"
+    - CIBW_BEFORE_BUILD="pip install tox"
+    - CIBW_TEST_COMMAND="cd {project} && tox"
     - BUILD_OUTPUT_PATH="$(uname | perl -ne 'print lc')-tgcrypto-wheels"
 
-matrix:
-  include:
-    - os: osx
-      language: generic
-    - sudo: required
-      services: docker
-
-install: pip3 install -r requirements-ci.txt
-
+install:
+  - python3 -m pip install cibuildwheel==1.6.3
+  
 script:
   - cibuildwheel --output-dir $BUILD_OUTPUT_PATH
   - tar zcf $BUILD_OUTPUT_PATH.tar.gz $BUILD_OUTPUT_PATH
diff --git a/requirements-ci.txt b/requirements-ci.txt
deleted file mode 100644
index c65128e..0000000
--- a/requirements-ci.txt
+++ /dev/null
@@ -1 +0,0 @@
-cibuildwheel==1.0.0
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..e23dc3b
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,3 @@
+[testenv]
+deps = pytest
+commands = pytest {posargs}