Move integration tests.

Author: sebpuetz

.github/workflows/python.yml

@@ -42,5 +42,6 @@ jobs:
         pytest --doctest-modules
     - name: Conversion tests
       if: ${{ matrix.python-version == '3.7' }}
-      run: bash ./tests/conversion_integration.sh
+      run: |
+        bash ./tests/integration/conversion.sh
 

setup.py

@@ -101,6 +101,8 @@ def run(self):
       project_urls={
           "Finalfusion": "https://finalfusion.github.io",
       },
-      entry_points=dict(console_scripts=['ffp-convert=finalfusion.scripts.convert:main']),
+      entry_points=dict(console_scripts=[
+          'ffp-convert=finalfusion.scripts.convert:main',
+      ]),
       version="0.7.0-pre"
       )

tests/conversion_integration.py tests/integration/conversion.pytests/conversion_integration.py renamed to tests/integration/conversion.py

@@ -14,7 +14,7 @@ TESTDIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 function convert_and_verify() {
   echo ffp-convert "${1}" -f "${2}" "${3}" -t "${4}" >&2
   ffp-convert "${1}" -f "${2}" "${3}" -t "${4}"
-  python "${TESTDIR}"/conversion_integration.py "${1}" "${2}" "${3}" "${4}"
+  python "${TESTDIR}"/conversion.py "${1}" "${2}" "${3}" "${4}"
 }
 
 function verify_all_conversions() {
@@ -29,24 +29,24 @@ function verify_all_conversions() {
 }
 
 # txt dims
-input="${TESTDIR}/data/embeddings.dims.txt"
+input="${TESTDIR}/../data/embeddings.dims.txt"
 verify_all_conversions "${input}" textdims
 
 # txt
-input="${TESTDIR}/data/embeddings.txt"
+input="${TESTDIR}/../data/embeddings.txt"
 verify_all_conversions  "${input}" text
 
 # w2v
-input="${TESTDIR}/data/embeddings.w2v"
+input="${TESTDIR}/../data/embeddings.w2v"
 verify_all_conversions  "${input}" word2vec
 
 # fifu
-input="${TESTDIR}/data/embeddings.fifu"
+input="${TESTDIR}/../data/embeddings.fifu"
 verify_all_conversions  "${input}" finalfusion
 
 # fasttext doesn't support fifu bucket indexers
 # so we're making explicit calls for the other formats
-input="${TESTDIR}/data/ff_buckets.fifu"
+input="${TESTDIR}/../data/ff_buckets.fifu"
 convert_and_verify "${input}" finalfusion \
   "${tmp_dir}/fifu_buckets_to_fifu.fifu" finalfusion
 convert_and_verify "${input}" finalfusion \
@@ -56,5 +56,5 @@ convert_and_verify "${input}" finalfusion \
 convert_and_verify "${input}" finalfusion \
   "${tmp_dir}/fifu_buckets_to_text.dims.txt" textdims
 
-input="${TESTDIR}/data/fasttext.bin"
+input="${TESTDIR}/../data/fasttext.bin"
 verify_all_conversions  "${input}" fasttext