Skip to content

Commit eb70436

Browse files
tonyrobertstonyroberts
committed
Merge branch 'develop'
2 parents 4e2a3bd + d818b6e commit eb70436

227 files changed

Lines changed: 23059 additions & 17328 deletions

File tree

Some content is hidden

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

‎.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/installer/license.txt renamed to LICENSE

File renamed without changes.

‎Python.Runtime.dll.config‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!-- Mono DLL map for Python.Runtime.dll
2+
3+
Keep this file next to Python.Runtime.dll
4+
5+
For more information read:
6+
http://www.mono-project.com/Config
7+
http://www.mono-project.com/Config_DllMap
8+
9+
-->
10+
11+
<configuration>
12+
<dllmap dll="python23" target="libpython2.3.so" os="!windows" />
13+
<dllmap dll="python24" target="libpython2.4.so" os="!windows" />
14+
<dllmap dll="python25" target="libpython2.5.so" os="!windows" />
15+
<dllmap dll="python26" target="libpython2.6.so" os="!windows" />
16+
<dllmap dll="python27" target="libpython2.7.so" os="!windows" />
17+
<dllmap dll="python23.dll" target="libpython2.3.so" os="!windows" />
18+
<dllmap dll="python24.dll" target="libpython2.4.so" os="!windows" />
19+
<dllmap dll="python25.dll" target="libpython2.5.so" os="!windows" />
20+
<dllmap dll="python26.dll" target="libpython2.6.so" os="!windows" />
21+
<dllmap dll="python27.dll" target="libpython2.7.so" os="!windows" />
22+
</configuration>
23+

‎README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
pythonnet
2+
=========
3+
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.
5+
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)

‎VS_README.txt‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
Visual Studio 2005
2+
==================
3+
4+
pythonnet contains a new solution file for Visual Studio 2005: pythonnet.sln
5+
It should make development under Windows much easier since you don't have to
6+
install MSys or Cygwin to run the makefile.
7+
8+
The solution file should work with the free VS .NET Express Edition.
9+
10+
Available configurations
11+
------------------------
12+
13+
Every configuration copies the dll, pdf and exe files to the root directory
14+
of the project.
15+
16+
* Release
17+
Builds Python.Runtime, Python.Tests, clr.pyd and python.exe. The console
18+
project starts a Python console
19+
20+
* Debug
21+
Same as Release but creates a build with debug symbols
22+
23+
* UnitTest
24+
Builds a Debug build. The console project invokes runtests.py instead of
25+
opening a Python shell.
26+
27+
* EmbeddingTest
28+
Builds Python.EmbeddingTests and its dependencies. The configuration
29+
requires the NUunit framework.
30+
31+
Python version
32+
--------------
33+
34+
You can switch the destination version by defining either PYTHON24 or PYTHON25
35+
inside the Python.Runtime project.
36+
37+
** Don't forget to force a rebuild after you have altered the setting! **
38+
39+
MS VS doesn't take changes to define into account.
40+
41+
Thanks to Virgil Duprasfor his original VS howto!
42+
43+
Christian 'Tiran' Heimes

‎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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
# FOR A PARTICULAR PURPOSE.
88
# ===========================================================================
99

10+
import clr
11+
SWF = clr.AddReference("System.Windows.Forms")
12+
print SWF.Location
1013
import System.Windows.Forms as WinForms
1114
from System.Drawing import Size, Point
1215

@@ -24,8 +27,8 @@ def __init__(self):
2427

2528
# Create the button
2629
self.button = WinForms.Button()
27-
self.button.Location = Point(256, 64)
28-
self.button.Size = Size(120, 40)
30+
self.button.Location = Point(160, 64)
31+
self.button.Size = Size(820, 20)
2932
self.button.TabIndex = 2
3033
self.button.Text = "Click Me!"
3134

@@ -36,8 +39,8 @@ def __init__(self):
3639
self.textbox = WinForms.TextBox()
3740
self.textbox.Text = "Hello World"
3841
self.textbox.TabIndex = 1
39-
self.textbox.Size = Size(360, 20)
40-
self.textbox.Location = Point(16, 24)
42+
self.textbox.Size = Size(1260, 40)
43+
self.textbox.Location = Point(160, 24)
4144

4245
# Add the controls to the form
4346
self.AcceptButton = self.button
@@ -46,14 +49,19 @@ def __init__(self):
4649

4750
def button_Click(self, sender, args):
4851
"""Button click event handler"""
52+
print "Click"
4953
WinForms.MessageBox.Show("Please do not press this button again.")
5054

5155
def run(self):
5256
WinForms.Application.Run(self)
5357

5458

5559
def main():
56-
HelloApp().run()
60+
form = HelloApp()
61+
print "form created"
62+
app = WinForms.Application
63+
print "app referenced"
64+
app.Run(form)
5765

5866

5967
if __name__ == '__main__':

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)