Skip to content

Commit

Permalink
Merge pull request #2948 from pygame/v2.1.1.dev4
Browse files Browse the repository at this point in the history
2.1.1.dev4
  • Loading branch information
illume committed Dec 24, 2021
2 parents 8497b4e + 9d53d5a commit 2366813
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/reST/conf.py
Expand Up @@ -50,7 +50,7 @@
# The short X.Y version.
version = '2.1.1'
# The full version, including alpha/beta/rc tags.
release = '2.1.1.dev3'
release = '2.1.1.dev4'

# Format strings for the version directives
versionadded_format = 'New in pygame %s'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -15,7 +15,7 @@

METADATA = {
"name": "pygame",
"version": "2.1.1.dev3",
"version": "2.1.1.dev4",
"license": "LGPL",
"url": "https://www.pygame.org",
"author": "A community project.",
Expand Down
2 changes: 1 addition & 1 deletion src_c/transform.c
Expand Up @@ -929,7 +929,7 @@ chop(SDL_Surface *src, int x, int y, int width, int height)
dst = newsurf_fromsurf(src, dstwidth, dstheight);
if (!dst)
return NULL;

Py_BEGIN_ALLOW_THREADS;
SDL_LockSurface(dst);
srcrow = (char *)src->pixels;
Expand Down
7 changes: 2 additions & 5 deletions test/display_test.py
Expand Up @@ -487,15 +487,12 @@ def test_set_gamma(self):
self.assertEqual(pygame.display.set_gamma(gamma), True)

@unittest.skipIf(
os.environ.get("SDL_VIDEODRIVER") == "dummy",
"Needs a not dummy videodriver"
os.environ.get("SDL_VIDEODRIVER") == "dummy", "Needs a not dummy videodriver"
)
def test_set_gamma__tuple(self):
pygame.display.set_mode((1, 1))

gammas = [(0.5, 0.5, 0.5),
(1.0, 1.0, 1.0),
(0.25, 0.33, 0.44)]
gammas = [(0.5, 0.5, 0.5), (1.0, 1.0, 1.0), (0.25, 0.33, 0.44)]
for r, g, b in gammas:
with self.subTest(r=r, g=g, b=b):
self.assertEqual(pygame.display.set_gamma(r, g, b), True)
Expand Down

0 comments on commit 2366813

Please sign in to comment.