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.

Sign up for GitHub

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

Jump to bottom

Develop into main #316

Open
wants to merge 150 commits into
base: main
Choose a base branch
from
Open

Develop into main #316

wants to merge 150 commits into from

Conversation

vinoo-igem
Copy link
Contributor

@vinoo-igem vinoo-igem commented Aug 9, 2022 •
edited
Loading

Merging develop into main!

Conflicts were a few:

  • distribution.gb - chose mine
  • distribution_fasta - chose mine
  • small mol inducers package - chose theirs*

I wasn't sure if this was the right thing to do, as it looks like there was an update in develop for this that included two new parts

GC-repeat and others added 30 commits February 7, 2022 16:08
@GC-repeat
Add python linter with flake8 and pylint
108c50c
@GC-repeat
Correct pylint path for subdirectories access
4709a5b
@GC-repeat
Merge branch 'iGEM-Engineering:develop' into iss154_pylinter
9856aa5
@GC-repeat
Merge branch 'iss154_pylinter' of github.com:GC-repeat/iGEM-distribut…
560c091 
…ion into iss154_pylinter
@GC-repeat
Install dependencies for pylint
2c48059
@GC-repeat
Set max-line-length to 99 instead of 79 for flake8 and 100 for pylint
def275f
@GC-repeat
Add pip upgrade and install dependencies for flake8
0758c21
@actions-user
Build distribution
04e776a
@GC-repeat
Remove unused requirement.txt install and update pip through py-actio…
54f6624 
…ns/flake8 instead of separate step
@actions-user
Build distribution
792f95d
@jakebeal
Removed cached C0080 and C0040, which will allow them to be converted…
f8f921a 
… correctly, fixing #241

Also correct Excel sheet, which had the two IDs swapped, fixing #242
@actions-user
Automatically update exports
0b865d1
@actions-user
Automatically import referenced parts
2e7cd65
@actions-user
Collate and summarize packages
ac4697e
@actions-user
Build distribution
0f61cdd
@jakebeal
Merge pull request #243 from iGEM-Engineering/fix-241-242
2959da2 
Fix issues with C0080 and C0040
@actions-user
Collate and summarize packages
e61d471
@actions-user
Build distribution
1b0ba85
@vinoo-igem
Merge pull request #246 from iGEM-Engineering/2022-release
71e92fa 
2022 release
@Aman-Mandal
Added the link of docs in readme file
80f1b25
@GC-repeat
Fix distribution.gb conflict
ec44a06
@GC-repeat
Merge branch 'GC-repeat-iss154_pylinter' into develop
dfb63b7
@GC-repeat
Correct Pylint errors for generate_markdown.py
73cdc57
@actions-user
Collate and summarize packages
3866364
@actions-user
Build distribution
4d3c224
@vinoo-igem
start of the intro doc
345728e
@vinoo-igem
whoops, forgot to add this to the commit
dfc6490
@actions-user
Collate and summarize packages
28aee91
@actions-user
Build distribution
e6bfd43
@GC-repeat
Correct Pylint errors for build_distribution.py
553424c
GC-repeat and others added 28 commits July 25, 2022 15:34
@GC-repeat
Revert "Correct PyLint errors for convert_sbol_2to3.py"
2d89a32 
This reverts commit 0d4ba99.
@GC-repeat
Revert "Correct PyLint errors for import_parts.py"
d7ea888 
This reverts commit b53e695.
@GC-repeat
Revert "Correct PyLint errors for expor_csvs.py"
c4e2245 
This reverts commit 10e117e.
@GC-repeat
Revert "Correct Pylint errors for build_distribution.py"
1821368 
This reverts commit 553424c.
@GC-repeat
Revert "Correct Pylint errors for generate_markdown.py"
6df8ef6 
This reverts commit 73cdc57.
@GC-repeat
Add additional pylint code after reverting early manual edits
dfbfac9
@noahsprent
Fix a warning about heading length
9a928a5
@noahsprent
Add faqs page with questions from slack
f769100
@actions-user
Automatically update exports
24bb61f
@actions-user
Collate and summarize packages
d0dac63
@actions-user
Build distribution
135865f
@jakebeal
New rdflib no longer injects spurious blank lines
2064665
@actions-user
Automatically update exports
540cfe6
@actions-user
Collate and summarize packages
06d6282
@actions-user
Build distribution
64cce42
@jakebeal
Merge pull request #311 from iGEM-Engineering/rdflib-upgrade
dad72e4 
New rdflib no longer injects spurious blank lines
@jakebeal
Merge pull request #204 from GC-repeat/iss154_pylinter
8b3f7b7 
Iss154 : Add Python Linter
@jakebeal
Merge pull request #279 from iGEM-Engineering/code-of-conduct
fde7d11 
Code of conduct
@noahsprent
Make Paul's suggested changes
f4c0671
@actions-user
Collate and summarize packages
965815c
@actions-user
Build distribution
5c0f0f2
@noahsprent
Merge pull request #309 from iGEM-Engineering/iss293-faq
62c274d 
Add FAQs page
@jakebeal
Fix style issues identified by flake8
ee2e126
@actions-user
Collate and summarize packages
0ccbb9e
@actions-user
Build distribution
b865ad4
@jakebeal
Merge pull request #314 from iGEM-Engineering/fix-flake-errors
d0b8492 
Fix style issues identified by flake8
@vinoo-igem
Merge branch 'develop'
77cdcca 
# Conflicts:
#	Small Molecule Inducers/Small Molecule Inducers.xlsx
#	distribution.gb
#	distribution_synthesis_inserts.fasta
@actions-user
Automatically update exports
00b74ea
@vinoo-igem vinoo-igem requested a review from jakebeal August 9, 2022 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakebeal jakebeal jakebeal approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@vinoo-igem @jakebeal @GC-repeat @actions-user @Aman-Mandal @noahsprent @nickdelkis @Gonza10V