Skip to content

Commit

Permalink
Replace master with main
Browse files Browse the repository at this point in the history
  • Loading branch information
slozier committed Jun 29, 2024
1 parent 523e71f commit 82f498c
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "Src/DLR"]
path = Src/DLR
url = https://github.com/IronLanguages/dlr
branch = master
branch = main
10 changes: 5 additions & 5 deletions Documentation/getting-the-sources.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ The main IronPython3 git repository is at [http://github.com/IronLanguages/ironp

## Downloading the sources

You can [download a zipped copy](http://github.com/IronLanguages/ironpython3/zipball/master) of the latest IronPython3 sources as well.
You can [download a zipped copy](http://github.com/IronLanguages/ironpython3/zipball/main) of the latest IronPython3 sources as well.

### Installing GIT

Expand All @@ -15,7 +15,7 @@ The following links include resources for installing and using GIT:

### Creating a local GIT repository

You will first need to fork the IronPython3 project. [Creating a fork](https://help.github.com/fork-a-repo/) is recommended as it will allow you to contribute patches back easily. Click the "Fork" button on [https://github.com/IronLanguages/ironpython3/](https://github.com/IronLanguages/ironpython3/). This should create your personal fork, with a web URL like http://github.com/janedoe/ironpython3 (where janedoe is your github username).
You will first need to fork the IronPython3 project. [Creating a fork](https://help.github.com/fork-a-repo/) is recommended as it will allow you to contribute patches back easily. Click the "Fork" button on [https://github.com/IronLanguages/ironpython3/](https://github.com/IronLanguages/ironpython3/). This should create your personal fork, with a web URL like http://github.com/janedoe/ironpython3 (where janedoe is your github username).

You can now use the git command-line client with many Linux distributions, Mac OS, Cygwin, and Windows (msysgit) to get the sources onto your local computer using the following commands:

Expand All @@ -27,13 +27,13 @@ git config --global user.email [email protected]
git clone [email protected]:janedoe/ironpython3.git
cd ironpython3
git remote add ironpython3 git://github.com/IronLanguages/ironpython3.git
git pull ironpython3 master
git pull ironpython3 main
```

At a later date, to get the latest updates from the IronPython3 project, run the following command in the ironpython3 directory created above:

```
git pull ironpython3 master
git pull ironpython3 main
```

If there is a merge conflict, edit the unmerged files to remove the conflict markers, and then run the following command:
Expand All @@ -59,4 +59,4 @@ The DLR (Dynamic Language Runtime) is a submodule of the ironpython3 repository,
git submodule update --init
```

For more information there is an excellent tutorial on [getting started with git](http://kylecordes.com/2008/04/30/git-windows-go/)
For more information there is an excellent tutorial on [getting started with git](http://kylecordes.com/2008/04/30/git-windows-go/)
8 changes: 4 additions & 4 deletions Documentation/installing.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Use Powershell's `help` command on the script for information about available op
The script is also available online, so it can be downloaded and invoked without unzipping the archive first.

```
PS> Invoke-WebRequest https://raw.githubusercontent.com/IronLanguages/ironpython3/master/Src/Scripts/Install-IronPython.ps1 -OutFile ./Install-IronPython.ps1
PS> Invoke-WebRequest https://raw.githubusercontent.com/IronLanguages/ironpython3/main/Src/Scripts/Install-IronPython.ps1 -OutFile ./Install-IronPython.ps1
PS> ./Install-IronPython ~/ipyenv ~/Downloads/IronPython.3.X.Y.zip
PS> ~/ipyenv/Enter-IronPythonEnvironment
«ipyenv» PS> ipy
Expand Down Expand Up @@ -146,7 +146,7 @@ It is recommended to create one's own launcher script launching the newer IronPy

After a release, the development of IronPython continues so it is possible that a bug or a feature that is important to you was handled after the latest release. As each commit to the main project branch creates precompiled artifacts, it is still possible to install the relevant (or latest development) version of IronPython without the need to compile the whole project from scratch.

Go to the project's [_Actions_ page](https://github.com/IronLanguages/ironpython3/actions) and find the commit you are interested in. Or simply find the topmost commit to `master` that has all tests passing. The _Status_ and _Branch_ filters in the top bar are helpful to narrow the list down. Then click on the commit hyperlink to access the CI run summary. At the bottom of that page there is artifact `packages`, which contains all binary artifacts the project produces. Download it and unzip. Choose the right package for your needs and follow instructions above for the officially released artifacts. For convenience, here is a table with usable packages:
Go to the project's [_Actions_ page](https://github.com/IronLanguages/ironpython3/actions) and find the commit you are interested in. Or simply find the topmost commit to `main` that has all tests passing. The _Status_ and _Branch_ filters in the top bar are helpful to narrow the list down. Then click on the commit hyperlink to access the CI run summary. At the bottom of that page there is artifact `packages`, which contains all binary artifacts the project produces. Download it and unzip. Choose the right package for your needs and follow instructions above for the officially released artifacts. For convenience, here is a table with usable packages:

| Artifact | Framework | Operating System |
| -------------------- | ------------------------------ | ----------------------------------- |
Expand All @@ -158,7 +158,7 @@ Go to the project's [_Actions_ page](https://github.com/IronLanguages/ironpython

# Installing from Sources

To build and install IronPython from sources, first follow instructions in [_Getting the Sources_](https://github.com/IronLanguages/ironpython3/blob/master/Documentation/getting-the-sources.md) and [_Building IronPython3_](https://github.com/IronLanguages/ironpython3/blob/master/Documentation/building.md).
To build and install IronPython from sources, first follow instructions in [_Getting the Sources_](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/getting-the-sources.md) and [_Building IronPython3_](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/building.md).

When the command `./make.ps1 debug` completes successfully, runnable and usable `ipy` executables are available in subdirectories of `./bin/Debug`. To run executables from the release configuration (produced by a successful run of `./make.ps1`), first set environment variable `IRONPYTHONPATH`.

Expand All @@ -170,7 +170,7 @@ If those executables test out successfully, the binaries can be installed outsid

The artifacts are placed in directory `./Package/Release/Packages/IronPython-3.X.Y`. Pick a package suitable for your installation target and follow instructions above for the officially released packages.

Note: as a convenience, if you run `Install-IronPython.ps1` directly from directory `./Src/Scripts` to install IronPython from the zip file, there is no need to pass the location to the zip file; the script finds it automatically using the relative path.
Note: as a convenience, if you run `Install-IronPython.ps1` directly from directory `./Src/Scripts` to install IronPython from the zip file, there is no need to pass the location to the zip file; the script finds it automatically using the relative path.

Installation example:

Expand Down
6 changes: 3 additions & 3 deletions Documentation/upgrading-from-ipy2.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Another way of achieving the redirection behavior similar to IronPython 2 is to

```c#
// IronPython 3
var engine = Python.CreateEngine(new Dictionary<string, object> {
var engine = Python.CreateEngine(new Dictionary<string, object> {
{ "ConsoleSupportLevel", Microsoft.Scripting.Runtime.SharedIO.SupportLevel.Basic },
});
var textWriter = new MyTextWriter();
Expand All @@ -70,14 +70,14 @@ This method is particularly useful when embedding the IronPython 3 engine in a h

```c#
// IronPython 3 in LINQPad
var engine = Python.CreateEngine(new Dictionary<string, object> {
var engine = Python.CreateEngine(new Dictionary<string, object> {
{ "ConsoleSupportLevel", Microsoft.Scripting.Runtime.SharedIO.SupportLevel.Basic },
});
engine.Execute("print('abc')"); // shows output in the "Results" pane
dynamic ans = engine.Execute("input()"); // pauses the script and asks for input at the bottom of the "Results" pane; terminate your input with Ctrl+Z, Enter
```

[TextStream]: https://github.com/IronLanguages/dlr/blob/master/Src/Microsoft.Scripting/Utils/TextStream.cs
[TextStream]: https://github.com/IronLanguages/dlr/blob/main/Src/Microsoft.Scripting/Utils/TextStream.cs
[LINQPad]: https://www.linqpad.net/

## `int` Type
Expand Down
4 changes: 2 additions & 2 deletions Package/choco/IronPython.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<metadata>
<id>ironpython</id>
<version>3.4.0</version>
<packageSourceUrl>https://github.com/IronLanguages/ironpython3/tree/master/Package/choco</packageSourceUrl>
<packageSourceUrl>https://github.com/IronLanguages/ironpython3/tree/main/Package/choco</packageSourceUrl>
<title>IronPython</title>
<authors>IronPython Contributors, Microsoft</authors>
<copyright>© IronPython Contributors</copyright>
<owners>IronPython Community</owners>
<projectUrl>https://ironpython.net</projectUrl>
<licenseUrl>https://github.com/IronLanguages/ironpython3/blob/master/LICENSE</licenseUrl>
<licenseUrl>https://github.com/IronLanguages/ironpython3/blob/main/LICENSE</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>IronPython is an open-source implementation of the Python programming language that is tightly integrated with the .NET Framework. IronPython can use the .NET Framework and Python libraries, and other .NET languages can use Python code just as easily.</description>
<summary>IronPython is an open-source implementation of the Python programming language that is tightly integrated with the .NET Framework.</summary>
Expand Down
4 changes: 2 additions & 2 deletions Package/choco/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The current target is Python 3.4, although features and behaviors from later ver


## Differences with CPython
While compatibility with CPython is one of our main goals with IronPython 3, there are still some differences that may cause issues. See [Differences from CPython](https://github.com/IronLanguages/ironpython3/blob/master/Documentation/differences-from-c-python.md) for details.
While compatibility with CPython is one of our main goals with IronPython 3, there are still some differences that may cause issues. See [Differences from CPython](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/differences-from-c-python.md) for details.

## Package compatibility
See the [Package compatibility](https://github.com/IronLanguages/ironpython3/blob/master/Documentation/package-compatibility.md) document for information on compatibility with popular Python packages.
See the [Package compatibility](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/package-compatibility.md) document for information on compatibility with popular Python packages.
4 changes: 2 additions & 2 deletions Package/dotnettool/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ The current target is Python 3.4, although features and behaviors from later ver

## Differences with CPython

While compatibility with CPython is one of our main goals with IronPython 3, there are still some differences that may cause issues. See [Differences from CPython](https://github.com/IronLanguages/ironpython3/blob/master/Documentation/differences-from-c-python.md) for details.
While compatibility with CPython is one of our main goals with IronPython 3, there are still some differences that may cause issues. See [Differences from CPython](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/differences-from-c-python.md) for details.

## Package compatibility

See the [Package compatibility](https://github.com/IronLanguages/ironpython3/blob/master/Documentation/package-compatibility.md) document for information on compatibility with popular Python packages.
See the [Package compatibility](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/package-compatibility.md) document for information on compatibility with popular Python packages.
4 changes: 2 additions & 2 deletions Package/nuget/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ System.Console.WriteLine(greetings("world"));

## Differences with CPython

While compatibility with CPython is one of our main goals with IronPython 3, there are still some differences that may cause issues. See [Differences from CPython](https://github.com/IronLanguages/ironpython3/blob/master/Documentation/differences-from-c-python.md) for details.
While compatibility with CPython is one of our main goals with IronPython 3, there are still some differences that may cause issues. See [Differences from CPython](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/differences-from-c-python.md) for details.

## Package compatibility

See the [Package compatibility](https://github.com/IronLanguages/ironpython3/blob/master/Documentation/package-compatibility.md) document for information on compatibility with popular Python packages. Note that to run most packages, IronPython Standard Library must be present.
See the [Package compatibility](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/package-compatibility.md) document for information on compatibility with popular Python packages. Note that to run most packages, IronPython Standard Library must be present.
4 changes: 2 additions & 2 deletions Package/zip/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ System.Console.WriteLine(greetings("world"));

## Differences with CPython

While compatibility with CPython is one of our main goals with IronPython 3, there are still some differences that may cause issues. See [Differences from CPython](https://github.com/IronLanguages/ironpython3/blob/master/Documentation/differences-from-c-python.md) for details.
While compatibility with CPython is one of our main goals with IronPython 3, there are still some differences that may cause issues. See [Differences from CPython](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/differences-from-c-python.md) for details.

## Package compatibility

See the [Package compatibility](https://github.com/IronLanguages/ironpython3/blob/master/Documentation/package-compatibility.md) document for information on compatibility with popular packages. Note that to run most packages, IronPython Standard Library must be present.
See the [Package compatibility](https://github.com/IronLanguages/ironpython3/blob/main/Documentation/package-compatibility.md) document for information on compatibility with popular packages. Note that to run most packages, IronPython Standard Library must be present.

0 comments on commit 82f498c

Please sign in to comment.