Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Artifacts #383

Merged
merged 36 commits into from
Nov 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3aa5bad
Started building wheels explicitly
KOLANICH Nov 16, 2018
013e67a
Fixing backslashes.
KOLANICH Nov 16, 2018
c8d2308
Added uploading of wheels
KOLANICH Nov 16, 2018
147a9c1
Unfixing backslashes.
KOLANICH Nov 16, 2018
e3ef41e
fix
KOLANICH Nov 16, 2018
8c8df34
fix
KOLANICH Nov 16, 2018
c5ca6b7
Added into building of the wheel into the bash script
KOLANICH Nov 16, 2018
77514f3
Upgraded the python tools
KOLANICH Nov 16, 2018
edf0fa1
Fixing the build matrix
KOLANICH Nov 16, 2018
09a8c6d
Fixing slashes
KOLANICH Nov 16, 2018
6841f4b
Upgraded the tools in non-cygwin environment too
KOLANICH Nov 16, 2018
59c49b1
fix
KOLANICH Nov 16, 2018
db7dfcd
fix
KOLANICH Nov 16, 2018
f32a965
Fixed the ARCH variable again since it is used in scripts
KOLANICH Nov 17, 2018
bacf808
Fixed the path to 32-bit cygwin
KOLANICH Nov 17, 2018
65435f3
Fixed adding into PATH
KOLANICH Nov 17, 2018
48bc002
Removed python 2.6 and restored mistakengly removed storage of artifacts
KOLANICH Nov 17, 2018
989636c
Trying to fix pip installation in 3.4
KOLANICH Nov 17, 2018
1ce61e3
trying to fix
KOLANICH Nov 17, 2018
6c4a5f3
fix
KOLANICH Nov 17, 2018
d8533c5
fix
KOLANICH Nov 17, 2018
628e8d5
Update install.ps1
KOLANICH Nov 17, 2018
b7aa29f
Update install.ps1
KOLANICH Nov 17, 2018
096c5da
Update install.ps1
KOLANICH Nov 17, 2018
2a7e6a4
Update install.ps1
KOLANICH Nov 17, 2018
dacd2bc
Update install.ps1
KOLANICH Nov 17, 2018
8c0963d
Update install.ps1
KOLANICH Nov 17, 2018
39da7de
Enabled setuptools_scm in setup.py and fixed the link to the repo
KOLANICH Nov 17, 2018
3169349
Removed the broken target from the build matrix
KOLANICH Nov 17, 2018
1bc4f12
Update install.ps1
KOLANICH Nov 17, 2018
08d7d1c
Update install.ps1
KOLANICH Nov 17, 2018
14caeef
Update install.ps1
KOLANICH Nov 17, 2018
1064e62
Using bleeding edge setuptools and setuptools_scm in cygwin build
KOLANICH Nov 19, 2018
446d298
Made installation of setuptools_scm shallow
KOLANICH Nov 19, 2018
e058243
Made shallow + $PYTHON
KOLANICH Nov 19, 2018
75487cf
fix
KOLANICH Nov 19, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 48 additions & 15 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,30 +41,59 @@ environment:
# CYGWIN: "C:\\cygwin64"
# ARCH: x86_64
# CYGSH: C:\Cygwin64\bin\bash -c

- PYTHON: "python3"
CYGWIN: "C:\\cygwin64"
ARCH: x86_64
CYGSH: C:\Cygwin64\bin\bash -c

- PYTHON: "C:\\Miniconda"
CONDA_PY: "2.7"
ARCH: x86
CONDA_PY: "2-latest"

- PYTHON: "C:\\Miniconda-x64"
CONDA_PY: "2.7"
ARCH: "64"
ARCH: x86_64
CONDA_PY: "2-latest"

- PYTHON: "python3"
CYGWIN: "C:\\cygwin64"
ARCH: x86_64
CYGSH: C:\Cygwin64\bin\bash -c

- PYTHON: "C:\\Miniconda3"
CONDA_PY: "3.5"
ARCH: x86
CONDA_PY: "3-latest"

- PYTHON: "C:\\Miniconda3-x64"
CONDA_PY: "3.6"
ARCH: "64"
CONDA_PY: "3-latest"
ARCH: x86_64

- PYTHON: "C:\\Miniconda3-x64"
CONDA_PY: "3.6"
ARCH: "64"
NUMPY_: "python"
- PYTHON: "C:\\Miniconda34-x64"
CONDA_PY: "3.4.3"
ARCH: x86_64

