Skip to content

Commit 26cc77b

Browse files
tonyrobertstonyroberts
committed
Merge branch 'develop' into python3
Conflicts: README.md pythonnet/src/testing/Python.Test.csproj src/clrmodule/clrmodule.csproj src/runtime/Python.Runtime.csproj src/runtime/buildclrmodule.bat src/runtime/runtime.cs
2 parents 02778b8 + 6956638 commit 26cc77b

File tree

195 files changed

+2339
-3701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+2339
-3701
lines changed

‎.gitignore‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
*.suo
2+
*.pdb
3+
[Oo]bj/
4+
[Bb]in/
5+
*.dll
6+
*.pyd
7+
*.exe
8+
*.pyc
9+
packages/*
10+
dist
11+
pythonnet.egg-info
12+
*.userprefs

‎.travis.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
language: python
2+
python:
3+
- 2.6
4+
- 2.7
5+
before_install:
6+
- sudo apt-get install software-properties-common
7+
- sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"
8+
- sudo apt-get -qq update
9+
- sudo apt-get -qq install mono-devel mono-gmcs mono-xbuild nunit-console
10+
- sudo mozroots --import --machine --sync
11+
- yes | sudo certmgr -ssl -m https://go.microsoft.com
12+
- yes | sudo certmgr -ssl -m https://nugetgallery.blob.core.windows.net
13+
- yes | sudo certmgr -ssl -m https://nuget.org
14+
install:
15+
- python setup.py build_ext --inplace
16+
script:
17+
- export PYTHONPATH=`pwd`
18+
- ./npython src/tests/runtests.py

pythonnet/Python.Runtime.dll.config renamed to Python.Runtime.dll.config

File renamed without changes.

pythonnet/src/testing/Python.Test.csproj renamed to Python.Test.csproj

File renamed without changes.

‎README.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
pythonnet
22
=========
33

4-
**NOTE** The *official* repo is now https://github.com/pythonnet/pythonnet. Changes from this fork of the original sourceforge project will be integrated back into that main repo in due course.
4+
Python for .NET is a package that gives Python programmers nearly seamless integration with the .NET Common Language Runtime (CLR) and provides a powerful application scripting tool for .NET developers.
55

6-
**Features not yet integrated into the main repo**:
6+
[![Build Status](https://travis-ci.org/pythonnet/pythonnet.png?branch=develop)](https://travis-ci.org/pythonnet/pythonnet)
7+
8+
[![Build status](https://ci.appveyor.com/api/projects/status/65riiu1hvgaxsbwb)](https://ci.appveyor.com/project/davidanthoff/pythonnet)
9+
10+
11+
**Features not yet integrated into the main branch**:
712
- Python 3 support
813
- Subclassing managed types in Python
914

1015
--------------------------------------------------------------------------------------------------------
1116

12-
This fork of http://sourceforge.net/projects/pythonnet/ allows easy calling of python functions from C#.
13-
1417
+ All calls to python should be inside a "using (Py.GIL()) {/* Your code here */}" block.
1518
+ Import python modules using dynamic mod = Py.Import("mod"), then you can call functions as normal, eg mod.func(args).
1619
+ Use mod.func(args, Py.kw("keywordargname", keywordargvalue)) to apply keyword arguments.

pythonnet/VS_README.txt renamed to VS_README.txt

File renamed without changes.

‎appveyor.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
os: Windows Server 2012
2+
3+
environment:
4+
global:
5+
PYTHONPATH: c:\testdir
6+
7+
matrix:
8+
- pythonurl: http://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi
9+
- pythonurl: http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi
10+
- pythonurl: http://www.python.org/ftp/python/2.6.6/python-2.6.6.msi
11+
- pythonurl: http://www.python.org/ftp/python/2.6.6/python-2.6.6.amd64.msi
12+
13+
install:
14+
- ps: (new-object net.webclient).DownloadFile($env:pythonurl, 'C:\python.msi')
15+
- ps: start-process -wait -FilePath msiexec.exe -ArgumentList "/qn /i C:\python.msi TARGETDIR=C:\Python"
16+
- ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:\get-pip.py')
17+
# appveyor has python 2.7.6 x86 preinstalled, but in the wrong directory, this works around this
18+
- ps: if ($env:pythonurl -eq "http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi") {mi c:\python27 c:\python}
19+
- set PATH=C:\Python;%PATH%
20+
- C:\Python\python.exe c:\get-pip.py
21+
- C:\Python\Scripts\pip.exe install wheel
22+
23+
build_script:
24+
- C:\python\python.exe setup.py bdist_wheel
25+
26+
test_script:
27+
- ps: C:\python\scripts\pip.exe install ("dist\" + (gci dist)[0].Name)
28+
- mkdir c:\testdir
29+
- ps: copy-item (gci -path build -re -include Python.Test.dll)[0].FullName c:\testdir
30+
- c:\python\python.exe src\tests\runtests.py
31+
- c:\python\scripts\npython.exe src\tests\runtests.py

pythonnet/demo/helloform.py renamed to demo/helloform.py

File renamed without changes.

pythonnet/demo/splitter.py renamed to demo/splitter.py

File renamed without changes.

pythonnet/demo/wordpad.py renamed to demo/wordpad.py

File renamed without changes.

0 commit comments

Comments
 (0)