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

Release v1.1 #180

Merged
merged 279 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
279 commits
Select commit Hold shift + click to select a range
b7675b3
fix DC power factor div by zero
Nov 2, 2022
0d78abf
PR changes - new onshore methods
Nov 26, 2022
743572a
Merge branch 'dev' into electrical-refactor
JakeNunemaker Dec 2, 2022
dadf1cb
Removed cable_type requirement.
JakeNunemaker Dec 2, 2022
d080dde
Updated mooring system installation and hookup times.
rrolph575 Jan 13, 2023
1d1432e
working on mooring update
rrolph575 Jan 19, 2023
15c5c3e
Added the Semi-taut mooring system design module
rrolph575 Jan 20, 2023
5b4023f
Added SemiTaut design phase to design init
rrolph575 Jan 20, 2023
c5b72f9
fixed import so new semitaut design module is running. might be givin…
rrolph575 Jan 21, 2023
0472130
Changed water depth to match comparison project
rrolph575 Jan 24, 2023
7eb2d76
Created a Floating Offshore Substation design module that uses (for n…
rrolph575 Feb 4, 2023
2aa20b8
last commit didnt have all changes for adding floating oss design module
rrolph575 Feb 4, 2023
e2fc7a5
testing why floatingPY is called twice
rrolph575 Feb 4, 2023
3744934
adding example run scripts that show 2x print statement
rrolph575 Feb 4, 2023
ba3ab5d
corrected that all moorings from farm were being added to each substa…
rrolph575 Feb 6, 2023
9ecee38
fixed syntax errors
rrolph575 Feb 6, 2023
8209570
updated example notebooks
rrolph575 Feb 6, 2023
63203fa
Merge branch 'electrical-refactor' into SemiTaut_Mooring_Update
JakeNunemaker Feb 21, 2023
ff6ebd9
Added flag for floating OSS in ElectricalDesign (zero out monopile cost)
Feb 21, 2023
f930b22
Remove print statement
Feb 21, 2023
8ca374c
allow floating_oss to be optional
Feb 22, 2023
2000caa
onshore docs
Feb 22, 2023
4090057
fix bug that causes error with >2 substations
RHammond2 Feb 23, 2023
5765f25
fix issue with unnecessary commas in error message
RHammond2 Feb 23, 2023
b54a4a8
Updated outdated tests.
JakeNunemaker Feb 23, 2023
2350a27
Merge branch 'dev' into electrical-refactor
JakeNunemaker Feb 23, 2023
c99b94c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 23, 2023
30795da
Suppress print statement in oss_install/floating.py
Feb 23, 2023
d91fe4a
Merge branch 'SemiTaut_Mooring_Update' of https://github.com/WISDEM/O…
Feb 23, 2023
f01ecdb
Merge branch 'dev' of https://github.com/WISDEM/ORBIT into dev
RHammond2 Mar 7, 2023
22a280e
Feature/phase dates rework (#135)
JakeNunemaker Mar 14, 2023
48f84b0
Make delay messages more informative
Mar 3, 2023
866c8d2
Add electrical commissioning process (and update nacelle lift time) i…
Mar 15, 2023
44e29b6
Merge branch 'SemiTaut_Mooring_Update' of https://github.com/WISDEM/O…
Mar 15, 2023
53559c3
Update tower section process time in TurbineAssemblyLine
Mar 15, 2023
5b400ab
Added constraint for O&M activities at port to TurbineAssemblyLine.mo…
Mar 15, 2023
5cc306d
Feature/phase dates rework (#135)
JakeNunemaker Mar 14, 2023
e58c886
change default value to boolean
Mar 15, 2023
04009f2
implementation for transfering and installing
Mar 16, 2023
841b4d0
Revised port_in_use constraint.
JakeNunemaker Mar 28, 2023
c53af36
Merge branch 'dev' of https://github.com/RHammond2/ORBIT into dev
RHammond2 Mar 30, 2023
27fa251
fix bug where nan cable sections persist throughout calculations and …
RHammond2 Mar 30, 2023
afcef10
add error message for scour vessel limits being too low
RHammond2 Mar 30, 2023
4ef9291
Merge pull request #136 from RHammond2/minor-bug-fixes
JakeNunemaker Apr 4, 2023
9f7af8a
Revert "[pre-commit.ci] auto fixes from pre-commit.com hooks"
JakeNunemaker Apr 4, 2023
389c187
Merge branch 'dev' into electrical-refactor
JakeNunemaker Apr 4, 2023
41bc013
Merge branch 'electrical-refactor' into SemiTaut_Mooring_Update
JakeNunemaker Apr 4, 2023
70a9b82
275 kV costs, remove double count in system_capex
Apr 5, 2023
0da7316
Merge branch 'electrical-refactor' of https://github.com/WISDEM/ORBIT…
Apr 5, 2023
eacaf12
revise substation calc (cost is per oss now)
Apr 6, 2023
a604f5b
Added pathway for onshore construction cost into export system install.
JakeNunemaker Apr 7, 2023
4f18e7b
removed onshore_construction_time from kwargs tests.
JakeNunemaker Apr 7, 2023
5e27d67
Merge branch 'electrical-refactor' into SemiTaut_Mooring_Update
JakeNunemaker Apr 7, 2023
f66affc
improve delay message and formatting
Apr 9, 2023
9684fec
use user-defined wave height and wind speed limits
Apr 9, 2023
25fafaf
Added dynamic cables (20% cost adder), cable lay/bury times, and cabl…
Apr 14, 2023
2cd2098
Update CLV carousel specs to match Leonardo da
Apr 14, 2023
347fcf2
change delay message
Apr 17, 2023
b3150a5
change vessel speeds
Apr 18, 2023
65bfb0d
remove duplicate transit back to port
Apr 20, 2023
de50cbc
Merge pull request #112 from WISDEM/electrical-refactor
JakeNunemaker Apr 21, 2023
d118855
Added project progress debug logs to MooredSubInstallation and Floati…
JakeNunemaker Apr 21, 2023
c540a76
allow separate cable lay burial rates
Apr 22, 2023
50144ca
account for multiple assembly lines in installation costs
May 1, 2023
5a38ca4
update vessel specs
May 26, 2023
3e7560e
cost updates, vessel updates
Jun 26, 2023
0911feb
cost updates, vessel updates
Jun 26, 2023
72b655a
costs to include pm + profit
Jun 26, 2023
b02df95
fix topside, substructure switch
Sep 6, 2023
3baed36
Revert solo monopile install to original get items from port method
JakeNunemaker Oct 20, 2023
7d678af
adding more cables
rrolph575 Nov 10, 2023
fb74c96
Merge branch 'dev' into electrical-refactor-final
nRiccobo Dec 11, 2023
d1cf904
Autoupdate pre-commit, began cleaning up electrical_export. Simplfiie…
nRiccobo Dec 11, 2023
845c5ba
Updated calc_mpt_cost to have 0 cost and 0 rating for hvdc system.
nRiccobo Dec 11, 2023
5c12081
Updated calc_dc_breaker to make sure the cost is 0 for hvac cases
nRiccobo Dec 11, 2023
6699b9f
Updated test_electrical_design and commented out sections that break.…
nRiccobo Dec 12, 2023
c8600cf
reverted name of electrical_design.py to electrical_export to match o…
nRiccobo Dec 13, 2023
15dee4c
Renamed XLPE 1000mm cable config files. Cleaned up comments in cable …
nRiccobo Dec 14, 2023
1fe347a
Cleaned up comments in cable config files.
nRiccobo Dec 14, 2023
fedecdd
adjusted test_electrical_design to call correct kwargs.
nRiccobo Dec 14, 2023
290e74c
Updated docs for intro and manager modules
nRiccobo Dec 14, 2023
d3cb96c
Cleaning up comments in electrical_export and updating ProjectManager…
nRiccobo Dec 15, 2023
e21302a
onshore test added, onshore_cost debug
Dec 22, 2023
1345f68
onshore test added, onshore_cost debug
Dec 22, 2023
f25350a
Merge branch 'electrical-refactor' of https://github.com/WISDEM/ORBIT…
Dec 22, 2023
6927c37
Merge branch 'electrical-refactor' into electrical-refactor-final
nRiccobo Dec 26, 2023
c33851b
removed mpt = 0 for hvdc condition
nRiccobo Dec 28, 2023
2f30803
Updated test_electrical_design to use non-test hvdc cable
nRiccobo Jan 5, 2024
986a87d
Adjusted mpt rating bug for hvdc config. Adjusted onshore test
nRiccobo Jan 5, 2024
63800aa
Updating .github workflow file actions to use v4 instead of v2.
nRiccobo Jan 16, 2024
d025d9c
Adjusted gh_pages workflow
nRiccobo Jan 16, 2024
7cf2776
Adjusting gh pages workflow again.
nRiccobo Jan 16, 2024
ba22ca3
Updated the checkout and setup-python versions from 2 to 4. Replaced …
nRiccobo Jan 19, 2024
eba3cbd
Merge pull request #142 from nRiccobo/workflow-versions-#141
nRiccobo Jan 19, 2024
c490e9d
Merge branch 'workflow-versions-#141' into electrical-refactor-final
nRiccobo Jan 19, 2024
021bd48
Removed git ref in the checkout steps
nRiccobo Jan 19, 2024
863041c
Updated the default cable name in wisdem api
nRiccobo Jan 19, 2024
a9263f5
Removed git ref step as part of automated tests.
nRiccobo Jan 19, 2024
0fadefc
Merge pull request #143 from WISDEM/workflow-versions-#141
nRiccobo Jan 19, 2024
5fb5d32
Merge remote-tracking branch 'upstream/dev' into electrical-refactor-…
nRiccobo Jan 19, 2024
bdf2df3
Merge pull request #139 from nRiccobo/electrical-refactor-final
nRiccobo Jan 23, 2024
a646dfd
adjust onshore shunt reactor cost calc
Feb 20, 2024
52fef86
Added HVAC/DC example to Example - Parametric Manager
nRiccobo Feb 29, 2024
d303b37
Added exploring outputs example to 3. ProjectManager Introduction
nRiccobo Feb 29, 2024
8ff4554
Cleaned up some hdvc conditionals
nRiccobo Feb 29, 2024
0455343
updated the cable names in 1000mm hvac cables
nRiccobo Mar 4, 2024
2da4dca
Adjusted onshore costs to be a separate dictionary input. Renamed som…
nRiccobo Mar 5, 2024
07e8dbb
Updated test_electrical_design to compare new and old oss_design. Tem…
nRiccobo Mar 5, 2024
ef00a02
Forgot to add file after format change.
nRiccobo Mar 5, 2024
d7a0f36
"Moved HVDC HVAC parametric manager to its own example"
nRiccobo Mar 5, 2024
36ebb0f
Created an example dedicated to HVAC and HVDC comparison
nRiccobo Mar 5, 2024
df2044b
had to freeze python-benedict<0.33.2. Latest version breaks parametri…
nRiccobo Mar 5, 2024
6134359
Had to freeze benedict version. See issue #148. Autoupdated pre-commi…
nRiccobo Mar 11, 2024
69e12ee
moved interconnection distance from landfall dict to export_system_de…
nRiccobo Mar 11, 2024
c91578c
added interconnection distance to kwargs test.
nRiccobo Mar 11, 2024
922f93f
Merge branch 'dev' into 147-interconnection-distance
nRiccobo Mar 11, 2024
e39596d
Merge pull request #146 from nRiccobo/electrical-refactor
nRiccobo Mar 12, 2024
5c49b12
Removed unused packages from Example - Parametric Manager
nRiccobo Mar 12, 2024
7aeae5c
Added landfall sub dict to export_system dict. Added deprecation warn…
nRiccobo Mar 14, 2024
31a5f3f
updated test to include a temporary check for deprecated warnings.
nRiccobo Mar 14, 2024
8b611a6
Added landfall sub dict to export system design. Added deprecation wa…
nRiccobo Mar 14, 2024
4574c14
Removed landfall from test yaml config. Adjusted results test and add…
nRiccobo Mar 14, 2024
5195741
Same updates for electrical design as export system design. Added dep…
nRiccobo Mar 14, 2024
7999548
Adjusted electrical design base config and added deprecation test.
nRiccobo Mar 14, 2024
c67c205
Updated wisdem api to have deprecation warnings and new dictionaries.…
nRiccobo Mar 14, 2024
0ce1262
Updated electricl export deprecated warning conditions and tests.
nRiccobo Mar 15, 2024
55941cc
Updated export system deprecated warning conditions and tests.
nRiccobo Mar 15, 2024
2bf7f28
Updated export install deprecated conditions and tests.
nRiccobo Mar 15, 2024
bb50f91
Updated wisdem api deprecated warning messages.
nRiccobo Mar 15, 2024
8eb149e
Merge pull request #149 from nRiccobo/147-interconnection-distance
nRiccobo Mar 15, 2024
be1796e
Merge remote-tracking branch 'dev' into electrical-refactor
nRiccobo Mar 18, 2024
ad8920e
cleaned up electrical_export per comments.
nRiccobo Mar 26, 2024
48a2523
Updated changelog and ElectricalDesign doc.
nRiccobo Mar 26, 2024
f415508
Fixed mpt and shunt costs to be _unit_cost, rather than cost_rate so …
nRiccobo Apr 1, 2024
5c262df
Updated changelog to include some release notes.
nRiccobo Apr 1, 2024
b636abf
Updated ElectricalDesign doc to have correct mpt and shunt cost names
nRiccobo Apr 1, 2024
5235f41
Merge pull request #150 from WISDEM/electrical-refactor
nRiccobo Apr 1, 2024
65c4b7c
Added 22MW yaml file
dmulash Apr 23, 2024
d845f0d
Added a test to make sure 22MW generic is different that a baseline c…
nRiccobo Apr 24, 2024
715ee1b
Changed tests.yml to remove 3.7 and added 3.9. 3.7 is not supported i…
nRiccobo Apr 24, 2024
9ad4454
Updated yml github workflows to python=3.10+, exclude older version f…
nRiccobo Apr 24, 2024
ec2ee11
added exclusion for ubuntu and 3.12
nRiccobo Apr 24, 2024
8618194
changed highest version to 3.11
nRiccobo Apr 24, 2024
1543f27
changed 3.10 to 3.10.0 to see if 3.1 isn't falsely chosen
nRiccobo Apr 24, 2024
a9a34be
adjusted py versions to 3.8 for pages/pypi
nRiccobo Apr 25, 2024
b486658
Updating README and setups to reflect python 3.8
nRiccobo Apr 25, 2024
a6ea844
Adjusted exclude for macos-latest
nRiccobo Apr 25, 2024
3d566a7
Advancing gh pages, pypi and tests to 3.10
nRiccobo Apr 26, 2024
68dccff
Changed tests py versions to string for yaml parsing to work properly.
nRiccobo Apr 26, 2024
924c5fe
updated readme and setup for py=3.10
nRiccobo Apr 26, 2024
aadf1fd
updated setup classifier with all py versions
nRiccobo Apr 26, 2024
9f0acb5
Merge pull request #154 from nRiccobo/python-3.10+
nRiccobo Apr 26, 2024
4445939
Fixed monopile thickness bug. Had to double value in mass assertion
nRiccobo Apr 26, 2024
fe814f5
Had to fix py version for yaml parsing in pypi workflow.
nRiccobo Apr 26, 2024
d92e881
Merge pull request #156 from WISDEM/155-fix-monopile-vol
nRiccobo Apr 29, 2024
43ef47e
Merge branch 'dev' into 151-feature-iea22
nRiccobo Apr 29, 2024
6238174
Merge pull request #152 from WISDEM/151-feature-iea22
dmulash Apr 29, 2024
9cd1244
Added semitaut arrays features to mooringsystem. Created rope/chain d…
nRiccobo Apr 30, 2024
671bd2a
Added anchor cost and total line cost of semitaut option.
nRiccobo May 1, 2024
9f5ea2e
Merge dev into SemiTaut_Mooring_Update
nRiccobo May 1, 2024
da759ea
Cleaned up interp objects and repetitive lines.
nRiccobo May 1, 2024
7413a00
renamed semitaut dict to semitaut_params for clarity
nRiccobo May 1, 2024
0f56d8e
Cleaned up pre-commit warnings/errors like unused kwargs and line len…
nRiccobo May 2, 2024
4e0f5df
Check if ahts_vessel is None rather than a KeyError.
nRiccobo May 2, 2024
6b8c2c7
Made ahts_vessel optional temporarily to raise warnings rather than a…
nRiccobo May 2, 2024
6573b45
Adjusted floating true/false logic in electrical export. Eliminate re…
nRiccobo May 2, 2024
3e2b6c8
Updated semitaut examples.
nRiccobo May 21, 2024
fab774b
Updated electrical_design testing to check floating/fixed offshore su…
nRiccobo May 31, 2024
c10f253
Updated oss_design test for floating/fixed options
nRiccobo May 31, 2024
3aa5aa5
Adjusted floating/standard oss install to count for floating and fix …
nRiccobo May 31, 2024
6d8e411
Cleaned up line length and mass calc and included TLP option
nRiccobo May 31, 2024
b36453f
Rearranged floating or fixed logic. Set substructure length=0 for flo…
nRiccobo May 31, 2024
1bf2472
Rearranged mooring type logic to default to catenary
nRiccobo May 31, 2024
c358c3d
Made interp1d extrapolate outside range and connected mooring_list_co…
nRiccobo May 31, 2024
eaee68a
Updated floating example and config yaml
nRiccobo May 31, 2024
adc1671
cleaned up fixed added length for semitaut. Updated test
nRiccobo Jun 3, 2024
959e46b
Updated yaml configs and example notebooks
nRiccobo Jun 3, 2024
f628d04
Updated moored deprecated warnings and a test
nRiccobo Jun 3, 2024
909ee37
WISDEM api test failed because of new ahts vessel logic.
nRiccobo Jun 4, 2024
d990832
Updated test yaml configs to deal with ahts and support vessel calls
nRiccobo Jun 4, 2024
b352386
adjusted the name and comments for this temporary class.
nRiccobo Jun 5, 2024
411e45b
Added comment for oss substructure mass calcs.
nRiccobo Jun 5, 2024
50ae6a1
Updated electrical design tests and fixed duplicate line in Electrica…
nRiccobo Jun 6, 2024
5e27035
Updating floating example and cleaned comments in oss_floating.
nRiccobo Jun 7, 2024
65728e8
Added reference for semitaut line constants
nRiccobo Jun 10, 2024
8749076
Removed commented anchor install cost method. Added to process_time
nRiccobo Jun 10, 2024
90bb8c5
Updated tests to verify defaults. Cleaned up single character object …
nRiccobo Jun 10, 2024
bdcff41
Updated changelog and docs.
nRiccobo Jun 10, 2024
08cae48
changelog and floating.py clean up and update after file save.
nRiccobo Jun 10, 2024
41e57c2
Addressed the deprecated support_vessel call in gravity-base install.…
nRiccobo Jun 14, 2024
90dd2cf
Had to remove a print statement that I left.
nRiccobo Jun 17, 2024
a133c01
Updated sim setup test to sweep different configs.
nRiccobo Jun 18, 2024
4d242e4
Merge pull request #158 from WISDEM/SemiTaut_Mooring_Update
nRiccobo Jun 20, 2024
2087b38
Enhancement/pyproject setup (#165)
RHammond2 Jun 20, 2024
39cd770
Ruff Adoption & Linting Reset (#166)
RHammond2 Jun 26, 2024
96c1729
Updated spar design common_cost.
nRiccobo Jul 8, 2024
c83e614
Updated semisub design cost in common cost.
nRiccobo Jul 8, 2024
2657029
Updated monopile design with common cost
nRiccobo Jul 8, 2024
158cf1b
Updated electrical_export and oss_design in common costs.
nRiccobo Jul 9, 2024
a64980f
Fixed typos in electrical_export and updated common_cost.
nRiccobo Jul 9, 2024
6902f39
Updated mooring system and common_cost.
nRiccobo Jul 9, 2024
e672a1b
Quick fix for #168, missing topside costs in substation system_capex
nRiccobo Jul 9, 2024
f8d3859
Merge pull request #170 from nRiccobo/bug/#168-oss-system_capex
nRiccobo Jul 10, 2024
888982f
formatting common_cost.
nRiccobo Jul 10, 2024
a2c2101
Updated electrical export test.
nRiccobo Jul 10, 2024
2f1932f
Merge remote-tracking branch 'origin' into relocate-get-costs
nRiccobo Jul 10, 2024
d07a3b0
Updated test to fix F811 error.
nRiccobo Jul 10, 2024
d5b7ad5
Added general method to base for getting default cost
nRiccobo Jul 11, 2024
5fe95dc
Moved get_default_cost from base to design phase. Tested with spar_de…
nRiccobo Jul 17, 2024
5d2612d
Updated electrical_export with new get_default_cost method.
nRiccobo Jul 18, 2024
02fdade
Had to add and swap self.num_switchgear with self.num_cables. 0 switc…
nRiccobo Jul 18, 2024
6bddc9e
Updated monopile design with get_default_cost.
nRiccobo Jul 18, 2024
953c8ed
Updating oss, monopile and mooring system with get_default_cost. Star…
nRiccobo Jul 18, 2024
eeeb140
Updated semisub model with get_default_cost. cleaned up other files.
nRiccobo Jul 19, 2024
55e7205
Removed export_system from oss_design config temporarily.
nRiccobo Jul 19, 2024
d13c270
Updated monopile design load factor
Jul 31, 2024
9e9abb6
Addressed doc string items and duplicate mass calculations.
nRiccobo Jul 31, 2024
b7e513e
Updated changelog with relocate cost updates
nRiccobo Jul 31, 2024
7b59430
Merge pull request #169 from nRiccobo/relocate-get-costs
nRiccobo Aug 1, 2024
b451a03
Add cost curve creator notebook
rafmudaf Aug 8, 2024
5e59f5c
Add parameters to array cable cost curve
rafmudaf Aug 8, 2024
a733ee5
Improve array cable models and add export system curves
rafmudaf Aug 9, 2024
11e3899
Add a cost model for semisubmersible substructure
rafmudaf Aug 9, 2024
f9dc724
Add curve types and update all curves
rafmudaf Aug 13, 2024
ebd7e64
Consolidate plotting and expand docs
rafmudaf Aug 13, 2024
614f67d
Use autolayout for plots
rafmudaf Aug 13, 2024
b4bffe0
Clean up documentation
rafmudaf Aug 13, 2024
468bf0e
Add export methods
rafmudaf Aug 14, 2024
1950898
Add docs for new curve types
rafmudaf Aug 15, 2024
314889d
Added test total cost to monopile. Added test total substation costs …
nRiccobo Aug 16, 2024
8a6fd99
Added assert system costs to catenary, tlp, and semitaut kwarg tests.…
nRiccobo Aug 16, 2024
e49d4cf
Added test total cost to oss, semisub, and spar design.
nRiccobo Aug 16, 2024
3def1e5
added test total cable cost to array system design.
nRiccobo Aug 16, 2024
7f8a8f8
Changed recent lower() and upper() case checks to title() case.
nRiccobo Aug 20, 2024
f54fa0a
Added test total capex for fixed and floating project at PM level.
nRiccobo Aug 20, 2024
a2a5d93
Merge pull request #173 from nRiccobo/tests/design-costs
nRiccobo Aug 21, 2024
c6d4447
Add comments on inputs
rafmudaf Aug 21, 2024
ad6e8c8
Add offshore floating substation function
rafmudaf Aug 21, 2024
fba2cc3
Add export equation line to template workflow
rafmudaf Aug 21, 2024
8afa7d8
Merge pull request #175 from rafmudaf/dev
nRiccobo Sep 11, 2024
35ec748
Reverting monopile mass assertion after load_factor was adjusted.
nRiccobo Sep 11, 2024
78bd3ac
Merge pull request #178 from nRiccobo/dev
nRiccobo Sep 12, 2024
aa04823
Cleaned up Floating Example to include semitaut options. Removed semi…
nRiccobo Sep 13, 2024
be5e9bb
Clean up SemiTaut references.
nRiccobo Sep 13, 2024
b591ad3
Updated change log and version number.
nRiccobo Sep 13, 2024
18c794e
Cleaned up test mooring system
nRiccobo Sep 13, 2024
b9ba071
fix small typos
RHammond2 Sep 13, 2024
f4e41d9
updating email address
RHammond2 Sep 13, 2024
6338de6
configure pypi to tags->test-pypi and release->pypi
RHammond2 Sep 13, 2024
e6ad5f5
Merge pull request #179 from nRiccobo/release/1.1
nRiccobo Sep 13, 2024
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
5 changes: 0 additions & 5 deletions .flake8

This file was deleted.

3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Adopting ruff in place of flake8 & pylint, and cleaning up the previously ignored errors
faeab2d971c6de9d1afbb7f8b63c0c8dfc4c85ec
66a52fa234cb3296a28b06cb2f5ccf42637326bb
6 changes: 3 additions & 3 deletions .github/workflows/gh_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
make-pages:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: select python version
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.10'
- name: install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
50 changes: 30 additions & 20 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
name: Upload to PyPi
# This workflow will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

on: push
name: Deploy to PyPI

on:
release:
types: [published]

jobs:
deploy:
release-pypi:
environment: release
# Upload to PyPI on every published release
if: github.event.action == 'published'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: Build and publish
if: startsWith(github.ref, 'refs/tags/v')
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Build package
run: |
python -m pip install --upgrade pip
pip install setuptools build wheel twine
python -m build
twine check --strict dist/*

- name: Publish package to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
verbose: True
37 changes: 37 additions & 0 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

name: Deploy to Test PyPI

on:
push:
tags:
- 'v*'

jobs:
release-test-pypi:
# Upload to Test PyPI on every pushed tag.
environment: release
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Build package
run: |
python -m pip install --upgrade pip
pip install setuptools build wheel twine
python -m build
twine check --strict dist/*

- name: Publish package to Test PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
verbose: True
repository-url: https://test.pypi.org/legacy/
14 changes: 8 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,17 @@ jobs:
max-parallel: 3
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.7, 3.8]
python-version: ['3.9', '3.10', '3.11']
exclude:
- os: macos-latest
python-version: '3.9'
- os: macos-latest
python-version: '3.10'

steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 1
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
9 changes: 0 additions & 9 deletions .isort.cfg

This file was deleted.

31 changes: 15 additions & 16 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@ ci:
skip: [isort, black, pylint]

repos:
- repo: https://github.com/timothycrosley/isort
rev: 4.3.21
- repo: https://github.com/pycqa/isort
rev: 5.13.2
hooks:
- id: isort
name: isort
stages: [commit]
- id: isort
name: isort (python)

- repo: https://github.com/psf/black
rev: stable
rev: 24.2.0
hooks:
- id: black
name: black
stages: [commit]
exclude: ^ORBIT/api/wisdem
- id: black
name: black
stages: [commit]
exclude: ^ORBIT/api/wisdem

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
Expand All @@ -25,16 +24,16 @@ repos:
- id: check-executables-have-shebangs
- id: check-json
- id: check-yaml
args: [--unsafe] # allow Python constructors
- id: check-merge-conflict
- id: check-symlinks
- id: flake8
exclude: ^tests/
- id: mixed-line-ending
- id: pretty-format-json
args: [--autofix]

- repo: https://github.com/pre-commit/mirrors-pylint
rev: v2.1.1
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.4.10
hooks:
- id: pylint
exclude: ^tests/
- id: ruff
args: [--fix]
Loading
Loading