- PYTHON: "C:\\Miniconda34"
CONDA_PY: "3.4.3"
ARCH: x86

- PYTHON: "C:\\Miniconda35-x64"
CONDA_PY: "3.5.2"
ARCH: x86_64

- PYTHON: "C:\\Miniconda35"
CONDA_PY: "3.5.2"
ARCH: x86

- PYTHON: "C:\\Miniconda36-x64"
CONDA_PY: "3.6.5"
ARCH: x86_64

- PYTHON: "C:\\Miniconda36"
CONDA_PY: "3.6.5"
ARCH: x86

- PYTHON: "C:\\Miniconda37-x64"
CONDA_PY: "3.7"
ARCH: x86_64

- PYTHON: "C:\\Miniconda37"
CONDA_PY: "3.7"
ARCH: x86

install:
# Force java to be installed where JAVA_HOME points
Expand Down Expand Up @@ -101,3 +130,7 @@ on_finish:
#
#on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

artifacts:
- path: 'dist\*.whl'
name: wheels
36 changes: 33 additions & 3 deletions appveyor/install.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
$env:Path += ";"+$env:PYTHON

# Check that we have the expected version and architecture for Python
ant.exe -version
python.exe --version
Expand All @@ -7,11 +9,39 @@ python.exe -c "import struct; print(struct.calcsize('P') * 8)"
# compiled extensions and are not provided as pre-built wheel packages,
# pip will build them from source using the MSVC compiler matching the
# target Python version and architecture
pip.exe install nose setuptools -r test-requirements.txt

#seem like pip is not installed in 3.4

git clone --depth=1 https://github.com/pypa/setuptools.git
cd setuptools
python .\bootstrap.py
python .\setup.py install
cd ..

git clone --depth=1 https://github.com/pypa/wheel.git
cd wheel
python .\setup.py install
cd ..

git clone --depth=1 https://github.com/pypa/pip.git
cd pip
python .\setup.py install
cd ..

git clone --depth=1 https://github.com/pypa/setuptools_scm.git
pip install --upgrade ./setuptools_scm

Remove-Item .\pip -Force -Recurse
Remove-Item .\setuptools -Force -Recurse
Remove-Item .\wheel -Force -Recurse
Remove-Item .\setuptools_scm -Force -Recurse

pip install --upgrade nose -r test-requirements.txt
#pip.exe install -r "test-requirements.txt" # -r dev-requirements.txt

ant.exe -f test\\build.xml

# Build the compiled extension and run the project tests
python.exe setup.py install

python.exe setup.py bdist_wheel
dir .\dist
Get-ChildItem -File -Path .\dist\*.whl | Foreach {pip install --upgrade $_.fullname}
17 changes: 16 additions & 1 deletion appveyor/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,20 @@ echo "==== get modules"
$EASYINSTALL pip
$EASYINSTALL mock
#$PIP install mock
git clone --depth=1 https://github.com/pypa/setuptools.git
cd setuptools
$PYTHON ./bootstrap.py
$PYTHON -m pip install ./
cd ..
rm -r ./setuptools

git clone --depth=1 https://github.com/pypa/wheel.git
git clone --depth=1 https://github.com/pypa/pip.git
git clone --depth=1 https://github.com/pypa/setuptools_scm.git


$PYTHON -m pip install --upgrade ./pip ./wheel ./setuptools_scm
rm -r ./pip ./wheel ./setuptools_scm

# Check versions
echo "==== Check versions"
Expand All @@ -61,7 +75,8 @@ echo "==== Build test"

# Install the package
echo "==== Build module"
$PYTHON setup.py install
$PYTHON ./setup.py bdist_wheel
$PYTHON -m pip install --upgrade ./dist/*.whl

echo "==== Verify jvm.dll found"
$PYTHON -c "import jpype; print(jpype.getDefaultJVMPath())"
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
author_email='[email protected]',
maintainer='Luis Nell',
maintainer_email='[email protected]',
url='https://github.com/originell/jpype/',
url='https://github.com/jpype-project/jpype',
platforms=[
'Operating System :: MacOS :: MacOS X',
'Operating System :: Microsoft :: Windows :: Windows 7',
Expand Down Expand Up @@ -50,4 +50,5 @@
zip_safe=False,
ext_modules=[jpypeLib],
distclass=setupext.dist.Distribution,
use_scm_version = True,
)