Skip to content

Commit

Permalink
Merge pull request #2235 from pyrevitlabs/develop-4
Browse files Browse the repository at this point in the history
4.8.16 Release - moving from eirannejad use to pyrevitlabs org 🍾
  • Loading branch information
jmcouffin authored Apr 30, 2024
2 parents c92c7ad + 23a0b8c commit 851be7c
Show file tree
Hide file tree
Showing 59 changed files with 830 additions and 355 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ jobs:
- name: Publish Release (Release)
id: publish_release
if: (github.base_ref == env.ReleaseBranch)
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
days-before-issue-stale: 60
days-before-issue-close: 14
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ extensions/*
!extensions/extensions.json
!extensions/README.md
!extensions/pyRevitBundlesCreatorExtension.extension/

# bin/*
# !bin/engines
# !bin/pyrevit.svg
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ requests = "*"
pygount = "*"
pyyaml = ">=5.4"
black = "*"
setuptools = "==69.2.0"
setuptools = "==69.5.1"
mkdocs = "*"
mkdocstrings = "*"
mkdocstrings-python = "*"
Expand Down
413 changes: 210 additions & 203 deletions Pipfile.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

 

[![GitHub issues](https://img.shields.io/github/issues/eirannejad/pyRevit.svg?style=for-the-badge)](https://github.com/eirannejad/pyRevit/issues)
[![GitHub forks](https://img.shields.io/github/forks/eirannejad/pyRevit.svg?style=for-the-badge)](https://github.com/eirannejad/pyRevit/network)
[![GitHub stars](https://img.shields.io/github/stars/eirannejad/pyRevit.svg?style=for-the-badge&colorB=red)](https://github.com/eirannejad/pyRevit/stargazers)
[![GitHub issues](https://img.shields.io/github/issues/pyrevitlabs/pyRevit.svg?style=for-the-badge)](https://github.com/pyrevitlabs/pyRevit/issues)
[![GitHub forks](https://img.shields.io/github/forks/pyrevitlabs/pyRevit.svg?style=for-the-badge)](https://github.com/pyrevitlabs/pyRevit/network)
[![GitHub stars](https://img.shields.io/github/stars/pyrevitlabs/pyRevit.svg?style=for-the-badge&colorB=red)](https://github.com/pyrevitlabs/pyRevit/stargazers)
[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg?style=for-the-badge)](http://www.gnu.org/licenses/gpl-3.0)
[![made with love in portland](https://img.shields.io/badge/%3C%2F%3E%20with%20%3C3-Portland%2C%20OR-green.svg?style=for-the-badge)](https://en.wikipedia.org/wiki/Portland,_Oregon)

Expand Down Expand Up @@ -48,7 +48,7 @@ pyRevit helps you quickly sketch out your automation and addon ideas, in whichev

**** Read the pyRevit API reference to know everything about pyRevit available modules, functions, ...

[pyRevit API Reference](https://ein.sh/pyRevit/reference/pyrevit/)
[pyRevit API Reference](https://pyrevitlabs.github.io/pyRevit/reference/pyrevit/)

**** Read the docs to know everything about pyRevit scripts, extensions, ...

Expand All @@ -67,7 +67,7 @@ pyRevit helps you quickly sketch out your automation and addon ideas, in whichev

# Staying Updated

Follow [pyRevit on Twitter](https://twitter.com/pyrevit) to stay notified about the upcoming changes and follow [pyRevit Release Notes](https://github.com/eirannejad/pyRevit/releases) for the breaking changes
Follow [pyRevit on Twitter](https://twitter.com/pyrevit) to stay notified about the upcoming changes and follow [pyRevit Release Notes](https://github.com/pyrevitlabs/pyRevit/releases) for the breaking changes

**** Check out the blog for news

Expand All @@ -81,7 +81,7 @@ Follow [pyRevit on Twitter](https://twitter.com/pyrevit) to stay notified about

# Dealing with Issues

Check the list of [Currently Open](https://github.com/eirannejad/pyRevit/issues) and [Previously Reported Issues](https://github.com/eirannejad/pyRevit/issues?q=is%3Aissue+is%3Aclosed) for anything similar to yours.
Check the list of [Currently Open](https://github.com/pyrevitlabs/pyRevit/issues) and [Previously Reported Issues](https://github.com/pyrevitlabs/pyRevit/issues?q=is%3Aissue+is%3Aclosed) for anything similar to yours.

**** See the FAQ page for questions

Expand Down Expand Up @@ -135,8 +135,8 @@ Check the list of [Currently Open](https://github.com/eirannejad/pyRevit/issues)

Made with [contrib.rocks](https://contrib.rocks)

<a href="https://github.com/eirannejad/pyRevit/graphs/contributors">
<img src="https://contrib.rocks/image?repo=eirannejad/pyRevit" />
<a href="https://github.com/pyrevitlabs/pyRevit/graphs/contributors">
<img src="https://contrib.rocks/image?repo=pyrevitlabs/pyRevit" />
</a>&nbsp;

---
Expand Down
43 changes: 27 additions & 16 deletions bin/pyrevit-hosts.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
{
"meta": {
"schema": "1.0",
"source": "https://github.com/eirannejad/pyRevit/issues/622"
"source": "https://github.com/pyrevitlabs/pyRevit/issues/622"
},
"product": "Autodesk Revit",
"release": "2013 Update Release 3",
Expand Down Expand Up @@ -290,7 +290,7 @@
{
"meta": {
"schema": "1.0",
"source": "//https://github.com/eirannejad/pyRevit/issues/543"
"source": "//https://github.com/pyrevitlabs/pyRevit/issues/543"
},
"product": "Autodesk Revit",
"release": "2014 Update Release 3",
Expand Down Expand Up @@ -902,7 +902,7 @@
{
"meta": {
"schema": "1.0",
"source": "https://github.com/eirannejad/pyRevit/issues/456"
"source": "https://github.com/pyrevitlabs/pyRevit/issues/456"
},
"product": "Autodesk Revit",
"release": "2017.0.4",
Expand Down Expand Up @@ -1034,7 +1034,7 @@
{
"meta": {
"schema": "1.0",
"source": "https://github.com/eirannejad/pyRevit/issues/456"
"source": "https://github.com/pyrevitlabs/pyRevit/issues/456"
},
"product": "Autodesk Revit",
"release": "2018.3",
Expand Down Expand Up @@ -1751,30 +1751,29 @@
"target": "x64",
"notes": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_2_html"
},
{
{
"meta": {
"schema": "1.0",
"source": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_2_html"
"source": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_3_html"
},
"product": "Autodesk Revit",
"release": "23.1.2",
"version": "23.1.20.70",
"build": "20230510_1100",
"release": "23.1.3",
"version": "23.1.30.97",
"build": "20230828_1515",
"target": "x64",
"notes": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_2_html"
"notes": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_3_html"
},

{
"meta": {
"schema": "1.0",
"source": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_3_html"
"source": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_4_html"
},
"product": "Autodesk Revit",
"release": "23.1.3",
"version": "23.1.30.97",
"build": "20230828_1515",
"release": "23.1.4",
"version": "23.1.40.56",
"build": "20240411_0945",
"target": "x64",
"notes": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_3_html"
"notes": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_4_html"
},
{
"meta": {
Expand Down Expand Up @@ -1847,6 +1846,18 @@
"build": "20231029_1515",
"target": "x64",
"notes": "https://help.autodesk.com/view/RVT/2024/ENU/?guid=RevitReleaseNotes_2024updates_2024_2_html"
},
{
"meta": {
"schema": "1.0",
"source": "https://help.autodesk.com/view/RVT/2024/ENU/?guid=RevitReleaseNotes_2024updates_2024_2_1_html"
},
"product": "Autodesk Revit",
"release": "24.2.1",
"version": "24.2.10.64",
"build": "20240408_1515",
"target": "x64",
"notes": "https://help.autodesk.com/view/RVT/2024/ENU/?guid=RevitReleaseNotes_2024updates_2024_2_1_html"
},
{
"meta": {
Expand Down
2 changes: 1 addition & 1 deletion dev/_changelog.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def generate_release_notes(args: Dict[str, str]):
install_version_urlsafe = props.get_version(install=True, url_safe=True)

base_url = (
"https://github.com/eirannejad/pyRevit/"
"https://github.com/pyrevitlabs/pyRevit/"
f"releases/download/v{install_version_urlsafe}/"
)

Expand Down
2 changes: 1 addition & 1 deletion dev/_props.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def _get_urlsafe_version(version: str):
def _get_release_url(version: str):
build_version_urlsafe = _get_urlsafe_version(version)
return (
"https://github.com/eirannejad/pyRevit/"
"https://github.com/pyrevitlabs/pyRevit/"
f"releases/tag/v{build_version_urlsafe}/"
)

Expand Down
2 changes: 1 addition & 1 deletion dev/_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ def _build_msi_installers():
def _build_choco_packages():
build_version_urlsafe = props.get_version(install=False, url_safe=True)
base_url = (
"https://github.com/eirannejad/pyRevit/"
"https://github.com/pyrevitlabs/pyRevit/"
f"releases/download/v{build_version_urlsafe}/"
)
install_version = props.get_version(install=True)
Expand Down
14 changes: 11 additions & 3 deletions dev/pyRevitLabs/pyRevitCLI/PyRevitCLIReleaseCmds.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ internal static void
}
// or find first release matching given pattern
else if (searchPattern != null) {
matchedRelease = PyRevitReleases.FindReleases(searchPattern, includePreRelease: listPreReleases).First();
matchedRelease = PyRevitReleases.FindReleases(searchPattern, includePreRelease: listPreReleases).FirstOrDefault();
if (matchedRelease is null)
throw new PyRevitException(
string.Format("No release matching \"{0}\" were found.", searchPattern)
Expand Down Expand Up @@ -106,7 +106,15 @@ internal static void
string downloadUrl = null;
switch (assetType) {
case GithubReleaseAssetType.Archive: downloadUrl = matchedRelease.ArchiveURL; break;
case GithubReleaseAssetType.Installer: downloadUrl = matchedRelease.InstallerURL; break;
case GithubReleaseAssetType.Installer:
{
var rawInstallerUrl = matchedRelease.InstallerURL;

downloadUrl = rawInstallerUrl.Replace(".nupkg", "_signed.exe").Replace("_CLI_", "_").Replace("-cli.", "_").Replace("_admin_signed.exe", "_signed.exe");

}
break;

case GithubReleaseAssetType.Unknown: downloadUrl = null; break;
}

Expand All @@ -119,7 +127,7 @@ internal static void
logger.Debug("Saving package to \"{0}\"", destPath);

// download file and report
CommonUtils.DownloadFile(downloadUrl, destPath, progressToken: Path.GetFileName(downloadUrl));
CommonUtils.DownloadFile(downloadUrl, destPath);
Console.WriteLine(
string.Format("Downloaded package to \"{0}\"", destPath)
);
Expand Down
2 changes: 1 addition & 1 deletion dev/pyRevitLabs/pyRevitLabs.Common/CommonUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public static HttpWebRequest GetHttpWebRequest(string url) {
throw new pyRevitNoInternetConnectionException();
}

public static string DownloadFile(string url, string destPath, string progressToken = null) {
public static string DownloadFile(string url, string destPath) {
try {
using (var client = GetWebClient()) {
client.Headers.Add("User-Agent", "pyrevit-cli");
Expand Down
2 changes: 1 addition & 1 deletion dev/pyRevitLabs/pyRevitLabs.Common/Consts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class PyRevitLabsConsts {

// consts for the official pyRevit repo
public const string OriginalRepoName = ProductName;
public static string OriginalRepoId = string.Format(@"eirannejad/{0}", ProductName);
public static string OriginalRepoId = string.Format(@"pyrevitlabs/{0}", ProductName);
public static string OriginalRepoBasePath = string.Format(@"https://github.com/{0}", OriginalRepoId);
public static string OriginalRepoGitPath = OriginalRepoBasePath + DefaultGitDirName;

Expand Down
2 changes: 1 addition & 1 deletion dev/pyRevitLabs/pyRevitLabs.Common/GitInstaller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public static UpdateStatus ForcedUpdate(string repoPath, GitInstallerCredentials

// before updating, let's first
// forced checkout to overwrite possible local changes
// Re: https://github.com/eirannejad/pyRevit/issues/229
// Re: https://github.com/pyrevitlabs/pyRevit/issues/229
var checkoutOptions = new CheckoutOptions();
checkoutOptions.CheckoutModifiers = CheckoutModifiers.Force;
Commands.Checkout(repo, repo.Head, checkoutOptions);
Expand Down
8 changes: 4 additions & 4 deletions dev/pyRevitLabs/pyRevitLabs.Common/Github.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public class GithubAPI {
private static readonly Logger logger = LogManager.GetCurrentClassLogger();

public const string APIReleasesURL = @"https://api.github.com/repos/{0}/releases";

public const string ArchiveFileExtension = ".zip";
public const string ArchiveInternalBranchPath = @"{0}-{1}";
public const string APIArchiveURL = @"https://github.com/{0}/archive/{1}" + ArchiveFileExtension;
Expand All @@ -87,10 +87,10 @@ public static IEnumerable<T> GetReleasesFromAPI<T>(string endpoint, out string n
// make github api call and get a list of releases
// https://developer.github.com/v3/repos/releases/
HttpWebRequest request = CommonUtils.GetHttpWebRequest(endpoint);
if (AuthToken is null)
throw new Exception("Missing authorization token. Set on GITHUBTOKEN env var");
// if (AuthToken is null)
// throw new Exception("Missing authorization token. Set on GITHUBTOKEN env var");

request.Headers.Add(HttpRequestHeader.Authorization, $"token {AuthToken}");
// request.Headers.Add(HttpRequestHeader.Authorization, $"token {AuthToken}");
var response = request.GetResponse();

// extract list of PyRevitRelease from json
Expand Down
2 changes: 1 addition & 1 deletion dev/pyRevitLabs/pyRevitLabs.Common/JSONDataSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public void UpdateData(bool forceUpdate = false) {
}

logger.Debug("Downloading to \"{0}\"", dataSourceCacheFile);
CommonUtils.DownloadFile(DataSourceURL, dataSourceCacheFile, progressToken: DataFileName);
CommonUtils.DownloadFile(DataSourceURL, dataSourceCacheFile);
}
catch (Exception dlEx) {
logger.Debug("Error downloading host database file. | {0}", dlEx.Message);
Expand Down
2 changes: 1 addition & 1 deletion dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitClones.cs
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public static void DeployFromImage(string cloneName,
logger.Info("Downloading package \"{0}\"", imageSource);
logger.Debug("Downloading package \"{0}\" to \"{1}\"", imageSource, pkgDest);
imageFilePath =
CommonUtils.DownloadFile(imageSource, pkgDest, progressToken: Path.GetFileName(imageSource));
CommonUtils.DownloadFile(imageSource, pkgDest);
logger.Debug("Downloaded to \"{0}\"", imageFilePath);
}
catch (Exception ex) {
Expand Down
6 changes: 3 additions & 3 deletions dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConsts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ public static class PyRevitConsts {
public const string DefaultCloneRemoteName = PyRevitLabsConsts.DefaultRemoteName;
public static string DefaultCopyInstallName = string.Format("{0}Copy", PyRevitLabsConsts.ProductName);

public static string ExtensionsDefinitionFileUri = string.Format(@"https://github.com/eirannejad/pyRevit/raw/{0}/extensions/{1}", PyRevitLabsConsts.TragetBranch, ExtensionsDefFileName);
public static string ExtensionsDefinitionFileUri = string.Format(@"https://github.com/pyrevitlabs/pyRevit/raw/{0}/extensions/{1}", PyRevitLabsConsts.TragetBranch, ExtensionsDefFileName);

// cli
public const string CLIHelpUrl = @"https://github.com/eirannejad/pyRevit/blob/cli-v{0}/docs/cli.md";
public const string CLIHelpUrlDev = @"https://github.com/eirannejad/pyRevit/blob/develop/docs/cli.md";
public const string CLIHelpUrl = @"https://github.com/pyrevitlabs/pyRevit/blob/cli-v{0}/docs/cli.md";
public const string CLIHelpUrlDev = @"https://github.com/pyrevitlabs/pyRevit/blob/develop/docs/cli.md";

// api
public const string ReleasePrefix = "v";
Expand Down
4 changes: 2 additions & 2 deletions dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitReleases.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ public static class PyRevitReleases {
public static PyRevitRelease GetLatestRelease(bool includePreRelease = false) {
if (includePreRelease)
return GetReleases().Where(r => r.IsPyRevitRelease)
.OrderByDescending(r => r.Version).ToList().First();
.OrderByDescending(r => r.Version).ToList().FirstOrDefault();
else
return GetReleases().Where(r => r.IsPyRevitRelease && !r.PreRelease)
.OrderByDescending(r => r.Version).ToList().First();
.OrderByDescending(r => r.Version).ToList().FirstOrDefault();
}

// Find releases
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ private void ProcessBasicFileInfo(IEnumerable<string> basicInfoDataLines) {
RevitProduct = revitProduct;
}

// Last Save Path: C:\Users\eirannejad\Desktop\Project1.rvt
// Last Save Path: C:\Users\pyrevitlabs\Desktop\Project1.rvt
match = buildFieldRegex("Last Save Path: ", "lastpath").Match(line);
if (match.Success) {
var path = match.Groups["lastpath"].Value;
Expand Down
2 changes: 1 addition & 1 deletion dev/scripts/github.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


AUTH_TOKEN = os.environ.get("GITHUB_TOKEN", "")
API_ROOT = "https://api.github.com/repos/eirannejad/pyRevit/"
API_ROOT = "https://api.github.com/repos/pyrevitlabs/pyRevit/"

API_ISSUES = API_ROOT + "issues/{ticket}"
API_ISSUE_COMMENTS = API_ROOT + "issues/{ticket}/comments"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"description": "Button to create buttons and panels for pyRevit",
"author": "Jean-Marc Couffin",
"author_profile": "https://www.linkedin.com/in/jmcouffin/",
"url": "https://github.com/eirannejad/pyRevit.git",
"website": "http://eirannejad.github.io/pyRevit/",
"url": "https://github.com/pyrevitlabs/pyRevit.git",
"website": "http://pyrevitlabs.github.io/pyRevit/",
"image": "",
"dependencies": []
}
4 changes: 2 additions & 2 deletions extensions/pyRevitCore.extension/extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"description": "Core Scripts for Autodesk Revit",
"author": "Ehsan Iran-Nejad",
"author_profile": "https://keybase.io/ein",
"url": "https://github.com/eirannejad/pyRevit.git",
"website": "http://eirannejad.github.io/pyRevit/",
"url": "https://github.com/pyrevitlabs/pyRevit.git",
"website": "http://pyrevitlabs.github.io/pyRevit/",
"image": "",
"templates": {
"author": "Ehsan Iran-Nejad",
Expand Down
4 changes: 2 additions & 2 deletions extensions/pyRevitDevHooks.extension/extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"description": "Development Hooks for pyRevit",
"author": "Ehsan Iran-Nejad",
"author_profile": "https://keybase.io/ein",
"url": "https://github.com/eirannejad/pyRevit.git",
"website": "http://eirannejad.github.io/pyRevit/",
"url": "https://github.com/pyrevitlabs/pyRevit.git",
"website": "http://pyrevitlabs.github.io/pyRevit/",
"image": "",
"templates": {
"author": "Ehsan Iran-Nejad",
Expand Down
Loading

0 comments on commit 851be7c

Please sign in to comment.