Skip to content

Commit 04405fb

Browse files
authored
Merge pull request #8 from JLSteenwyk/new_python_and_biopython_versions
New python and biopython versions
2 parents 6df5bad + 7aa9145 commit 04405fb

File tree

6 files changed

+81
-71
lines changed

6 files changed

+81
-71
lines changed

.DS_Store

0 Bytes
Binary file not shown.

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
runs-on: macos-latest
66
strategy:
77
matrix:
8-
python-version: [3.7, 3.8]
8+
python-version: ["3.9", "3.10"]
99
steps:
1010
- uses: actions/checkout@master
1111
- name: Set up Python ${{ matrix.python-version }}
@@ -26,13 +26,13 @@ jobs:
2626
test-full:
2727
runs-on: macos-latest
2828
env:
29-
PYTHON: '3.9'
29+
PYTHON: "3.10"
3030
steps:
3131
- uses: actions/checkout@master
3232
- name: Setup Python
3333
uses: actions/setup-python@master
3434
with:
35-
python-version: 3.9
35+
python-version: "3.10"
3636
- name: Install dependencies
3737
run: |
3838
pip install -r requirements.txt
@@ -87,4 +87,4 @@ jobs:
8787
with:
8888
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8989
BRANCH: gh-pages
90-
FOLDER: docs/_build/html
90+
FOLDER: docs/_build/html

orthosnap/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.0.0"
1+
__version__ = "1.1.0"

requirements.txt

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1-
biopython==1.78
2-
numpy==1.20.1
3-
tqdm==4.58.0
1+
biopython==1.81
2+
coverage==7.3.2
3+
Cython==3.0.4
4+
exceptiongroup==1.1.3
5+
iniconfig==2.0.0
6+
mock==5.1.0
7+
numpy==1.24.0
8+
packaging==23.2
9+
pluggy==1.3.0
10+
pytest==7.4.2
11+
pytest-cov==4.1.0
12+
pytest-mock==3.0.0
13+
tomli==2.0.1
14+
tqdm==4.66.1

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
"Operating System :: OS Independent",
1313
"Intended Audience :: Science/Research",
1414
"Programming Language :: Python",
15-
"Programming Language :: Python :: 3.7",
16-
"Programming Language :: Python :: 3.8",
1715
"Programming Language :: Python :: 3.9",
16+
"Programming Language :: Python :: 3.10",
1817
"Topic :: Scientific/Engineering",
1918
]
2019

21-
REQUIRES = ["biopython==1.78", "numpy==1.20.1", "tqdm==4.58.0"]
20+
REQUIRES = ["biopython>=1.81", "numpy>=1.24.0", "tqdm>=4.66.1"]
2221

2322
setup(
2423
name="orthosnap",
@@ -36,7 +35,7 @@
3635
install_requires=REQUIRES,
3736
)
3837

