Skip to content

Commit

Permalink
Add enum34 as DEP in test matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
sergiopasra committed Oct 10, 2017
1 parent 26d3125 commit c8409a3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ matrix:
- python: "2.7"
env: DEPS="numpy scipy astropy=1.3 enum34"
- python: "2.7"
env: DEPS="numpy scipy astropy=2.0"
env: DEPS="numpy scipy astropy=2.0 enum34"
- python: "3.5"
env: DEPS="numpy scipy astropy=1.3"
- python: "3.5"
Expand Down
2 changes: 0 additions & 2 deletions megaradrp/simulation/detector.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ def pre_readout(self, elec_pre):

def base_readout(self, elec_f):
# Output image
print(self.fshape)
final = numpy.zeros(self.fshape)
self.virt1.readout_in_buffer(elec_f, final)
self.virt2.readout_in_buffer(elec_f, final)
Expand Down Expand Up @@ -273,7 +272,6 @@ def init_regions(cls, detshape, oscan, pscan, bng):

psc1 = base_pscan // bng[0]
psc2 = 2 * psc1
print(nr2, oscan2, nc2, psc2)
fshape = (nr2 + oscan2, nc2 + psc2)

# Row block 1
Expand Down

0 comments on commit c8409a3

Please sign in to comment.