Skip to content

Commit e8f013d

Browse files
author
Stephen L Arnold
committed
chg: ci: point python path to the right place, pass more env vars to tox
Signed-off-by: Stephen L Arnold <nerdboy@gentoo.org>
1 parent dd580ce commit e8f013d

2 files changed

Lines changed: 23 additions & 9 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
.github/workflows/vs_env.bat x64
8282
source env.sh
8383
echo "CMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake" >> $GITHUB_ENV
84-
echo "PYTHONPATH=${PYTHONPATH}:$GITHUB_WORKSPACE/" >> $GITHUB_ENV
84+
echo "PYTHONPATH=${PYTHONPATH}:$GITHUB_WORKSPACE/pyre2/" >> $GITHUB_ENV
8585
- name: Run tests
8686
run: |
8787
python setup.py egg_info

‎tox.ini‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,47 @@ isolated_build = true
1313
passenv =
1414
CI
1515
PYTHON
16+
PYTHONPATH
17+
GITHUB_WORKSPACE
1618
CC
1719
CXX
1820

1921
deps =
2022
-rrequirements-test.txt
2123

2224
commands =
23-
python -m pip install --upgrade pip setuptools
24-
pip install .[test]
25+
python -m pip install --upgrade pip wheel setuptools
26+
python setup.py egg_info
27+
python setup.py build_ext --inplace --build-type RelWithDebInfo
2528
nosetests -sx tests/re2_test.py
2629
nosetests -sx tests/test_re.py
30+
# -- -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
31+
# -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
2732

2833
[testenv:install]
29-
passenv = CI
34+
passenv =
35+
CI
36+
PYTHONPATH
37+
GITHUB_WORKSPACE
3038

31-
deps =
32-
-rrequirements.txt
39+
#deps =
40+
# -rrequirements-test.txt
3341

3442
commands =
3543
python -m pip install --upgrade pip wheel setuptools
36-
python setup.py sdist
37-
python setup.py build_ext --inplace --build-type RelWithDebInfo
44+
pip install --upgrade --upgrade-strategy eager -rrequirements-test.txt
45+
python setup.py bdist_wheel
46+
pip install --no-index --find-links=dist/ pyre2
47+
nosetests -sx tests/test_re.py
3848
# -- -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
3949
# -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
4050

4151
[testenv:deploy]
42-
passenv = CI pythonLocation
52+
passenv =
53+
CI
54+
pythonLocation
55+
PYTHONPATH
56+
GITHUB_WORKSPACE
4357
allowlist_externals = bash
4458

4559
deps =

0 commit comments

Comments
 (0)