39-
## push new version to pypi
38+
# push new version to pypi
4039
# rm -rf dist
4140
# python3 setup.py sdist bdist_wheel --universal
4241
# twine upload dist/* -r pypi
Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
>Aspergillus_oerlinghausenensis_CBS139183|A_oerling_CBS139183_09150-RA
2-
MGSMHEAG----------------------------------------------------
1+
>Aspergillus_oerlinghausenensis_CBS139183|A_oerling_CBS139183_05774-RA-duplicate
2+
M-----------------------------------------------------------
33
------------------------------------------------------------
44
------------------------------------------------------------
5-
----------------------SRPAADAD---MDTDR------VHPEAV----------
6-
-----SNSERDFEKQDSKPEYRDAFGDEEYAEVKYKTLSWWQCGFLMVAETVSLGILSLP
7-
AVV---AALGLVPAIILLVALGLMSTYTGYTIGQFKWAYPHIHSMGDAGEVIMGRFGREL
8-
FGTGQLLLVVFIMASHILTFTVAMNSITDHGTCSIVFGVVGLVISFVLCLPRTLAKVSFL
9-
SVASFISVFSAVLIVMIAVGVQRPWHGSVNATVDTSLYKAFLAVCNIVFSFCRLFLHFIS
10-
FMDRTDRTAGHVAFFGFMAELRNPRDYPKSLFLLQGIDTCLYIVAAVVIYCYAGDDVTSP
11-
ALGSASTIVKKVAYGIALPTIIIGGVVNGHVACKYIYVRMWR-HSDRMHKRDLVATGSWV
12-
LIGLATWIVAWIIAEAIPVFNNLLSLVASLFASWFTYGFSALFWLYLNKGRFFSTPMKTA
13-
LTILNVVIMGIACCICGLGLYVSGKALHDDPSSASF------------------------
145
------------------------------------------------------------
156
------------------------------------------------------------
167
------------------------------------------------------------
17-
---------------------------SCANNA---------------------------
8+
FGIGQLLFLIFLMASHILTFTVVFNTITNHGTCTIVFGVVGLVVSFIGALPRTMGKVYWM
9+
SMASCISIVTATVVTMIAIGVQAPDHVHVDATTEVSFQDAFLAVTNIIFAY---------
10+
--------IAHVAFFGFISEMHDPRDFPKSLTMLQVVDTSLYIVTAMVIYRYAGPDVASP
11+
ALSSAGPLMKKVAYGLAIPTVVIAGVVFGHVACKYIYVRIFR-GSAHMHQNSFLAIGSWV
12+
AIALGVWVVAWVIAESIPVFNELLSLISSLFGSWFSYGLPAIFWLVMNKGRWFSTRSKIC
13+
LTIVNFLILAFACALCGMGLYVSGKSIHDSSSKASW------------------------
1814
------------------------------------------------------------
1915
------------------------------------------------------------
2016
------------------------------------------------------------
21-
>Aspergillus_fumigatus_Af293|EAL84262.1
22-
MGSMHEAG----------------------------------------------------
17+
---------------------------TCKNNAT--------------------------
2318
------------------------------------------------------------
2419
------------------------------------------------------------
25-
----------------------SRPAAGAD---MDTDR------VHPEAV----------
26-
-----SDNERDFEKQDSKPEYQDAFGDEEYAEVKYKTLSWC-------------------
20+
----------------------------------------------------------TT
21+
>Aspergillus_fumigatus_Af293|EAL85095.2-duplicate
22+
M---------------------MLWLK---------------------------------
2723
------------------------------------------------------------
2824
------------------------------------------------------------
29-
-------VFSAVLIVMIAVGVQRPWHGGLNATVDTNLYKAFLAVCNIVFSFCRLFLHFSS
30-
FMDRTNKTAGHVAFFGFMAELRNPRDYPKSLFLLQGIDTCLYIIAAVVIYCYAGDDVTSP
31-
ALGSASTIVKKVAYGIALPTIIIGGVVNGHVACKYIYVRMWR-HSDRMHKRDLVATGSWV
32-
LIGLATWIVAWIIAEAIPVFNNLLSLVREVLVV-----ICTMIW-----ERVLIAPSVTA
33-
FRLF------------PLALFVATR----DPRSIG-------------------------
25+
--------------------RRNMLMGRRQMTRLEM------------------------
26+
-------------------------KNAERSNIV-------SCRGVMVAENISLGILSLS
27+
SAV---ATLGIVPAVILLLGLSAISWYTGYIMGQFKLRFPQIHSMGDAGELLMGRFGREL
28+
FGIGQLLFLIFLMASHILTFSVVFNTITNHGTCTIVFGVVGLVVSFIGALPRTMGKVYWM
29+
SMASCISIVTATVVTMIAIGVQAPDHVHVNVTTKVSFQDAFLAVTNIIFAY---------
30+
--------IAHVAFFGFISEMHDPRDFPKSLTMLQVVDTSLYIVTAMVIYRYAGPDVASP
31+
ALSSAGPLMKKVAYGLAIPTVVIAGVVFGHVACKYIYVRIFR-GSAHMHQNSFLAIGSWV
32+
AIALGVWVVAWVIAESIPVFNELLSLISSLFGSWFSYGLPAIFWLVMNKGRWFSTRSKIC
33+
LTIVNFFILAFACALCGMGLYVSGKSIHDSSSKASW------------------------
3434
------------------------------------------------------------
3535
------------------------------------------------------------
3636
------------------------------------------------------------
37+
---------------------------TCKNNAT--------------------------
3738
------------------------------------------------------------
3839
------------------------------------------------------------
40+
----------------------------------------------------------TT
41+
>Aspergillus_fischeri_NRRL181|XP_001261692.1
42+
M-----------------------------------------------------------
3943
------------------------------------------------------------
4044
------------------------------------------------------------
41-
>Aspergillus_fischeri_NRRL181|XP_001267441.1
42-
MGSMLEAG----------------------------------------------------
45+
-------------------------AVSRD---LEA----------PAVVNDP-------
46+
---TAYDATVEKKEYADGTPANDPFGNEECGEVKYRVMSWWQCGTLMVAENISLGILSLP
47+
SAV---ATLGIVPAVILLLGLSAISWYTGYIMGQFKLRFPQVHSMGDAGELLMGRFGREL
48+
FGIGQLLFLIFLMASHILTFTVVFNTITNHGTCTIVFGVVGLVVSFIGALPRTMGKVYWM
49+
SMASCISIVTATVVTMIAIGVQAPEHVHVDATTEVSFQDAFLAVTNIIFAY---------
50+
--------IAHVAFFGFISEMHDPRDFPKSLTMLQVVDTSLYIVTAMVIYRYAGPDVASP
51+
ALSSAGPVMKKVAYGLAIPTVVIAGVVFGHVACKYIYVRIFR-GSAHMHQNSFLAIGSWV
52+
AIALSVWVVAWVIAESIPVFNELLSLISSLFGSWFSYGLPAIFWLVMNKGRWFSTRSKIC
53+
LTIVNFLILAFACALCGMGLYVSGKSIHDSSSKASW------------------------
4354
------------------------------------------------------------
4455
------------------------------------------------------------
45-
----------------------SRPAADAE---MDTDR------VHPEAV----------
46-
-----SDGERDFEKQDSKPEYQDAFGDEEYAEVKYKTLSWCH------GCRDSVTGYSLP
47-
ASG---GGLGPCP---------------------FKWAYPHIHSMGDAGEVIMGRFGREL
48-
FGTGQLLLVVFIMASHILTFTVAMNSITDHGTCSIVFGVVGLVISFVLCLPRTLAKVSFL
49-
SVASFISVFSAVLIVMIAVGVQRPWHGSVNATVDTSLYKAFLAVCNIVFSF---------
50-
--------SGHVAFFGFMAELKNPRDYPKSLFLLQGIDTCLYIVAAVVIYCYAGDDVTSP
51-
ALGSASIVVKKVAYGIALPTIIIGGVVNGHVACKYIYVRMWR-HSDRMHKRDLVATGSWV
52-
LIGLATWIVAWIIAEAIPVFNNLLSLVASLFASWFTYGFSALFWLYLNKGRFFSTPMKTA
53-
LTILNVVIMGIACCICGLGLYVSGKALHDDPSSASF------------------------
5456
------------------------------------------------------------
57+
---------------------------TCKNNAT--------------------------
5558
------------------------------------------------------------
5659
------------------------------------------------------------
57-
---------------------------SCANNA---------------------------
5860
------------------------------------------------------------
61+
>Aspergillus_niger_CBS_513.88|XP_001401336.1
62+
M-----------------------------------------------------------
5963
------------------------------------------------------------
6064
------------------------------------------------------------
61-
>Aspergillus_niger_CBS_513.88|XP_001400898.1
62-
M--AHPTG----------------------------------------------------
65+
------------------------APTTRD---LEA----------LTVHHDS-------
66+
-DIMADDLAEKKVSANESPPENDPFGNEECGEVKYRVMKWWHCGILMIAENISLGILSLP
67+
SAV---ATLGIVPSIFLILGLSGISWYTGYVIGQFKLRYPQVHSMGDAGEILFGRIGREI
68+
LFFGQLLFCIFLMSSHILTFTVLFNTITGHGTCTIVFGVVGLVVSFIGALPRTMGKVYWM
69+
SLASCTSITVATIVTMVAIAMQAPDHVQVDITTHPSFSTAFLSVTNIVFAF---------
70+
--------IAHVAFFGFASEMEDPRDFPKSLAMLQVTDTTMYIVTAMVIYRYAGPDVASP
71+
ALSSAGPLMSKVAYGLAIPTVIIAGVVFGHVASKYIYVRVWR-GSPQMHTNSLAAVGSWV
72+
AIALGVWVIAWIIAESIPVFNDLLSLISSLFGSWFSYGLPAMFWLVMNRGQYTASPRKIF
73+
LTIVNLVIFGIACAICGLGLYVSGKAIHDSSSSASW------------------------
6374
------------------------------------------------------------
6475
------------------------------------------------------------
65-
----------------------DKVDSHLN---VQTGQFFQDGREEPYLH----------
66-
------DAEEKQDEKKGSPIYNDTFGDEEYAEVKYKVLSWWQCGFLMVAETVSLGILSLP
67-
AVV---ATLGLAPAIVLIVGLGLLATYTGYVIGQFRWRYPHVQNLADAGEILFGSIGREI
68-
FGIGQLLLVIFIMASHLLTFSVAMNTITEHGTCSIVFGVVGLVICFLLGLPRTSANVSYL
69-
SVASFISVFSAVMIVMIAVGVERPYKGTLSATVDTSLYEAFLAVCNIVFSF---------
70-
--------SGHVAFFGFMSELKDHREYPKALCLLQGLDTILYLVTSVVIYIYAGPNVTSP
71-
ALGSASELVGKVAYGIALPTIIIGGVVNGHVACKYVYVRIFR-HGDRMHSRDLLATGSWV
72-
GIALGLWIIAWIIAEAIPVFNDLLSLIASLFASWSTFGFSGMFWLYLNKDRLFSSPRKIA
73-
LTIFNVIIIGIAACICGLGLYVSGRSLHDDANGSSF------------------------
7476
------------------------------------------------------------
77+
---------------------------TCANNAST-------------------------
7578
------------------------------------------------------------
7679
------------------------------------------------------------
77-
---------------------------SCASNA---------------------------
7880
------------------------------------------------------------
81+
>Aspergillus_awamori_IFM_58123|GCB19008.1
82+
M-----------------------------------------------------------
7983
------------------------------------------------------------
8084
------------------------------------------------------------
81-
>Aspergillus_awamori_IFM_58123|GCB19337.1
82-
M--AHPTG----------------------------------------------------
85+
------------------------APTTRD---LEA----------LAVHHDS-------
86+
-DIMADDLAEKKVSANESPPENDPFGNEECGEVKYRVMKWWHCGILMIAENISLGILSLP
87+
SAV---ATLGIVPSIFLILGLSGISWYTGYVIGQFKLRYPQVHSMGDAGEILFGRIGREI
88+
LFFGQLLFCIFLMSSHILTFTVLFNTITGHGTCTIVFGVVGLVVSFIGALPRTMGKVYWM
89+
SLASCTSITVATIVTMVAIAVQAPDHVQVDITTHPSFSTAFLSVTNIVFAF---------
90+
--------IAHVAFFGFASEMEDPRDFPKSLAMLQVTDTTMYIVTAMVIYRYAGPDVASP
91+
ALSSAGPLMSKVAYGLAIPTVIIAGVVFGHVASKYIYVRVWR-GSPQMHTNSLAAVGSWV
92+
AIALGVWVIAWIIAESIPVFNDLLSLISSLFGSWFSYGLPAMFWLVMNRGQYTASPRKIF
93+
LTIVNLVIFGIACAICGLGLYVSGKAIHDSSSSASW------------------------
8394
------------------------------------------------------------
8495
------------------------------------------------------------
85-
----------------------DKVDSHLN---VQTGQFFQDGREEPYLH----------
86-
------DAEEKQDEKKGSPIYNDTFGDEEYAEVKYKVLSWWQCGFLMVAETVSLGILSLP
87-
AVV---ATLGLAPAIVLIVGLGLLATYTGYVIGQFRWRYPHVQNLADAGEILFGSIGREI
88-
FGIGQLLLVIFIMASHLLTFSVAMNTITEHGTCSIVFGVVGLVICFLLGLPRTSANVSYL
89-
SVASFISVFSAVMIVMIAVGVERPYKGTLSATVDTSLYEAFLAVCNIVFSF---------
90-
--------SGHVAFFGFMSELKDHREYPKALCLLQGLDTILYLVTSVVIYIYAGPNVTSP
91-
ALGSASELVGKVAYGIALPTIIIGGVVNGHVACKYVYVRIFR-HGDRMHSRDLLATGSWV
92-
GIALGLWIIAWIIAEAIPVFNDLLSLIASLFASWSTFGFSGMFWLYLNKDRLFSSPRKIA
93-
LTFFNVIIIGIAACICGLGLYVSGRSLHDDANGSSF------------------------
9496
------------------------------------------------------------
95-
------------------------------------------------------------
96-
------------------------------------------------------------
97-
---------------------------SCASNA---------------------------
97+
---------------------------TCANNAST-------------------------
9898
------------------------------------------------------------
9999
------------------------------------------------------------
100100
------------------------------------------------------------

0 commit comments

Comments
 (0)