Skip to content

Commit

Permalink
Merge branch 'hotfix/strand'
Browse files Browse the repository at this point in the history
  • Loading branch information
@CiaranOMara
CiaranOMara committed Jan 7, 2020
2 parents 4014c57 + ee7244d commit e0783f5
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [1.0.2]
### Fixed
- Corrected typo in Strand constructor.

## [1.0.1]
- General housekeeping.

Expand All @@ -24,7 +28,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Move code from Bio.jl.
- Add support for GFF3 and BigWig.

[Unreleased]: https://github.com/BioJulia/GenomicFeatures.jl/compare/v1.0.1...HEAD
[Unreleased]: https://github.com/BioJulia/GenomicFeatures.jl/compare/v1.0.2...HEAD
[1.0.2]: https://github.com/BioJulia/GenomicFeatures.jl/compare/v1.0.1...v1.0.2
[1.0.1]: https://github.com/BioJulia/GenomicFeatures.jl/compare/v1.0.0...v1.0.1
[1.0.0]: https://github.com/BioJulia/GenomicFeatures.jl/compare/v0.2.1...v1.0.0
[0.2.1]: https://github.com/BioJulia/GenomicFeatures.jl/compare/v0.2.0...v0.2.1
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "GenomicFeatures"
uuid = "899a7d2d-5c61-547b-bef9-6698a8d05446"
authors = ["Kenta Sato <[email protected]>", "Ben J. Ward <[email protected]>", "Ciarán O’Mara <[email protected]>"]
version = "1.0.1"
version = "1.0.2"

[deps]
Automa = "67c07d97-cdcb-5c2c-af73-a7f9c32a568b"
Expand Down
2 changes: 1 addition & 1 deletion src/strand.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
primitive type Strand 8 end

Base.convert(::Type{Strand}, strand::UInt8) = reinterpret(Strand, strand)
Strand(strand::UInt8) = convert(Strand, strans)
Strand(strand::UInt8) = convert(Strand, strand)
Base.convert(::Type{UInt8}, strand::Strand) = reinterpret(UInt8, strand)

Base.isless(a::Strand, b::Strand) = convert(UInt8, a) < convert(UInt8, b)
Expand Down
5 changes: 5 additions & 0 deletions test/runtests.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ end

@testset "Strand" begin
@testset "Constructor" begin
@test Strand(0b000) === STRAND_NA
@test Strand(0b001) === STRAND_POS
@test Strand(0b010) === STRAND_NEG
@test Strand(0b011) === STRAND_BOTH

@test Strand('?') === STRAND_NA
@test Strand('+') === STRAND_POS
@test Strand('-') === STRAND_NEG
Expand Down

15 comments on commit e0783f5

@CiaranOMara
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Error while trying to register: Unexpected error in registration

@CiaranOMara
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DilumAluthge, do you know whether this JuliaRegistrator error has something to do with the yank of v1.0.1?

@CiaranOMara
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trying when CI has completed.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Error while trying to register: Unexpected error in registration

@DilumAluthge
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Shouldn’t be caused by the yanking, but we can revert the yank and see if it helps.

@DilumAluthge
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JuliaRegistries/General#7614

@DilumAluthge
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright I undid the yank.

@DilumAluthge
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register branch=develop

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Error while trying to register: Register Failed
@DilumAluthge, it looks like you are not a publicly listed member/owner in the parent organization (BioJulia).
If you are a member/owner, you will need to change your membership to public. See GitHub Help

@CiaranOMara
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@DilumAluthge
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CiaranOMara can you try to register again?

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/7615

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v1.0.2 -m "<description of version>" e0783f58869a890662da752953551996a99469ff
git push origin v1.0.2

@DilumAluthge
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clearly a bug in Registrator. Can you open an issue here: https://github.com/JuliaRegistries/Registrator.jl/issues

@CiaranOMara
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue opened at JuliaRegistries/Registrator.jl#259.

Please sign in to comment.