Skip to content

Commit

Permalink
Update travis/appveyor files. Removed sys argv statement due to embed…
Browse files Browse the repository at this point in the history
…Py update (#25)

* update merge

* update function name

* fixed findDates function to account for the word of or in between dates, months and years

* removed sys argv statement

* fix appveyor and travis files

* fix copy error

* removed getembedpy
  • Loading branch information
Dianeod authored Sep 17, 2020
1 parent 5418654 commit 7c487f2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ install:
# We do this conditionally because it saves us some downloading if the
# version is the same.
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
wget https://repo.continuum.io/miniconda/Miniconda3-4.5.4-Linux-x86_64.sh -O miniconda.sh;
else
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
wget https://repo.continuum.io/miniconda/Miniconda3-4.5.4-MacOSX-x86_64.sh -O miniconda.sh;
fi
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
Expand Down
12 changes: 5 additions & 7 deletions build/buildscript.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,21 @@ if "%APPVEYOR_REPO_TAG%"=="true" (
set PATH=C:\Perl;%PATH%
perl -p -i.bak -e s/NLPVERSION/`\$\"%NLP_VERSION%\"/g nlp.q


if not defined QLIC_KC (
goto :nokdb
)

call "build\getkdb.bat" || goto :error

set PATH=C:\Miniconda3-x64;C:\Miniconda3-x64\Scripts;%PATH%
mkdir embedpy
cd embedpy
echo getembedpy"latest" | q ..\build\getembedpy.q -q || goto :error
cd ..
echo p)print('embedpy runs') | q -q || goto :error
conda config --set always_yes yes --set changeps1 no
call "build\getkdb.bat" || goto :error

exit /b 0

:error
echo failed with error
exit /b
exit /b

:nokdb
echo no kdb
Expand Down
10 changes: 0 additions & 10 deletions build/getembedpy.q

This file was deleted.

7 changes: 3 additions & 4 deletions build/getkdb.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
curl -fsSOJL %W64%
conda install -c kx embedPy
mkdir q
7z x w64.zip -oq
xcopy /E C:\Miniconda3-x64\q q
echo|set /P =%QLIC_KC% >q\kc.lic.enc
certutil -decode q\kc.lic.enc q\kc.lic

set QHOME=%cd%\q
set PATH=%QHOME%\w64;%PATH%
echo .z.K | q -q
echo show .z.K;show .z.k;exit 0 | q -q
2 changes: 0 additions & 2 deletions code/parser.q
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
\d .nlp

.p.import[`sys;:;`:argv;()]; / spacy expects python be the main process

p)def spell(doc,model):
lst=[]
for s in doc:
Expand Down

0 comments on commit 7c487f2

Please sign in to comment.